0.49.4

Swedish translation

PRIVACY.md

@@ -4,7 +4,7 @@ Effective as of Jan 20, 2023 for the distributed applications in the Play Store
 
 The Amethyst app for Android does not collect or process any personal information from its users. The app is used to connect to third-party Nostr servers (also called Relays) that may or may not collect personal information and are not covered by this privacy policy. Each third-party relay server comes equipped with its own privacy policy and terms of use that can be viewed through the app or through that server's website. The developers of this open source project or maintainers of the distribution channels (app stores) do not have access to the data located in the user's phone. Accounts are fully maintained by the user. We do not have control over them. 
 
-Data from connected accounts is only stored locally on the device when it is required for functionality and performance of Amethyst. This data is strictly confidental and cannot be accessed by other apps (on non-rooted devices). Phone data can be deleted by clearing Amethyst's local storage or uninstalling the app.
+The app may collect a per-device token, your public key and a preferred Relay to connect to and provide push notification services through Google's Firebase Cloud Messaging. Other than that, the data from connected accounts is only stored locally on the device when it is required for functionality and performance of Amethyst. This data is strictly confidental and cannot be accessed by other apps (on non-rooted devices). Phone data can be deleted by clearing Amethyst's local storage or uninstalling the app.
 
 You cannot use the Amethyst app for Android to submit Objectionable Content to relays. Objectionable Content includes, but is not limited to: (i) sexually explicit materials; (ii) obscene, defamatory, libelous, slanderous, violent and/or unlawful content or profanity; (iii) content that infringes upon the rights of any third party, including copyright, trademark, privacy, publicity or other personal or proprietary right, or that is deceptive or fraudulent; (iv) content that promotes the use or sale of illegal or regulated substances, tobacco products, ammunition and/or firearms; and (v) illegal content related to gambling.
 

README.md

@@ -15,7 +15,7 @@ Or get the latest APK from the [Releases Section](https://github.com/vitorpamplo
 
 # Current Features
 
-- [x] Event Builders / WebSocket Subscriptions (NIP-01, NIP-15)
+- [x] Event Builders / WebSocket Subscriptions (NIP-01)
 - [x] Home Feed
 - [x] Notifications Feed
 - [x] Global Feed
@@ -34,7 +34,8 @@ Or get the latest APK from the [Releases Section](https://github.com/vitorpamplo
 - [x] Lightning Tips
 - [x] Zaps (private, public, anon, non-zap) (NIP-57)
 - [x] URI Support (NIP-21)
-- [x] Event Deletion (NIP-09: like, boost, text notes and reports)
+- [x] Created_at Limits (NIP-22)
+- [x] Event Deletion (NIP-09)
 - [x] Identity Verification (NIP-05)
 - [x] Long-form Content (NIP-23)
 - [x] Parameterized Replaceable Events (NIP-33)
@@ -54,13 +55,18 @@ Or get the latest APK from the [Releases Section](https://github.com/vitorpamplo
 - [x] Markdown Support
 - [x] Relay Authentication (NIP-42)
 - [x] Content stored in relays themselves (NIP-95)
+- [x] Custom Emoji (NIP-30)
+- [x] Text Note References (NIP-27)
+- [x] Audio Tracks (zapstr.live) (NIP-TBD)
+- [x] Push Notifications (Zaps and Messages)
+- [x] Generic Tags (NIP-12)
+- [ ] Marketplace (NIP-15)
 - [ ] Image/Video Capture in the app
 - [ ] Local Database 
 - [ ] View Individual Reactions (Like, Boost, Zaps, Reports) per Post
 - [ ] Bookmarks, Pinned Posts, Muted Events (NIP-51)
 - [ ] Sensitive Content (NIP-36) 
 - [ ] Relay Pages (NIP-11)
-- [ ] Generic Tags (NIP-12)
 - [ ] Proof of Work in the Phone (NIP-13, NIP-20)
 - [ ] Events with a Subject (NIP-14)
 - [ ] Workspaces
@@ -69,8 +75,10 @@ Or get the latest APK from the [Releases Section](https://github.com/vitorpamplo
 - [ ] Relay List Metadata (NIP-65)
 - [ ] Signing Requests (NIP-46)
 - [ ] Delegated Event Signing (NIP-26)
-- [ ] Account Creation / Backup Guidance (NIP-06)
+- [ ] Account Creation / Backup Guidance
+- [ ] Mnemonic seed phrase (NIP-06)
 - [ ] Message Sent feedback (NIP-20)
+- [ ] OpenTimestamps Attestations (NIP-03)
 
 
 # Development Overview

app/build.gradle

@@ -13,8 +13,8 @@ android {
         applicationId "com.vitorpamplona.amethyst"
         minSdk 26
         targetSdk 33
-        versionCode 154
-        versionName "0.46.0"
+        versionCode 167
+        versionName "0.49.4"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {
@@ -115,7 +115,7 @@ dependencies {
     implementation "androidx.biometric:biometric-ktx:1.2.0-alpha05"
 
     // Bitcoin secp256k1 bindings to Android
-    implementation 'fr.acinq.secp256k1:secp256k1-kmp-jni-android:0.9.0'
+    implementation 'fr.acinq.secp256k1:secp256k1-kmp-jni-android:0.10.0'
 
     // Nostr Base Protocol
     implementation('com.github.vitorpamplona.NostrPostr:nostrpostrlib:master-SNAPSHOT') {

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

@@ -877,23 +877,28 @@ class Account(
                     null
                 }
 
-                if (altPrivateKeyToUse != null && altPubkeyToUse != null) {
-                    val altPubKeyFromPrivate = Utils.pubkeyCreate(altPrivateKeyToUse).toHexKey()
+                try {
+                    if (altPrivateKeyToUse != null && altPubkeyToUse != null) {
+                        val altPubKeyFromPrivate = Utils.pubkeyCreate(altPrivateKeyToUse).toHexKey()
 
-                    if (altPubKeyFromPrivate == event.pubKey) {
-                        val result = event.getPrivateZapEvent(altPrivateKeyToUse, altPubkeyToUse)
+                        if (altPubKeyFromPrivate == event.pubKey) {
+                            val result = event.getPrivateZapEvent(altPrivateKeyToUse, altPubkeyToUse)
 
-                        if (result == null) {
-                            Log.w(
-                                "Private ZAP Decrypt",
-                                "Fail to decrypt Zap from ${note.author?.toBestDisplayName()} ${note.idNote()}"
-                            )
+                            if (result == null) {
+                                Log.w(
+                                    "Private ZAP Decrypt",
+                                    "Fail to decrypt Zap from ${note.author?.toBestDisplayName()} ${note.idNote()}"
+                                )
+                            }
+                            result
+                        } else {
+                            null
                         }
-                        result
                     } else {
                         null
                     }
-                } else {
+                } catch (e: Exception) {
+                    Log.e("Account", "Failed to create pubkey for ZapRequest ${event.id}", e)
                     null
                 }
             }

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

@@ -57,7 +57,7 @@ class Channel(val idHex: String) {
     fun pruneOldAndHiddenMessages(account: Account): Set<Note> {
         val important = notes.values
             .filter { it.author?.let { it1 -> account.isHidden(it1) } == false }
-            .sortedBy { it.createdAt() }
+            .sortedWith(compareBy({ it.createdAt() }, { it.idHex }))
             .reversed()
             .take(1000)
             .toSet()

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

@@ -50,6 +50,23 @@ fun decodePublicKey(key: String): ByteArray {
     }
 }
 
+fun decodePublicKeyAsHexOrNull(key: String): HexKey? {
+    return try {
+        val parsed = Nip19.uriToRoute(key)
+        val pubKeyParsed = parsed?.hex
+
+        if (key.startsWith("nsec")) {
+            Persona(privKey = key.bechToBytes()).pubKey.toHexKey()
+        } else if (pubKeyParsed != null) {
+            pubKeyParsed
+        } else {
+            Hex.decode(key).toHexKey()
+        }
+    } catch (e: Exception) {
+        null
+    }
+}
+
 data class DirtyKeyInfo(val key: Nip19.Return, val restOfWord: String)
 
 fun parseDirtyWordForKey(mightBeAKey: String): DirtyKeyInfo? {

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

@@ -1,16 +1,17 @@
 package com.vitorpamplona.amethyst.model
 
 import android.util.Log
-import androidx.core.net.toUri
-import androidx.lifecycle.LiveData
 import com.fasterxml.jackson.databind.DeserializationFeature
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import com.vitorpamplona.amethyst.Amethyst
 import com.vitorpamplona.amethyst.service.model.*
+import com.vitorpamplona.amethyst.service.nip19.Nip19
 import com.vitorpamplona.amethyst.service.relays.Relay
 import com.vitorpamplona.amethyst.ui.components.BundledInsert
 import fr.acinq.secp256k1.Hex
 import kotlinx.coroutines.*
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.asSharedFlow
 import nostr.postr.toNpub
 import java.io.ByteArrayInputStream
 import java.io.File
@@ -280,6 +281,30 @@ object LocalCache {
         refreshObservers(note)
     }
 
+    private fun consume(event: PinListEvent) {
+        val note = getOrCreateAddressableNote(event.address())
+        val author = getOrCreateUser(event.pubKey)
+
+        // Already processed this event.
+        if (note.event != null) return
+
+        note.loadEvent(event, author, emptyList())
+
+        refreshObservers(note)
+    }
+
+    private fun consume(event: AudioTrackEvent) {
+        val note = getOrCreateAddressableNote(event.address())
+        val author = getOrCreateUser(event.pubKey)
+
+        // Already processed this event.
+        if (note.event != null) return
+
+        note.loadEvent(event, author, emptyList())
+
+        refreshObservers(note)
+    }
+
     fun consume(event: BadgeDefinitionEvent) {
         val note = getOrCreateAddressableNote(event.address())
         val author = getOrCreateUser(event.pubKey)
@@ -738,19 +763,18 @@ object LocalCache {
             note.addRelay(relay)
         }
 
-        val file = File(Amethyst.instance.applicationContext.externalCacheDir, "NIP95")
-
-        if (!file.exists()) {
-            try {
-                val cachePath = File(Amethyst.instance.applicationContext.externalCacheDir, "NIP95")
-                cachePath.mkdirs()
-                val stream = FileOutputStream(File(cachePath, event.id))
+        try {
+            val cachePath = File(Amethyst.instance.applicationContext.externalCacheDir, "NIP95")
+            cachePath.mkdirs()
+            val file = File(cachePath, event.id)
+            if (!file.exists()) {
+                val stream = FileOutputStream(file)
                 stream.write(event.decode())
                 stream.close()
-                Log.e("EventLogger", "Saved to disk as ${File(cachePath, event.id).toUri()}")
-            } catch (e: IOException) {
-                Log.e("FileSotrageEvent", "FileStorageEvent save to disk error: " + event.id, e)
+                Log.i("FileStorageEvent", "NIP95 File received from ${relay?.url} and saved to disk as $file")
             }
+        } catch (e: IOException) {
+            Log.e("FileStorageEvent", "FileStorageEvent save to disk error: " + event.id, e)
         }
 
         // Already processed this event.
@@ -810,6 +834,12 @@ object LocalCache {
     }
 
     fun findUsersStartingWith(username: String): List<User> {
+        val key = decodePublicKeyAsHexOrNull(username)
+
+        if (key != null && users[key] != null) {
+            return listOfNotNull(users[key])
+        }
+
         return users.values.filter {
             (it.anyNameStartsWith(username)) ||
                 it.pubkeyHex.startsWith(username, true) ||
@@ -818,6 +848,16 @@ object LocalCache {
     }
 
     fun findNotesStartingWith(text: String): List<Note> {
+        val key = try {
+            Nip19.uriToRoute(text)?.hex ?: Hex.decode(text).toHexKey()
+        } catch (e: Exception) {
+            null
+        }
+
+        if (key != null && (notes[key] ?: addressables[key]) != null) {
+            return listOfNotNull(notes[key] ?: addressables[key])
+        }
+
         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) ||
@@ -833,6 +873,16 @@ object LocalCache {
     }
 
     fun findChannelsStartingWith(text: String): List<Channel> {
+        val key = try {
+            Nip19.uriToRoute(text)?.hex ?: Hex.decode(text).toHexKey()
+        } catch (e: Exception) {
+            null
+        }
+
+        if (key != null && channels[key] != null) {
+            return listOfNotNull(channels[key])
+        }
+
         return channels.values.filter {
             it.anyNameStartsWith(text) ||
                 it.idHex.startsWith(text, true) ||
@@ -919,6 +969,7 @@ object LocalCache {
 
         try {
             when (event) {
+                is AudioTrackEvent -> consume(event)
                 is BadgeAwardEvent -> consume(event)
                 is BadgeDefinitionEvent -> consume(event)
                 is BadgeProfilesEvent -> consume(event)
@@ -947,6 +998,7 @@ object LocalCache {
                 is LongTextNoteEvent -> consume(event, relay)
                 is MetadataEvent -> consume(event)
                 is PrivateDmEvent -> consume(event, relay)
+                is PinListEvent -> consume(event)
                 is PeopleListEvent -> consume(event)
                 is ReactionEvent -> consume(event)
                 is RecommendRelayEvent -> consume(event)
@@ -969,16 +1021,16 @@ object LocalCache {
     }
 }
 
-class LocalCacheLiveData : LiveData<Set<Note>>(setOf<Note>()) {
+class LocalCacheLiveData {
+    private val _newEventBundles = MutableSharedFlow<Set<Note>>()
+    val newEventBundles = _newEventBundles.asSharedFlow() // read-only public view
 
     // Refreshes observers in batches.
     private val bundler = BundledInsert<Note>(300, Dispatchers.IO)
 
     fun invalidateData(newNote: Note) {
         bundler.invalidateList(newNote) { bundledNewNotes ->
-            if (hasActiveObservers()) {
-                postValue(bundledNewNotes)
-            }
+            _newEventBundles.emit(bundledNewNotes)
         }
     }
 }

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

@@ -411,9 +411,9 @@ class NoteLiveSet(u: Note) {
 class NoteLiveData(val note: Note) : LiveData<NoteState>(NoteState(note)) {
     // Refreshes observers in batches.
     private val bundler = BundledUpdate(300, Dispatchers.IO) {
-        if (hasActiveObservers()) {
-            postValue(NoteState(note))
-        }
+        // if (hasObservers()) {
+        postValue(NoteState(note))
+        // }
     }
 
     fun invalidateData() {

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

@@ -0,0 +1,32 @@
+package com.vitorpamplona.amethyst.service
+
+import java.util.regex.Pattern
+
+class NIP30Parser {
+    val customEmojiPattern: Pattern = Pattern.compile("\\:([A-Za-z0-9_\\-]+)\\:", Pattern.CASE_INSENSITIVE)
+
+    fun buildArray(input: String): List<String> {
+        val matcher = customEmojiPattern.matcher(input)
+        val list = mutableListOf<String>()
+        while (matcher.find()) {
+            list.add(matcher.group())
+        }
+
+        if (list.isEmpty()) {
+            return listOf(input)
+        }
+
+        val regularChars = input.split(customEmojiPattern.toRegex())
+
+        var finalList = mutableListOf<String>()
+        var index = 0
+        for (e in regularChars) {
+            finalList.add(e)
+            if (index < list.size) {
+                finalList.add(list[index])
+            }
+            index++
+        }
+        return finalList
+    }
+}

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

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

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

@@ -3,6 +3,7 @@ package com.vitorpamplona.amethyst.service
 import androidx.compose.ui.text.capitalize
 import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
 import com.vitorpamplona.amethyst.service.model.LongTextNoteEvent
+import com.vitorpamplona.amethyst.service.model.PollNoteEvent
 import com.vitorpamplona.amethyst.service.model.TextNoteEvent
 import com.vitorpamplona.amethyst.service.relays.COMMON_FEED_TYPES
 import com.vitorpamplona.amethyst.service.relays.JsonFilter
@@ -25,7 +26,7 @@ object NostrHashtagDataSource : NostrDataSource("SingleHashtagFeed") {
                         hashToLoad.capitalize()
                     )
                 ),
-                kinds = listOf(TextNoteEvent.kind, ChannelMessageEvent.kind, LongTextNoteEvent.kind),
+                kinds = listOf(TextNoteEvent.kind, ChannelMessageEvent.kind, LongTextNoteEvent.kind, LongTextNoteEvent.kind, PollNoteEvent.kind),
                 limit = 200
             )
         )

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

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

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

@@ -1,13 +1,13 @@
 package com.vitorpamplona.amethyst.service
 
-import com.vitorpamplona.amethyst.model.decodePublicKey
+import com.vitorpamplona.amethyst.model.toHexKey
 import com.vitorpamplona.amethyst.service.model.*
+import com.vitorpamplona.amethyst.service.nip19.Nip19
 import com.vitorpamplona.amethyst.service.relays.COMMON_FEED_TYPES
 import com.vitorpamplona.amethyst.service.relays.FeedType
 import com.vitorpamplona.amethyst.service.relays.JsonFilter
 import com.vitorpamplona.amethyst.service.relays.TypedFilter
-import nostr.postr.bechToBytes
-import nostr.postr.toHex
+import fr.acinq.secp256k1.Hex
 
 object NostrSearchEventOrUserDataSource : NostrDataSource("SingleEventFeed") {
     private var searchString: String? = null
@@ -19,15 +19,8 @@ object NostrSearchEventOrUserDataSource : NostrDataSource("SingleEventFeed") {
         }
 
         val hexToWatch = try {
-            if (mySearchString.startsWith("npub") || mySearchString.startsWith("nsec")) {
-                decodePublicKey(mySearchString).toHex()
-            } else if (mySearchString.startsWith("note")) {
-                mySearchString.bechToBytes().toHex()
-            } else {
-                mySearchString
-            }
+            Nip19.uriToRoute(mySearchString)?.hex ?: Hex.decode(mySearchString).toHexKey()
         } catch (e: Exception) {
-            // Usually when people add an incomplete npub or note.
             null
         }
 

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

@@ -29,7 +29,7 @@ object NostrSingleEventDataSource : NostrDataSource("SingleEventFeed") {
                             ReactionEvent.kind, RepostEvent.kind, ReportEvent.kind,
                             LnZapEvent.kind, LnZapRequestEvent.kind,
                             BadgeAwardEvent.kind, BadgeDefinitionEvent.kind, BadgeProfilesEvent.kind,
-                            PollNoteEvent.kind
+                            PollNoteEvent.kind, AudioTrackEvent.kind, PinListEvent.kind
                         ),
                         tags = mapOf("a" to listOf(aTag.toTag())),
                         since = it.lastReactionsDownloadTime
@@ -80,7 +80,9 @@ object NostrSingleEventDataSource : NostrDataSource("SingleEventFeed") {
                         LnZapEvent.kind,
                         LnZapRequestEvent.kind,
                         PollNoteEvent.kind,
-                        HighlightEvent.kind
+                        HighlightEvent.kind,
+                        AudioTrackEvent.kind,
+                        PinListEvent.kind
                     ),
                     tags = mapOf("e" to listOf(it.idHex)),
                     since = it.lastReactionsDownloadTime
@@ -119,7 +121,7 @@ object NostrSingleEventDataSource : NostrDataSource("SingleEventFeed") {
                         BadgeDefinitionEvent.kind, BadgeAwardEvent.kind, BadgeProfilesEvent.kind,
                         PrivateDmEvent.kind,
                         FileHeaderEvent.kind, FileStorageEvent.kind, FileStorageHeaderEvent.kind,
-                        HighlightEvent.kind
+                        HighlightEvent.kind, AudioTrackEvent.kind, PinListEvent.kind
                     ),
                     ids = interestedEvents.toList()
                 )

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

@@ -11,7 +11,6 @@ object NostrUserProfileDataSource : NostrDataSource("UserProfileFeed") {
 
     fun loadUserProfile(user: User?) {
         this.user = user
-        resetFilters()
     }
 
     fun createUserInfoFilter() = user?.let {
@@ -29,7 +28,7 @@ object NostrUserProfileDataSource : NostrDataSource("UserProfileFeed") {
         TypedFilter(
             types = COMMON_FEED_TYPES,
             filter = JsonFilter(
-                kinds = listOf(TextNoteEvent.kind, RepostEvent.kind, LongTextNoteEvent.kind, PollNoteEvent.kind, HighlightEvent.kind),
+                kinds = listOf(TextNoteEvent.kind, RepostEvent.kind, LongTextNoteEvent.kind, AudioTrackEvent.kind, PinListEvent.kind, PollNoteEvent.kind, HighlightEvent.kind),
                 authors = listOf(it.pubkeyHex),
                 limit = 200
             )

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

@@ -4,7 +4,7 @@ import java.util.regex.Pattern
 
 object LnWithdrawalUtil {
     private val withdrawalPattern = Pattern.compile(
-        "lnurl.*",
+        "lnurl.+",
         Pattern.CASE_INSENSITIVE
     )
 

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

@@ -0,0 +1,61 @@
+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 AudioTrackEvent(
+    id: HexKey,
+    pubKey: HexKey,
+    createdAt: Long,
+    tags: List<List<String>>,
+    content: String,
+    sig: HexKey
+) : Event(id, pubKey, createdAt, kind, tags, content, sig), AddressableEvent {
+
+    override fun dTag() = tags.firstOrNull { it.size > 1 && it[0] == "d" }?.get(1) ?: ""
+    override fun address() = ATag(kind, pubKey, dTag(), null)
+
+    fun participants() = tags.filter { it.size > 1 && it[0] == "p" }.map { Participant(it[1], it.getOrNull(2)) }
+    fun type() = tags.firstOrNull { it.size > 1 && it[0] == TYPE }?.get(1)
+    fun price() = tags.firstOrNull { it.size > 1 && it[0] == PRICE }?.get(1)
+    fun cover() = tags.firstOrNull { it.size > 1 && it[0] == COVER }?.get(1)
+    fun subject() = tags.firstOrNull { it.size > 1 && it[0] == SUBJECT }?.get(1)
+    fun media() = tags.firstOrNull { it.size > 1 && it[0] == MEDIA }?.get(1)
+
+    companion object {
+        const val kind = 31337
+
+        private const val TYPE = "c"
+        private const val PRICE = "price"
+        private const val COVER = "cover"
+        private const val SUBJECT = "subject"
+        private const val MEDIA = "media"
+
+        fun create(
+            type: String,
+            media: String,
+            price: String? = null,
+            cover: String? = null,
+            subject: String? = null,
+            privateKey: ByteArray,
+            createdAt: Long = Date().time / 1000
+        ): AudioTrackEvent {
+            val tags = listOfNotNull(
+                listOf(MEDIA, media),
+                listOf(TYPE, type),
+                price?.let { listOf(PRICE, it) },
+                cover?.let { listOf(COVER, it) },
+                subject?.let { listOf(SUBJECT, it) }
+            )
+
+            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
+            val id = generateId(pubKey, createdAt, kind, tags, "")
+            val sig = Utils.sign(id, privateKey)
+            return AudioTrackEvent(id.toHexKey(), pubKey, createdAt, tags, "", sig.toHexKey())
+        }
+    }
+}
+
+data class Participant(val key: String, val role: String?)

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

@@ -9,9 +9,9 @@ class BadgeDefinitionEvent(
     tags: List<List<String>>,
     content: String,
     sig: HexKey
-) : Event(id, pubKey, createdAt, kind, tags, content, sig) {
-    fun dTag() = tags.firstOrNull { it.size > 1 && it[0] == "d" }?.get(1) ?: ""
-    fun address() = ATag(kind, pubKey, dTag(), null)
+) : Event(id, pubKey, createdAt, kind, tags, content, sig), AddressableEvent {
+    override fun dTag() = tags.firstOrNull { it.size > 1 && it[0] == "d" }?.get(1) ?: ""
+    override fun address() = ATag(kind, pubKey, dTag(), null)
 
     fun name() = tags.firstOrNull { it.size > 1 && it[0] == "name" }?.get(1)
     fun thumb() = tags.firstOrNull { it.size > 1 && it[0] == "thumb" }?.get(1)

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

@@ -9,7 +9,7 @@ class BadgeProfilesEvent(
     tags: List<List<String>>,
     content: String,
     sig: HexKey
-) : Event(id, pubKey, createdAt, kind, tags, content, sig) {
+) : Event(id, pubKey, createdAt, kind, tags, content, sig), AddressableEvent {
     fun badgeAwardEvents() = tags.filter { it.firstOrNull() == "e" }.mapNotNull { it.getOrNull(1) }
     fun badgeAwardDefinitions() = tags.filter { it.firstOrNull() == "a" }.mapNotNull {
         val aTagValue = it.getOrNull(1)
@@ -18,8 +18,8 @@ class BadgeProfilesEvent(
         if (aTagValue != null) ATag.parse(aTagValue, relay) else null
     }
 
-    fun dTag() = tags.filter { it.firstOrNull() == "d" }.mapNotNull { it.getOrNull(1) }.firstOrNull() ?: ""
-    fun address() = ATag(kind, pubKey, dTag(), null)
+    override fun dTag() = tags.filter { it.firstOrNull() == "d" }.mapNotNull { it.getOrNull(1) }.firstOrNull() ?: ""
+    override fun address() = ATag(kind, pubKey, dTag(), null)
 
     companion object {
         const val kind = 30008

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

@@ -1,5 +1,6 @@
 package com.vitorpamplona.amethyst.service.model
 
+import android.util.Log
 import com.google.gson.*
 import com.google.gson.annotations.SerializedName
 import com.vitorpamplona.amethyst.model.HexKey
@@ -110,11 +111,12 @@ open class Event(
     }
 
     override fun hasValidSignature(): Boolean {
-        if (!id.contentEquals(generateId())) {
-            return false
+        return try {
+            id.contentEquals(generateId()) && secp256k1.verifySchnorr(Hex.decode(sig), Hex.decode(id), Hex.decode(pubKey))
+        } catch (e: Exception) {
+            Log.e("Event", "Fail checking if event $id has a valid signature", e)
+            false
         }
-
-        return secp256k1.verifySchnorr(Hex.decode(sig), Hex.decode(id), Hex.decode(pubKey))
     }
 
     private fun generateId(): String {
@@ -218,6 +220,7 @@ open class Event(
         fun fromJson(json: JsonElement, lenient: Boolean = false): Event = gson.fromJson(json, Event::class.java).getRefinedEvent(lenient)
 
         fun Event.getRefinedEvent(lenient: Boolean = false): Event = when (kind) {
+            AudioTrackEvent.kind -> AudioTrackEvent(id, pubKey, createdAt, tags, content, sig)
             BadgeAwardEvent.kind -> BadgeAwardEvent(id, pubKey, createdAt, tags, content, sig)
             BadgeDefinitionEvent.kind -> BadgeDefinitionEvent(id, pubKey, createdAt, tags, content, sig)
             BadgeProfilesEvent.kind -> BadgeProfilesEvent(id, pubKey, createdAt, tags, content, sig)
@@ -241,6 +244,7 @@ open class Event(
             LongTextNoteEvent.kind -> LongTextNoteEvent(id, pubKey, createdAt, tags, content, sig)
             MetadataEvent.kind -> MetadataEvent(id, pubKey, createdAt, tags, content, sig)
             PeopleListEvent.kind -> PeopleListEvent(id, pubKey, createdAt, tags, content, sig)
+            PinListEvent.kind -> PinListEvent(id, pubKey, createdAt, tags, content, sig)
             PollNoteEvent.kind -> PollNoteEvent(id, pubKey, createdAt, tags, content, sig)
             PrivateDmEvent.kind -> PrivateDmEvent(id, pubKey, createdAt, tags, content, sig)
             ReactionEvent.kind -> ReactionEvent(id, pubKey, createdAt, tags, content, sig)
@@ -280,3 +284,8 @@ open class Event(
         }
     }
 }
+
+interface AddressableEvent {
+    fun dTag(): String
+    fun address(): ATag
+}

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

@@ -14,9 +14,9 @@ abstract class GeneralListEvent(
     tags: List<List<String>>,
     content: String,
     sig: HexKey
-) : Event(id, pubKey, createdAt, kind, tags, content, sig) {
-    fun dTag() = tags.filter { it.firstOrNull() == "d" }.mapNotNull { it.getOrNull(1) }.firstOrNull() ?: ""
-    fun address() = ATag(kind, pubKey, dTag(), null)
+) : Event(id, pubKey, createdAt, kind, tags, content, sig), AddressableEvent {
+    override fun dTag() = tags.filter { it.firstOrNull() == "d" }.mapNotNull { it.getOrNull(1) }.firstOrNull() ?: ""
+    override fun address() = ATag(kind, pubKey, dTag(), null)
 
     fun category() = dTag()
     fun bookmarkedPosts() = taggedEvents()

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

@@ -71,7 +71,7 @@ class LnZapRequestEvent(
                 listOf("p", originalNote.pubKey()),
                 listOf("relays") + relays
             )
-            if (originalNote is LongTextNoteEvent) {
+            if (originalNote is AddressableEvent) {
                 tags = tags + listOf(listOf("a", originalNote.address().toTag()))
             }
             if (pollOption != null && pollOption >= 0) {

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

@@ -12,9 +12,9 @@ class LongTextNoteEvent(
     tags: List<List<String>>,
     content: String,
     sig: HexKey
-) : BaseTextNoteEvent(id, pubKey, createdAt, kind, tags, content, sig) {
-    fun dTag() = tags.filter { it.firstOrNull() == "d" }.mapNotNull { it.getOrNull(1) }.firstOrNull() ?: ""
-    fun address() = ATag(kind, pubKey, dTag(), null)
+) : BaseTextNoteEvent(id, pubKey, createdAt, kind, tags, content, sig), AddressableEvent {
+    override fun dTag() = tags.filter { it.firstOrNull() == "d" }.mapNotNull { it.getOrNull(1) }.firstOrNull() ?: ""
+    override fun address() = ATag(kind, pubKey, dTag(), null)
 
     fun topics() = tags.filter { it.firstOrNull() == "t" }.mapNotNull { it.getOrNull(1) }
     fun title() = tags.filter { it.firstOrNull() == "title" }.mapNotNull { it.getOrNull(1) }.firstOrNull()

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

@@ -15,9 +15,9 @@ class MuteListEvent(
     tags: List<List<String>>,
     content: String,
     sig: HexKey
-) : Event(id, pubKey, createdAt, kind, tags, content, sig) {
-    fun dTag() = tags.filter { it.firstOrNull() == "d" }.mapNotNull { it.getOrNull(1) }.firstOrNull() ?: ""
-    fun address() = ATag(kind, pubKey, dTag(), null)
+) : Event(id, pubKey, createdAt, kind, tags, content, sig), AddressableEvent {
+    override fun dTag() = tags.filter { it.firstOrNull() == "d" }.mapNotNull { it.getOrNull(1) }.firstOrNull() ?: ""
+    override fun address() = ATag(kind, pubKey, dTag(), null)
 
     fun plainContent(privKey: ByteArray): String? {
         return try {

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

@@ -0,0 +1,41 @@
+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 PinListEvent(
+    id: HexKey,
+    pubKey: HexKey,
+    createdAt: Long,
+    tags: List<List<String>>,
+    content: String,
+    sig: HexKey
+) : Event(id, pubKey, createdAt, kind, tags, content, sig), AddressableEvent {
+
+    override fun dTag() = tags.firstOrNull { it.size > 1 && it[0] == "d" }?.get(1) ?: ""
+    override fun address() = ATag(kind, pubKey, dTag(), null)
+
+    fun pins() = tags.filter { it.size > 1 && it[0] == "pin" }.map { it[1] }
+
+    companion object {
+        const val kind = 33888
+
+        fun create(
+            pins: List<String>,
+            privateKey: ByteArray,
+            createdAt: Long = Date().time / 1000
+        ): PinListEvent {
+            val tags = mutableListOf<List<String>>()
+            pins.forEach {
+                tags.add(listOf("pin", it))
+            }
+
+            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
+            val id = generateId(pubKey, createdAt, kind, tags, "")
+            val sig = Utils.sign(id, privateKey)
+            return PinListEvent(id.toHexKey(), pubKey, createdAt, tags, "", sig.toHexKey())
+        }
+    }
+}

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

@@ -32,7 +32,7 @@ class ReactionEvent(
             val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
 
             var tags = listOf(listOf("e", originalNote.id()), listOf("p", originalNote.pubKey()))
-            if (originalNote is LongTextNoteEvent) {
+            if (originalNote is AddressableEvent) {
                 tags = tags + listOf(listOf("a", originalNote.address().toTag()))
             }
 

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

@@ -63,7 +63,7 @@ class ReportEvent(
             val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
             var tags: List<List<String>> = listOf(reportPostTag, reportAuthorTag)
 
-            if (reportedPost is LongTextNoteEvent) {
+            if (reportedPost is AddressableEvent) {
                 tags = tags + listOf(listOf("a", reportedPost.address().toTag()))
             }
 

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

@@ -36,7 +36,7 @@ class RepostEvent(
             val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
             var tags: List<List<String>> = boostedPost.tags().plus(listOf(replyToPost, replyToAuthor))
 
-            if (boostedPost is LongTextNoteEvent) {
+            if (boostedPost is AddressableEvent) {
                 tags = tags + listOf(listOf("a", boostedPost.address().toTag()))
             }
 

app/src/main/java/com/vitorpamplona/amethyst/service/notifications/EventNotificationConsumer.kt

@@ -46,7 +46,7 @@ class EventNotificationConsumer(private val applicationContext: Context) {
                     val user = note.author?.toBestDisplayName() ?: ""
                     val userPicture = note.author?.profilePicture()
                     val noteUri = note.toNEvent()
-                    notificationManager().sendDMNotification(content, user, userPicture, noteUri, applicationContext)
+                    notificationManager().sendDMNotification(event.id, content, user, userPicture, noteUri, applicationContext)
                 }
             }
         }
@@ -88,7 +88,7 @@ class EventNotificationConsumer(private val applicationContext: Context) {
                 }
                 val userPicture = senderInfo?.first?.profilePicture()
                 val noteUri = "nostr:Notifications"
-                notificationManager().sendZapNotification(content, title, userPicture, noteUri, applicationContext)
+                notificationManager().sendZapNotification(event.id, content, title, userPicture, noteUri, applicationContext)
             }
         }
     }

app/src/main/java/com/vitorpamplona/amethyst/service/notifications/NotificationUtils.kt

@@ -15,10 +15,6 @@ import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.ui.MainActivity
 
 object NotificationUtils {
-
-    // Notification ID.
-    private var notificationId = 0
-
     private var dmChannel: NotificationChannel? = null
     private var zapChannel: NotificationChannel? = null
 
@@ -63,6 +59,7 @@ object NotificationUtils {
     }
 
     fun NotificationManager.sendZapNotification(
+        id: String,
         messageBody: String,
         messageTitle: String,
         pictureUrl: String?,
@@ -72,10 +69,11 @@ object NotificationUtils {
         val zapChannel = getOrCreateZapChannel(applicationContext)
         val channelId = applicationContext.getString(R.string.app_notification_zaps_channel_id)
 
-        sendNotification(messageBody, messageTitle, pictureUrl, uri, channelId, applicationContext)
+        sendNotification(id, messageBody, messageTitle, pictureUrl, uri, channelId, applicationContext)
     }
 
     fun NotificationManager.sendDMNotification(
+        id: String,
         messageBody: String,
         messageTitle: String,
         pictureUrl: String?,
@@ -85,10 +83,11 @@ object NotificationUtils {
         val dmChannel = getOrCreateDMChannel(applicationContext)
         val channelId = applicationContext.getString(R.string.app_notification_dms_channel_id)
 
-        sendNotification(messageBody, messageTitle, pictureUrl, uri, channelId, applicationContext)
+        sendNotification(id, messageBody, messageTitle, pictureUrl, uri, channelId, applicationContext)
     }
 
     fun NotificationManager.sendNotification(
+        id: String,
         messageBody: String,
         messageTitle: String,
         pictureUrl: String?,
@@ -104,6 +103,7 @@ object NotificationUtils {
             val imageLoader = ImageLoader(applicationContext)
             val imageResult = imageLoader.executeBlocking(request)
             sendNotification(
+                id = id,
                 messageBody = messageBody,
                 messageTitle = messageTitle,
                 picture = imageResult.drawable as? BitmapDrawable,
@@ -113,6 +113,7 @@ object NotificationUtils {
             )
         } else {
             sendNotification(
+                id = id,
                 messageBody = messageBody,
                 messageTitle = messageTitle,
                 picture = null,
@@ -124,6 +125,7 @@ object NotificationUtils {
     }
 
     private fun NotificationManager.sendNotification(
+        id: String,
         messageBody: String,
         messageTitle: String,
         picture: BitmapDrawable?,
@@ -137,7 +139,7 @@ object NotificationUtils {
 
         val contentPendingIntent = PendingIntent.getActivity(
             applicationContext,
-            notificationId,
+            id.hashCode(),
             contentIntent,
             PendingIntent.FLAG_MUTABLE
         )
@@ -171,9 +173,7 @@ object NotificationUtils {
             .setPriority(NotificationCompat.PRIORITY_HIGH)
             .setAutoCancel(true)
 
-        notify(notificationId, builder.build())
-
-        notificationId++
+        notify(id.hashCode(), builder.build())
     }
 
     /**

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

@@ -0,0 +1,351 @@
+package com.vitorpamplona.amethyst.ui.actions
+
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.defaultMinSize
+import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.heightIn
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.itemsIndexed
+import androidx.compose.foundation.lazy.rememberLazyListState
+import androidx.compose.material.Divider
+import androidx.compose.material.Icon
+import androidx.compose.material.IconButton
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.OutlinedTextField
+import androidx.compose.material.Surface
+import androidx.compose.material.Text
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Clear
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.DisposableEffect
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.livedata.observeAsState
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.ui.Alignment
+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.LocalLifecycleOwner
+import androidx.compose.ui.platform.LocalSoftwareKeyboardController
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.window.Dialog
+import androidx.compose.ui.window.DialogProperties
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleEventObserver
+import androidx.lifecycle.viewmodel.compose.viewModel
+import androidx.navigation.NavController
+import com.vitorpamplona.amethyst.R
+import com.vitorpamplona.amethyst.model.Account
+import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.model.User
+import com.vitorpamplona.amethyst.service.NostrSearchEventOrUserDataSource
+import com.vitorpamplona.amethyst.ui.note.ChannelName
+import com.vitorpamplona.amethyst.ui.note.UserPicture
+import com.vitorpamplona.amethyst.ui.note.UsernameDisplay
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.SearchBarViewModel
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.channels.Channel
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.flow.debounce
+import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.filter
+import kotlinx.coroutines.flow.receiveAsFlow
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+
+@Composable
+fun JoinUserOrChannelView(onClose: () -> Unit, account: Account, navController: NavController) {
+    val searchBarViewModel: SearchBarViewModel = viewModel()
+    searchBarViewModel.account = account
+
+    Dialog(
+        onDismissRequest = {
+            NostrSearchEventOrUserDataSource.clear()
+            searchBarViewModel.clean()
+            onClose()
+        },
+        properties = DialogProperties(
+            dismissOnClickOutside = false
+        )
+    ) {
+        Surface() {
+            Column(
+                modifier = Modifier.padding(10.dp).heightIn(min = 500.dp)
+            ) {
+                Row(
+                    modifier = Modifier.fillMaxWidth(),
+                    horizontalArrangement = Arrangement.SpaceBetween,
+                    verticalAlignment = Alignment.CenterVertically
+                ) {
+                    CloseButton(onCancel = {
+                        searchBarViewModel.clean()
+                        NostrSearchEventOrUserDataSource.clear()
+                        onClose()
+                    })
+
+                    Text(
+                        text = stringResource(R.string.channel_list_join_conversation),
+                        fontWeight = FontWeight.Bold
+                    )
+
+                    Text(
+                        text = "",
+                        color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f),
+                        fontWeight = FontWeight.Bold
+                    )
+                }
+
+                Spacer(modifier = Modifier.height(15.dp))
+
+                RenderSeach(searchBarViewModel, account, navController)
+            }
+        }
+    }
+}
+
+@OptIn(ExperimentalComposeUiApi::class)
+@Composable
+private fun RenderSeach(
+    searchBarViewModel: SearchBarViewModel,
+    account: Account,
+    navController: NavController
+) {
+    val scope = rememberCoroutineScope()
+    val listState = rememberLazyListState()
+
+    // initialize focus reference to be able to request focus programmatically
+    val focusRequester = remember { FocusRequester() }
+    val keyboardController = LocalSoftwareKeyboardController.current
+
+    val onlineSearch = NostrSearchEventOrUserDataSource
+
+    val lifeCycleOwner = LocalLifecycleOwner.current
+
+    // Create a channel for processing search queries.
+    val searchTextChanges = remember {
+        Channel<String>(Channel.CONFLATED)
+    }
+
+    LaunchedEffect(Unit) {
+        scope.launch(Dispatchers.IO) {
+            LocalCache.live.newEventBundles.collect {
+                if (searchBarViewModel.isSearching()) {
+                    searchBarViewModel.invalidateData()
+                }
+            }
+        }
+    }
+
+    LaunchedEffect(Unit) {
+        delay(100)
+        focusRequester.requestFocus()
+
+        // Wait for text changes to stop for 300 ms before firing off search.
+        withContext(Dispatchers.IO) {
+            searchTextChanges.receiveAsFlow()
+                .filter { it.isNotBlank() }
+                .distinctUntilChanged()
+                .debounce(300)
+                .collectLatest {
+                    if (it.length >= 2) {
+                        onlineSearch.search(it.trim())
+                    }
+
+                    searchBarViewModel.invalidateData()
+
+                    // makes sure to show the top of the search
+                    scope.launch(Dispatchers.Main) {
+                        listState.animateScrollToItem(0)
+                    }
+                }
+        }
+    }
+
+    DisposableEffect(Unit) {
+        val observer = LifecycleEventObserver { _, event ->
+            if (event == Lifecycle.Event.ON_RESUME) {
+                println("Join Start")
+                NostrSearchEventOrUserDataSource.start()
+                searchBarViewModel.invalidateData()
+            }
+            if (event == Lifecycle.Event.ON_PAUSE) {
+                println("Join Stop")
+                NostrSearchEventOrUserDataSource.clear()
+                NostrSearchEventOrUserDataSource.stop()
+            }
+        }
+
+        lifeCycleOwner.lifecycle.addObserver(observer)
+        onDispose {
+            lifeCycleOwner.lifecycle.removeObserver(observer)
+        }
+    }
+
+    // LAST ROW
+    Row(
+        modifier = Modifier.padding(horizontal = 10.dp).fillMaxWidth(),
+        horizontalArrangement = Arrangement.SpaceBetween,
+        verticalAlignment = Alignment.CenterVertically
+    ) {
+        OutlinedTextField(
+            label = { Text(text = stringResource(R.string.channel_list_user_or_group_id)) },
+            value = searchBarViewModel.searchValue,
+            onValueChange = {
+                searchBarViewModel.updateSearchValue(it)
+                scope.launch(Dispatchers.IO) {
+                    searchTextChanges.trySend(it)
+                }
+            },
+            leadingIcon = {
+                Icon(
+                    painter = painterResource(R.drawable.ic_search),
+                    contentDescription = null,
+                    modifier = Modifier.size(20.dp),
+                    tint = Color.Unspecified
+                )
+            },
+            modifier = Modifier
+                .weight(1f, true)
+                .defaultMinSize(minHeight = 20.dp)
+                .focusRequester(focusRequester)
+                .onFocusChanged {
+                    if (it.isFocused) {
+                        keyboardController?.show()
+                    }
+                },
+            placeholder = {
+                Text(
+                    text = stringResource(R.string.channel_list_user_or_group_id_demo),
+                    color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                )
+            },
+            trailingIcon = {
+                if (searchBarViewModel.isTrailingIconVisible) {
+                    IconButton(
+                        onClick = {
+                            searchBarViewModel.clean()
+                            onlineSearch.clear()
+                        }
+                    ) {
+                        Icon(
+                            imageVector = Icons.Default.Clear,
+                            contentDescription = stringResource(R.string.clear)
+                        )
+                    }
+                }
+            }
+        )
+    }
+
+    if (searchBarViewModel.searchValue.isNotBlank()) {
+        Row(
+            modifier = Modifier.fillMaxWidth().fillMaxHeight().padding(vertical = 10.dp)
+        ) {
+            LazyColumn(
+                modifier = Modifier.fillMaxHeight(),
+                contentPadding = PaddingValues(
+                    top = 10.dp,
+                    bottom = 10.dp
+                ),
+                state = listState
+            ) {
+                itemsIndexed(
+                    searchBarViewModel.searchResults.value,
+                    key = { _, item -> "u" + item.pubkeyHex }
+                ) { _, item ->
+                    UserComposeForChat(
+                        item,
+                        account = account,
+                        navController = navController
+                    )
+                }
+
+                itemsIndexed(
+                    searchBarViewModel.searchResultsChannels.value,
+                    key = { _, item -> "c" + item.idHex }
+                ) { _, item ->
+                    ChannelName(
+                        channelIdHex = item.idHex,
+                        channelPicture = item.profilePicture(),
+                        channelTitle = {
+                            Text(
+                                "${item.info.name}",
+                                fontWeight = FontWeight.Bold
+                            )
+                        },
+                        channelLastTime = null,
+                        channelLastContent = item.info.about,
+                        false,
+                        onClick = { navController.navigate("Channel/${item.idHex}") }
+                    )
+                }
+            }
+        }
+    }
+}
+
+@Composable
+fun UserComposeForChat(
+    baseUser: User,
+    account: Account,
+    navController: NavController
+) {
+    Column(
+        modifier =
+        Modifier.clickable(
+            onClick = { navController.navigate("Room/${baseUser.pubkeyHex}") }
+        )
+    ) {
+        Row(
+            modifier = Modifier
+                .padding(
+                    start = 12.dp,
+                    end = 12.dp,
+                    top = 10.dp
+                ),
+            verticalAlignment = Alignment.CenterVertically
+        ) {
+            UserPicture(baseUser, navController, account.userProfile(), 55.dp)
+
+            Column(modifier = Modifier.padding(start = 10.dp).weight(1f)) {
+                Row(verticalAlignment = Alignment.CenterVertically) {
+                    UsernameDisplay(baseUser)
+                }
+
+                val baseUserState by baseUser.live().metadata.observeAsState()
+                val user = baseUserState?.user ?: return
+
+                Text(
+                    user.info?.about ?: "",
+                    color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f),
+                    maxLines = 1,
+                    overflow = TextOverflow.Ellipsis
+                )
+            }
+        }
+
+        Divider(
+            modifier = Modifier.padding(top = 10.dp),
+            thickness = 0.25.dp
+        )
+    }
+}

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

@@ -3,6 +3,7 @@ package com.vitorpamplona.amethyst.ui.actions
 import android.graphics.Bitmap
 import android.net.Uri
 import android.os.Build
+import android.util.Log
 import android.util.Size
 import android.widget.Toast
 import androidx.compose.foundation.BorderStroke
@@ -24,8 +25,10 @@ import androidx.compose.material.icons.filled.CurrencyBitcoin
 import androidx.compose.material.icons.outlined.ArrowForwardIos
 import androidx.compose.material.icons.outlined.Bolt
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.livedata.observeAsState
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
@@ -47,6 +50,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.input.KeyboardCapitalization
 import androidx.compose.ui.text.input.TextFieldValue
+import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.style.TextDirection
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
@@ -58,9 +62,9 @@ import coil.compose.AsyncImage
 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.model.User
+import com.vitorpamplona.amethyst.service.NostrSearchEventOrUserDataSource
 import com.vitorpamplona.amethyst.ui.components.*
-import com.vitorpamplona.amethyst.ui.note.ReplyInformation
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.TextSpinner
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.UserLine
@@ -81,6 +85,7 @@ fun NewPostView(onClose: () -> Unit, baseReplyTo: Note? = null, quote: Note? = n
     val keyboardController = LocalSoftwareKeyboardController.current
 
     val scroolState = rememberScrollState()
+    val scope = rememberCoroutineScope()
 
     LaunchedEffect(Unit) {
         postViewModel.load(account, baseReplyTo, quote)
@@ -92,6 +97,12 @@ fun NewPostView(onClose: () -> Unit, baseReplyTo: Note? = null, quote: Note? = n
         }
     }
 
+    DisposableEffect(Unit) {
+        onDispose {
+            NostrSearchEventOrUserDataSource.clear()
+        }
+    }
+
     Dialog(
         onDismissRequest = { onClose() },
         properties = DialogProperties(
@@ -145,10 +156,8 @@ fun NewPostView(onClose: () -> Unit, baseReplyTo: Note? = null, quote: Note? = n
                                 .fillMaxWidth()
                                 .verticalScroll(scroolState)
                         ) {
-                            if (postViewModel.replyTos != null && baseReplyTo?.event is TextNoteEvent) {
-                                ReplyInformation(postViewModel.replyTos, postViewModel.mentions, account, "✖ ") {
-                                    postViewModel.removeFromReplyList(it)
-                                }
+                            Notifying(postViewModel.mentions) {
+                                postViewModel.removeFromReplyList(it)
                             }
 
                             OutlinedTextField(
@@ -219,6 +228,11 @@ fun NewPostView(onClose: () -> Unit, baseReplyTo: Note? = null, quote: Note? = n
                                         },
                                         onCancel = {
                                             postViewModel.contentToAddUrl = null
+                                        },
+                                        onError = {
+                                            scope.launch {
+                                                postViewModel.imageUploadingError.emit(it)
+                                            }
                                         }
                                     )
                                 }
@@ -345,6 +359,48 @@ fun NewPostView(onClose: () -> Unit, baseReplyTo: Note? = null, quote: Note? = n
     }
 }
 
+@OptIn(ExperimentalLayoutApi::class)
+@Composable
+fun Notifying(baseMentions: List<User>?, onClick: (User) -> Unit) {
+    val mentions = baseMentions?.toSet()
+
+    FlowRow(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.padding(horizontal = 10.dp)) {
+        if (!mentions.isNullOrEmpty()) {
+            Text(
+                stringResource(R.string.reply_notify),
+                fontWeight = FontWeight.Bold,
+                color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+            )
+
+            mentions.forEachIndexed { idx, user ->
+                val innerUserState by user.live().metadata.observeAsState()
+                val innerUser = innerUserState?.user
+
+                innerUser?.let { myUser ->
+                    Spacer(modifier = Modifier.width(5.dp))
+
+                    Button(
+                        shape = RoundedCornerShape(20.dp),
+                        colors = ButtonDefaults.buttonColors(
+                            backgroundColor = MaterialTheme.colors.primary.copy(alpha = 0.32f)
+                        ),
+                        onClick = {
+                            onClick(myUser)
+                        }
+                    ) {
+                        CreateTextWithEmoji(
+                            text = "✖ ${myUser.toBestDisplayName()}",
+                            tags = myUser.info?.latestMetadata?.tags,
+                            color = Color.White,
+                            textAlign = TextAlign.Center
+                        )
+                    }
+                }
+            }
+        }
+    }
+}
+
 @Composable
 private fun AddPollButton(
     isPollActive: Boolean,
@@ -601,7 +657,8 @@ fun ImageVideoDescription(
     uri: Uri,
     defaultServer: ServersAvailable,
     onAdd: (String, ServersAvailable) -> Unit,
-    onCancel: () -> Unit
+    onCancel: () -> Unit,
+    onError: (String) -> Unit
 ) {
     val resolver = LocalContext.current.contentResolver
     val mediaType = resolver.getType(uri) ?: ""
@@ -709,7 +766,12 @@ fun ImageVideoDescription(
 
                     LaunchedEffect(key1 = uri) {
                         scope.launch(Dispatchers.IO) {
-                            bitmap = resolver.loadThumbnail(uri, Size(1200, 1000), null)
+                            try {
+                                bitmap = resolver.loadThumbnail(uri, Size(1200, 1000), null)
+                            } catch (e: Exception) {
+                                onError("Unable to load file")
+                                Log.e("NewPostView", "Couldn't create thumbnail for $uri")
+                            }
                         }
                     }
 

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

@@ -14,6 +14,7 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.vitorpamplona.amethyst.model.*
 import com.vitorpamplona.amethyst.service.FileHeader
+import com.vitorpamplona.amethyst.service.NostrSearchEventOrUserDataSource
 import com.vitorpamplona.amethyst.service.model.PrivateDmEvent
 import com.vitorpamplona.amethyst.service.model.TextNoteEvent
 import com.vitorpamplona.amethyst.ui.components.isValidURL
@@ -188,6 +189,8 @@ open class NewPostViewModel : ViewModel() {
         userSuggestions = emptyList()
         userSuggestionAnchor = null
         userSuggestionsMainMessage = null
+
+        NostrSearchEventOrUserDataSource.clear()
     }
 
     open fun findUrlInMessage(): String? {
@@ -198,8 +201,8 @@ open class NewPostViewModel : ViewModel() {
         }
     }
 
-    open fun removeFromReplyList(it: User) {
-        mentions = mentions?.minus(it)
+    open fun removeFromReplyList(userToRemove: User) {
+        mentions = mentions?.filter { it != userToRemove }
     }
 
     open fun updateMessage(it: TextFieldValue) {
@@ -211,8 +214,10 @@ open class NewPostViewModel : ViewModel() {
             userSuggestionAnchor = it.selection
             userSuggestionsMainMessage = true
             if (lastWord.startsWith("@") && lastWord.length > 2) {
-                userSuggestions = LocalCache.findUsersStartingWith(lastWord.removePrefix("@"))
+                NostrSearchEventOrUserDataSource.search(lastWord.removePrefix("@"))
+                userSuggestions = LocalCache.findUsersStartingWith(lastWord.removePrefix("@")).sortedWith(compareBy({ account?.isFollowing(it) }, { it.toBestDisplayName() })).reversed()
             } else {
+                NostrSearchEventOrUserDataSource.clear()
                 userSuggestions = emptyList()
             }
         }
@@ -225,8 +230,10 @@ open class NewPostViewModel : ViewModel() {
             userSuggestionAnchor = it.selection
             userSuggestionsMainMessage = false
             if (lastWord.startsWith("@") && lastWord.length > 2) {
-                userSuggestions = LocalCache.findUsersStartingWith(lastWord.removePrefix("@"))
+                NostrSearchEventOrUserDataSource.search(lastWord.removePrefix("@"))
+                userSuggestions = LocalCache.findUsersStartingWith(lastWord.removePrefix("@")).sortedWith(compareBy({ account?.isFollowing(it) }, { it.toBestDisplayName() })).reversed()
             } else {
+                NostrSearchEventOrUserDataSource.clear()
                 userSuggestions = emptyList()
             }
         }

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

@@ -6,69 +6,78 @@ import androidx.compose.material.ButtonDefaults
 import androidx.compose.material.Icon
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.OutlinedButton
+import androidx.compose.material.Text
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.Add
 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.res.stringResource
+import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
+import androidx.navigation.NavController
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.model.Account
-import com.vitorpamplona.amethyst.ui.actions.NewPollView
+import com.vitorpamplona.amethyst.ui.actions.JoinUserOrChannelView
+import com.vitorpamplona.amethyst.ui.actions.NewChannelView
 
 @Composable
-fun FabColumn(account: Account) {
+fun ChannelFabColumn(account: Account, navController: NavController) {
     var isOpen by remember {
         mutableStateOf(false)
     }
-    var wantsToPoll by remember {
+
+    var wantsToJoinChannelOrUser by remember {
         mutableStateOf(false)
     }
-    var wantsToPost by remember {
+
+    var wantsToCreateChannel by remember {
         mutableStateOf(false)
     }
 
+    if (wantsToCreateChannel) {
+        NewChannelView({ wantsToCreateChannel = false }, account = account)
+    }
+
+    if (wantsToJoinChannelOrUser) {
+        JoinUserOrChannelView({ wantsToJoinChannelOrUser = false }, account = account, navController = navController)
+    }
+
     Column() {
         if (isOpen) {
             OutlinedButton(
-                onClick = {
-                    wantsToPoll = true
-                    isOpen = false
-                },
-                modifier = Modifier.size(45.dp),
+                onClick = { wantsToJoinChannelOrUser = true; isOpen = false },
+                modifier = Modifier.size(55.dp),
                 shape = CircleShape,
                 colors = ButtonDefaults.outlinedButtonColors(backgroundColor = MaterialTheme.colors.primary),
-                contentPadding = PaddingValues(0.dp)
+                contentPadding = PaddingValues(bottom = 3.dp)
             ) {
-                Icon(
-                    painter = painterResource(R.drawable.ic_poll),
-                    null,
-                    modifier = Modifier.size(26.dp),
-                    tint = Color.White
+                Text(
+                    text = stringResource(R.string.channel_list_join_channel),
+                    color = Color.White,
+                    textAlign = TextAlign.Center
                 )
             }
 
             Spacer(modifier = Modifier.height(20.dp))
 
             OutlinedButton(
-                onClick = {
-                    wantsToPost = true
-                    isOpen = false
-                },
-                modifier = Modifier.size(45.dp),
+                onClick = { wantsToCreateChannel = true; isOpen = false },
+                modifier = Modifier.size(55.dp),
                 shape = CircleShape,
                 colors = ButtonDefaults.outlinedButtonColors(backgroundColor = MaterialTheme.colors.primary),
-                contentPadding = PaddingValues(0.dp)
+                contentPadding = PaddingValues(bottom = 3.dp)
             ) {
-                Icon(
-                    painter = painterResource(R.drawable.ic_lists),
-                    null,
-                    modifier = Modifier.size(26.dp),
-                    tint = Color.White
+                Text(
+                    text = stringResource(R.string.channel_list_create_channel),
+                    color = Color.White,
+                    textAlign = TextAlign.Center
                 )
             }
 
             Spacer(modifier = Modifier.height(20.dp))
         }
+
         OutlinedButton(
             onClick = { isOpen = !isOpen },
             modifier = Modifier.size(55.dp),
@@ -77,19 +86,11 @@ fun FabColumn(account: Account) {
             contentPadding = PaddingValues(0.dp)
         ) {
             Icon(
-                painter = painterResource(R.drawable.ic_compose),
-                null,
+                imageVector = Icons.Outlined.Add,
+                contentDescription = stringResource(R.string.new_channel),
                 modifier = Modifier.size(26.dp),
                 tint = Color.White
             )
         }
     }
-
-    if (wantsToPost) {
-        // NewPostView({ wantsToPost = false }, account = NostrAccountDataSource.account)
-    }
-
-    if (wantsToPoll) {
-        NewPollView({ wantsToPoll = false }, account = account)
-    }
 }

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

@@ -8,8 +8,8 @@ import kotlinx.coroutines.NonCancellable
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
+import java.util.concurrent.LinkedBlockingQueue
 import java.util.concurrent.atomic.AtomicBoolean
-import java.util.concurrent.atomic.AtomicReference
 
 /**
  * This class is designed to have a waiting time between two calls of invalidate
@@ -54,23 +54,26 @@ class BundledInsert<T>(
     val dispatcher: CoroutineDispatcher = Dispatchers.Default
 ) {
     private var onlyOneInBlock = AtomicBoolean()
-    private var atomicSet = AtomicReference<Set<T>>(setOf<T>())
-
-    fun invalidateList(newObject: T, onUpdate: (Set<T>) -> Unit) {
-        atomicSet.updateAndGet() {
-            it + newObject
-        }
+    private var queue = LinkedBlockingQueue<T>()
 
+    fun invalidateList(newObject: T, onUpdate: suspend (Set<T>) -> Unit) {
+        queue.put(newObject)
         if (onlyOneInBlock.getAndSet(true)) {
             return
         }
 
         val scope = CoroutineScope(Job() + dispatcher)
-        scope.launch {
+        scope.launch(Dispatchers.IO) {
             try {
-                onUpdate(atomicSet.getAndSet(emptySet()))
+                val mySet = mutableSetOf<T>()
+                queue.drainTo(mySet)
+                onUpdate(mySet)
+
                 delay(delay)
-                onUpdate(atomicSet.getAndSet(emptySet()))
+
+                val mySet2 = mutableSetOf<T>()
+                queue.drainTo(mySet2)
+                onUpdate(mySet2)
             } finally {
                 withContext(NonCancellable) {
                     onlyOneInBlock.set(false)

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

@@ -1,6 +1,14 @@
 package com.vitorpamplona.amethyst.ui.components
 
+import androidx.compose.foundation.gestures.detectTapGestures
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.text.BasicText
 import androidx.compose.foundation.text.ClickableText
+import androidx.compose.foundation.text.InlineTextContent
+import androidx.compose.foundation.text.appendInlineContent
+import androidx.compose.material.LocalContentAlpha
+import androidx.compose.material.LocalContentColor
 import androidx.compose.material.LocalTextStyle
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Text
@@ -11,12 +19,30 @@ import androidx.compose.runtime.livedata.observeAsState
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.takeOrElse
+import androidx.compose.ui.input.pointer.pointerInput
+import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.Placeholder
+import androidx.compose.ui.text.PlaceholderVerticalAlign
+import androidx.compose.ui.text.SpanStyle
+import androidx.compose.ui.text.TextLayoutResult
+import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.buildAnnotatedString
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.text.withStyle
+import androidx.compose.ui.unit.TextUnit
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
 import androidx.navigation.NavController
+import coil.compose.AsyncImage
 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.model.User
+import com.vitorpamplona.amethyst.service.NIP30Parser
 import com.vitorpamplona.amethyst.service.model.ChannelCreateEvent
 import com.vitorpamplona.amethyst.service.model.PrivateDmEvent
 import com.vitorpamplona.amethyst.service.nip19.Nip19
@@ -63,31 +89,31 @@ private fun DisplayEvent(
 
         if (note.event is ChannelCreateEvent) {
             CreateClickableText(
-                note.idDisplayNote(),
-                nip19.additionalChars,
-                "Channel/${nip19.hex}",
-                navController
+                clickablePart = "@${note.idDisplayNote()}",
+                suffix = "${nip19.additionalChars} ",
+                route = "Channel/${nip19.hex}",
+                navController = navController
             )
         } else if (note.event is PrivateDmEvent) {
             CreateClickableText(
-                note.idDisplayNote(),
-                nip19.additionalChars,
-                "Room/${note.author?.pubkeyHex}",
-                navController
+                clickablePart = "@${note.idDisplayNote()}",
+                suffix = "${nip19.additionalChars} ",
+                route = "Room/${note.author?.pubkeyHex}",
+                navController = navController
             )
         } else if (channel != null) {
             CreateClickableText(
-                channel.toBestDisplayName(),
-                nip19.additionalChars,
-                "Channel/${note.channel()?.idHex}",
-                navController
+                clickablePart = channel.toBestDisplayName(),
+                suffix = "${nip19.additionalChars} ",
+                route = "Channel/${note.channel()?.idHex}",
+                navController = navController
             )
         } else {
             CreateClickableText(
-                note.idDisplayNote(),
-                nip19.additionalChars,
-                "Event/${nip19.hex}",
-                navController
+                clickablePart = "@${note.idDisplayNote()}",
+                suffix = "${nip19.additionalChars} ",
+                route = "Event/${nip19.hex}",
+                navController = navController
             )
         }
     }
@@ -114,36 +140,36 @@ private fun DisplayNote(
 
     noteBase?.let {
         val noteState by it.live().metadata.observeAsState()
-        val note = noteState?.note ?: return
+        val note = remember(noteState) { noteState?.note } ?: return
         val channel = note.channel()
 
         if (note.event is ChannelCreateEvent) {
             CreateClickableText(
-                note.idDisplayNote(),
-                nip19.additionalChars,
-                "Channel/${nip19.hex}",
-                navController
+                clickablePart = "@${note.idDisplayNote()}",
+                suffix = "${nip19.additionalChars} ",
+                route = "Channel/${nip19.hex}",
+                navController = navController
             )
         } else if (note.event is PrivateDmEvent) {
             CreateClickableText(
-                note.idDisplayNote(),
-                nip19.additionalChars,
-                "Room/${note.author?.pubkeyHex}",
-                navController
+                clickablePart = "@${note.idDisplayNote()}",
+                suffix = "${nip19.additionalChars} ",
+                route = "Room/${note.author?.pubkeyHex}",
+                navController = navController
             )
         } else if (channel != null) {
             CreateClickableText(
-                channel.toBestDisplayName(),
-                nip19.additionalChars,
-                "Channel/${note.channel()?.idHex}",
-                navController
+                clickablePart = channel.toBestDisplayName(),
+                suffix = "${nip19.additionalChars} ",
+                route = "Channel/${note.channel()?.idHex}",
+                navController = navController
             )
         } else {
             CreateClickableText(
-                note.idDisplayNote(),
-                nip19.additionalChars,
-                "Note/${nip19.hex}",
-                navController
+                clickablePart = "@${note.idDisplayNote()}",
+                suffix = "${nip19.additionalChars} ",
+                route = "Note/${nip19.hex}",
+                navController = navController
             )
         }
     }
@@ -173,10 +199,10 @@ private fun DisplayAddress(
         val note = noteState?.note ?: return
 
         CreateClickableText(
-            note.idDisplayNote(),
-            nip19.additionalChars,
-            "Note/${nip19.hex}",
-            navController
+            clickablePart = "@${note.idDisplayNote()}",
+            suffix = "${nip19.additionalChars} ",
+            route = "Note/${nip19.hex}",
+            navController = navController
         )
     }
 
@@ -202,14 +228,19 @@ private fun DisplayUser(
 
     userBase?.let {
         val userState by it.live().metadata.observeAsState()
-        val user = userState?.user ?: return
+        val route = remember { "User/${it.pubkeyHex}" }
+        val userDisplayName = remember(userState) { userState?.user?.toBestDisplayName() }
+        val userTags = remember(userState) { userState?.user?.info?.latestMetadata?.tags }
 
-        CreateClickableText(
-            user.toBestDisplayName(),
-            nip19.additionalChars,
-            "User/${nip19.hex}",
-            navController
-        )
+        if (userDisplayName != null) {
+            CreateClickableTextWithEmoji(
+                clickablePart = userDisplayName,
+                suffix = "${nip19.additionalChars} ",
+                tags = userTags,
+                route = route,
+                navController = navController
+            )
+        }
     }
 
     if (userBase == null) {
@@ -220,20 +251,281 @@ private fun DisplayUser(
 }
 
 @Composable
-fun CreateClickableText(clickablePart: String, suffix: String, route: String, navController: NavController) {
+fun CreateClickableText(
+    clickablePart: String,
+    suffix: String,
+    overrideColor: Color? = null,
+    fontWeight: FontWeight = FontWeight.Normal,
+    route: String,
+    navController: NavController
+) {
     ClickableText(
         text = buildAnnotatedString {
             withStyle(
-                LocalTextStyle.current.copy(color = MaterialTheme.colors.primary).toSpanStyle()
+                LocalTextStyle.current.copy(color = overrideColor ?: MaterialTheme.colors.primary, fontWeight = fontWeight).toSpanStyle()
             ) {
-                append("@$clickablePart")
+                append(clickablePart)
             }
             withStyle(
-                LocalTextStyle.current.copy(color = MaterialTheme.colors.onBackground).toSpanStyle()
+                LocalTextStyle.current.copy(color = overrideColor ?: MaterialTheme.colors.onBackground, fontWeight = fontWeight).toSpanStyle()
             ) {
-                append("$suffix ")
+                append(suffix)
             }
         },
         onClick = { navController.navigate(route) }
     )
 }
+
+@Composable
+fun CreateTextWithEmoji(
+    text: String,
+    tags: List<List<String>>?,
+    color: Color = Color.Unspecified,
+    textAlign: TextAlign? = null,
+    fontWeight: FontWeight? = null,
+    fontSize: TextUnit = TextUnit.Unspecified,
+    maxLines: Int = Int.MAX_VALUE,
+    overflow: TextOverflow = TextOverflow.Clip,
+    modifier: Modifier = Modifier
+) {
+    val emojis = remember {
+        tags?.filter { it.size > 2 && it[0] == "emoji" }?.associate { ":${it[1]}:" to it[2] } ?: emptyMap()
+    }
+
+    CreateTextWithEmoji(text, emojis, color, textAlign, fontWeight, fontSize, maxLines, overflow, modifier)
+}
+
+@Composable
+fun CreateTextWithEmoji(
+    text: String,
+    emojis: Map<String, String>,
+    color: Color = Color.Unspecified,
+    textAlign: TextAlign? = null,
+    fontWeight: FontWeight? = null,
+    fontSize: TextUnit = TextUnit.Unspecified,
+    maxLines: Int = Int.MAX_VALUE,
+    overflow: TextOverflow = TextOverflow.Clip,
+    modifier: Modifier = Modifier
+) {
+    val textColor = color.takeOrElse {
+        LocalTextStyle.current.color.takeOrElse {
+            LocalContentColor.current.copy(alpha = LocalContentAlpha.current)
+        }
+    }
+
+    if (emojis.isEmpty()) {
+        Text(
+            text = text,
+            color = textColor,
+            textAlign = textAlign,
+            fontWeight = fontWeight,
+            fontSize = fontSize,
+            maxLines = maxLines,
+            overflow = overflow,
+            modifier = modifier
+        )
+    } else {
+        val myList = remember {
+            assembleAnnotatedList(text, emojis)
+        }
+
+        val style = LocalTextStyle.current.merge(
+            TextStyle(
+                color = textColor,
+                textAlign = textAlign,
+                fontWeight = fontWeight,
+                fontSize = fontSize
+            )
+        ).toSpanStyle()
+
+        InLineIconRenderer(myList, style, maxLines, overflow, modifier)
+    }
+}
+
+@Composable
+fun CreateClickableTextWithEmoji(
+    clickablePart: String,
+    tags: List<List<String>>?,
+    style: TextStyle,
+    onClick: (Int) -> Unit
+) {
+    val emojis = remember(tags) {
+        tags?.filter { it.size > 2 && it[0] == "emoji" }?.associate { ":${it[1]}:" to it[2] } ?: emptyMap()
+    }
+
+    if (emojis.isEmpty()) {
+        ClickableText(
+            AnnotatedString(clickablePart),
+            style = style,
+            onClick = onClick
+        )
+    } else {
+        val myList = remember {
+            assembleAnnotatedList(clickablePart, emojis)
+        }
+
+        ClickableInLineIconRenderer(myList, style.toSpanStyle()) {
+            onClick(it)
+        }
+    }
+}
+
+@Composable
+fun CreateClickableTextWithEmoji(
+    clickablePart: String,
+    suffix: String,
+    tags: List<List<String>>?,
+    overrideColor: Color? = null,
+    fontWeight: FontWeight = FontWeight.Normal,
+    route: String,
+    navController: NavController
+) {
+    val emojis = remember(tags) {
+        tags?.filter { it.size > 2 && it[0] == "emoji" }?.associate { ":${it[1]}:" to it[2] } ?: emptyMap()
+    }
+
+    if (emojis.isEmpty()) {
+        CreateClickableText(clickablePart, suffix, overrideColor, fontWeight, route, navController)
+    } else {
+        val myList = remember {
+            assembleAnnotatedList(clickablePart, emojis)
+        }
+
+        ClickableInLineIconRenderer(myList, LocalTextStyle.current.copy(color = overrideColor ?: MaterialTheme.colors.primary, fontWeight = fontWeight).toSpanStyle()) {
+            navController.navigate(route)
+        }
+
+        val myList2 = remember {
+            assembleAnnotatedList(suffix, emojis)
+        }
+
+        InLineIconRenderer(myList2, LocalTextStyle.current.copy(color = overrideColor ?: MaterialTheme.colors.onBackground, fontWeight = fontWeight).toSpanStyle())
+    }
+}
+
+fun assembleAnnotatedList(text: String, emojis: Map<String, String>): List<Renderable> {
+    return NIP30Parser().buildArray(text).map {
+        val url = emojis[it]
+        if (url != null) {
+            ImageUrlType(url)
+        } else {
+            TextType(it)
+        }
+    }
+}
+
+open class Renderable()
+class TextType(val text: String) : Renderable()
+class ImageUrlType(val url: String) : Renderable()
+
+@Composable
+fun ClickableInLineIconRenderer(wordsInOrder: List<Renderable>, style: SpanStyle, onClick: (Int) -> Unit) {
+    val inlineContent = wordsInOrder.mapIndexedNotNull { idx, value ->
+        if (value is ImageUrlType) {
+            Pair(
+                "inlineContent$idx",
+                InlineTextContent(
+                    Placeholder(
+                        width = 17.sp,
+                        height = 17.sp,
+                        placeholderVerticalAlign = PlaceholderVerticalAlign.Center
+                    )
+                ) {
+                    AsyncImage(
+                        model = value.url,
+                        contentDescription = null,
+                        modifier = Modifier.fillMaxSize().padding(1.dp)
+                    )
+                }
+            )
+        } else {
+            null
+        }
+    }.associate { it.first to it.second }
+
+    val annotatedText = buildAnnotatedString {
+        wordsInOrder.forEachIndexed { idx, value ->
+            withStyle(
+                style
+            ) {
+                if (value is TextType) {
+                    append(value.text)
+                } else if (value is ImageUrlType) {
+                    appendInlineContent("inlineContent$idx", "[icon]")
+                }
+            }
+        }
+    }
+
+    val layoutResult = remember { mutableStateOf<TextLayoutResult?>(null) }
+    val pressIndicator = Modifier.pointerInput(onClick) {
+        detectTapGestures { pos ->
+            layoutResult.value?.let { layoutResult ->
+                onClick(layoutResult.getOffsetForPosition(pos))
+            }
+        }
+    }
+
+    BasicText(
+        text = annotatedText,
+        modifier = pressIndicator,
+        inlineContent = inlineContent,
+        onTextLayout = {
+            layoutResult.value = it
+        }
+    )
+}
+
+@Composable
+fun InLineIconRenderer(
+    wordsInOrder: List<Renderable>,
+    style: SpanStyle,
+    maxLines: Int = Int.MAX_VALUE,
+    overflow: TextOverflow = TextOverflow.Clip,
+    modifier: Modifier = Modifier
+) {
+    val inlineContent = wordsInOrder.mapIndexedNotNull { idx, value ->
+        if (value is ImageUrlType) {
+            Pair(
+                "inlineContent$idx",
+                InlineTextContent(
+                    Placeholder(
+                        width = 17.sp,
+                        height = 17.sp,
+                        placeholderVerticalAlign = PlaceholderVerticalAlign.Center
+                    )
+                ) {
+                    AsyncImage(
+                        model = value.url,
+                        contentDescription = null,
+                        modifier = Modifier.fillMaxSize().padding(1.dp)
+                    )
+                }
+            )
+        } else {
+            null
+        }
+    }.associate { it.first to it.second }
+
+    val annotatedText = buildAnnotatedString {
+        wordsInOrder.forEachIndexed { idx, value ->
+            withStyle(
+                style
+            ) {
+                if (value is TextType) {
+                    append(value.text)
+                } else if (value is ImageUrlType) {
+                    appendInlineContent("inlineContent$idx", "[icon]")
+                }
+            }
+        }
+    }
+
+    Text(
+        text = annotatedText,
+        inlineContent = inlineContent,
+        maxLines = maxLines,
+        overflow = overflow,
+        modifier = modifier
+    )
+}

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

@@ -13,6 +13,7 @@ import androidx.compose.material.ButtonDefaults
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
@@ -50,10 +51,14 @@ fun ExpandableRichTextViewer(
         minOf(firstSpaceAfterCut, firstNewLineAfterCut)
     }
 
-    val text = if (showFullText) {
-        content
-    } else {
-        content.take(whereToCut)
+    val text by remember(content) {
+        derivedStateOf {
+            if (showFullText) {
+                content
+            } else {
+                content.take(whereToCut)
+            }
+        }
     }
 
     Box {

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

@@ -44,6 +44,7 @@ import com.vitorpamplona.amethyst.service.nip19.Nip19
 import com.vitorpamplona.amethyst.ui.note.NoteCompose
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import java.net.MalformedURLException
 import java.net.URISyntaxException
@@ -80,7 +81,8 @@ fun isMarkdown(content: String): Boolean {
         content.startsWith("# ") ||
         content.contains("##") ||
         content.contains("__") ||
-        content.contains("```")
+        content.contains("```") ||
+        content.contains("](")
 }
 
 @Composable
@@ -106,9 +108,10 @@ fun RichTextViewer(
 
 class RichTextViewerState(
     val content: String,
-    val urlSet: LinkedHashSet<String>,
+    val urlSet: Set<String>,
     val imagesForPager: Map<String, ZoomableUrlContent>,
-    val imageList: List<ZoomableUrlContent>
+    val imageList: List<ZoomableUrlContent>,
+    val customEmoji: Map<String, String>
 )
 
 @Composable
@@ -121,11 +124,13 @@ private fun RenderRegular(
     navController: NavController
 ) {
     var processedState by remember {
-        mutableStateOf<RichTextViewerState?>(null)
+        mutableStateOf<RichTextViewerState?>(RichTextViewerState(content, emptySet(), emptyMap(), emptyList(), emptyMap()))
     }
 
+    val scope = rememberCoroutineScope()
+
     LaunchedEffect(key1 = content) {
-        withContext(Dispatchers.IO) {
+        scope.launch(Dispatchers.IO) {
             val urls = UrlDetector(content, UrlDetectorOptions.Default).detect()
             val urlSet = urls.mapTo(LinkedHashSet(urls.size)) { it.originalUrl }
             val imagesForPager = urlSet.mapNotNull { fullUrl ->
@@ -140,7 +145,11 @@ private fun RenderRegular(
             }.associateBy { it.url }
             val imageList = imagesForPager.values.toList()
 
-            processedState = RichTextViewerState(content, urlSet, imagesForPager, imageList)
+            val emojiMap = tags?.filter { it.size > 2 && it[0] == "emoji" }?.associate { ":${it[1]}:" to it[2] } ?: emptyMap()
+
+            if (urlSet.isNotEmpty() || emojiMap.isNotEmpty()) {
+                processedState = RichTextViewerState(content, urlSet, imagesForPager, imageList, emojiMap)
+            }
         }
     }
 
@@ -162,6 +171,8 @@ private fun RenderRegular(
                             ZoomableContentView(img, state.imageList)
                         } else if (state.urlSet.contains(word)) {
                             UrlPreview(word, "$word ")
+                        } else if (state.customEmoji.any { word.contains(it.key) }) {
+                            RenderCustomEmoji(word, state.customEmoji)
                         } else if (word.startsWith("lnbc", true)) {
                             MayBeInvoicePreview(word)
                         } else if (word.startsWith("lnurl", true)) {
@@ -230,6 +241,8 @@ private fun RenderRegular(
                                     style = LocalTextStyle.current.copy(textDirection = TextDirection.Content)
                                 )
                             }
+                        } else if (state.customEmoji.any { word.contains(it.key) }) {
+                            RenderCustomEmoji(word, state.customEmoji)
                         } else if (Patterns.EMAIL_ADDRESS.matcher(word).matches()) {
                             ClickableEmail(word)
                         } else if (Patterns.PHONE.matcher(word).matches() && word.length > 6) {
@@ -288,6 +301,14 @@ private fun RenderRegular(
     }
 }
 
+@Composable
+fun RenderCustomEmoji(word: String, customEmoji: Map<String, String>) {
+    CreateTextWithEmoji(
+        text = "$word ",
+        emojis = customEmoji
+    )
+}
+
 @Composable
 private fun RenderContentAsMarkdown(content: String, backgroundColor: Color) {
     val myMarkDownStyle = richTextDefaults.copy(
@@ -393,7 +414,7 @@ private fun RenderContentAsMarkdown(content: String, backgroundColor: Color) {
 
 private fun getDisplayNameFromNip19(nip19: Nip19.Return): String? {
     if (nip19.type == Nip19.Type.USER) {
-        return LocalCache.users[nip19.hex]?.bestDisplayName()
+        return LocalCache.users[nip19.hex]?.toBestDisplayName()
     } else if (nip19.type == Nip19.Type.NOTE) {
         return LocalCache.notes[nip19.hex]?.idDisplayNote()
     } else if (nip19.type == Nip19.Type.ADDRESS) {
@@ -595,8 +616,10 @@ fun TagLink(word: String, tags: List<List<String>>, canPreview: Boolean, backgro
     var baseUserPair by remember { mutableStateOf<Pair<User, String?>?>(null) }
     var baseNotePair by remember { mutableStateOf<Pair<Note, String?>?>(null) }
 
+    val scope = rememberCoroutineScope()
+
     LaunchedEffect(key1 = word) {
-        withContext(Dispatchers.IO) {
+        scope.launch(Dispatchers.IO) {
             val matcher = tagIndex.matcher(word)
             val (index, suffix) = try {
                 matcher.find()
@@ -625,8 +648,24 @@ fun TagLink(word: String, tags: List<List<String>>, canPreview: Boolean, backgro
     }
 
     baseUserPair?.let {
-        ClickableUserTag(it.first, navController)
-        Text(text = "${it.second} ")
+        val innerUserState by it.first.live().metadata.observeAsState()
+        val displayName = remember(innerUserState) {
+            innerUserState?.user?.toBestDisplayName() ?: ""
+        }
+        val route = remember(innerUserState) {
+            "User/${it.first.pubkeyHex}"
+        }
+        val userTags = remember(innerUserState) {
+            innerUserState?.user?.info?.latestMetadata?.tags
+        }
+
+        CreateClickableTextWithEmoji(
+            clickablePart = displayName,
+            suffix = "${it.second} ",
+            tags = userTags,
+            route = route,
+            navController = navController
+        )
     }
 
     baseNotePair?.let {

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

@@ -16,6 +16,7 @@ import coil.compose.AsyncImage
 import coil.compose.AsyncImagePainter
 import coil.compose.rememberAsyncImagePainter
 import coil.size.Size
+import java.util.Date
 
 @Composable
 fun RobohashAsyncImage(
@@ -36,7 +37,7 @@ fun RobohashAsyncImage(
         robotSize.roundToPx()
     }
 
-    val imageRequest = remember(size, robot) {
+    val imageRequest = remember(robotSize, robot) {
         Robohash.imageRequest(
             context,
             robot,
@@ -58,7 +59,7 @@ fun RobohashAsyncImage(
     )
 }
 
-var imageErrors = setOf<String>()
+var imageErrors = mapOf<String, Long>()
 
 @Composable
 fun RobohashFallbackAsyncImage(
@@ -73,7 +74,9 @@ fun RobohashFallbackAsyncImage(
     colorFilter: ColorFilter? = null,
     filterQuality: FilterQuality = DrawScope.DefaultFilterQuality
 ) {
-    if (imageErrors.contains(model)) {
+    val errorCache = remember(imageErrors) { imageErrors[model] }
+
+    if (errorCache != null && (Date().time / 1000) - errorCache < (60 * 5)) {
         RobohashAsyncImage(
             robot = robot,
             robotSize = robotSize,
@@ -110,7 +113,7 @@ fun RobohashFallbackAsyncImage(
             colorFilter = colorFilter,
             filterQuality = filterQuality,
             onError = {
-                imageErrors = imageErrors + model
+                imageErrors = imageErrors + Pair(model, Date().time / 1000)
             }
         )
     }

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

@@ -10,6 +10,7 @@ import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
@@ -41,13 +42,15 @@ fun UrlPreviewCard(
             )
     ) {
         Column {
-            val validatedUrl = URL(previewInfo.url)
+            val validatedUrl = remember { URL(previewInfo.url) }
 
             // correctly treating relative images
-            val imageUrl = if (previewInfo.image.startsWith("/")) {
-                URL(validatedUrl, previewInfo.image).toString()
-            } else {
-                previewInfo.image
+            val imageUrl = remember {
+                if (previewInfo.image.startsWith("/")) {
+                    URL(validatedUrl, previewInfo.image).toString()
+                } else {
+                    previewInfo.image
+                }
             }
 
             AsyncImage(

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

@@ -1,6 +1,8 @@
 package com.vitorpamplona.amethyst.ui.components
 
+import android.graphics.drawable.Drawable
 import android.net.Uri
+import android.util.Log
 import android.view.View
 import android.view.ViewGroup
 import android.widget.FrameLayout
@@ -28,6 +30,7 @@ import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.rememberUpdatedState
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
@@ -46,6 +49,8 @@ import androidx.compose.ui.viewinterop.AndroidView
 import androidx.core.net.toUri
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleEventObserver
+import coil.imageLoader
+import coil.request.ImageRequest
 import com.google.android.exoplayer2.C
 import com.google.android.exoplayer2.ExoPlayer
 import com.google.android.exoplayer2.MediaItem
@@ -55,6 +60,8 @@ import com.google.android.exoplayer2.source.ProgressiveMediaSource
 import com.google.android.exoplayer2.ui.AspectRatioFrameLayout
 import com.google.android.exoplayer2.ui.StyledPlayerView
 import com.vitorpamplona.amethyst.VideoCache
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
 import java.io.File
 
 public var muted = mutableStateOf(true)
@@ -62,20 +69,55 @@ public var muted = mutableStateOf(true)
 @Composable
 fun VideoView(localFile: File?, description: String? = null, onDialog: ((Boolean) -> Unit)? = null) {
     if (localFile != null) {
-        VideoView(localFile.toUri(), description, onDialog)
+        VideoView(localFile.toUri(), description, null, onDialog)
     }
 }
 
 @Composable
 fun VideoView(videoUri: String, description: String? = null, onDialog: ((Boolean) -> Unit)? = null) {
-    VideoView(Uri.parse(videoUri), description, onDialog)
+    VideoView(Uri.parse(videoUri), description, null, onDialog)
 }
 
 @Composable
-fun VideoView(videoUri: Uri, description: String? = null, onDialog: ((Boolean) -> Unit)? = null) {
+fun VideoView(videoUri: String, description: String? = null, thumbUri: String, onDialog: ((Boolean) -> Unit)? = null) {
+    var loadingFinished by remember { mutableStateOf<Pair<Boolean, Drawable?>>(Pair(false, null)) }
+
+    val context = LocalContext.current
+    val scope = rememberCoroutineScope()
+
+    LaunchedEffect(Unit) {
+        scope.launch(Dispatchers.IO) {
+            try {
+                val request = ImageRequest.Builder(context).data(thumbUri).build()
+                val myCover = context.imageLoader.execute(request).drawable
+                if (myCover != null) {
+                    loadingFinished = Pair(true, myCover)
+                } else {
+                    loadingFinished = Pair(true, null)
+                }
+            } catch (e: Exception) {
+                Log.e("VideoView", "Fail to load cover $thumbUri", e)
+                loadingFinished = Pair(true, null)
+            }
+        }
+    }
+
+    if (loadingFinished.first) {
+        if (loadingFinished.second != null) {
+            VideoView(Uri.parse(videoUri), description, loadingFinished.second, onDialog)
+        } else {
+            VideoView(videoUri, description, onDialog)
+        }
+    }
+}
+
+@Composable
+fun VideoView(videoUri: Uri, description: String? = null, thumb: Drawable? = null, onDialog: ((Boolean) -> Unit)? = null) {
     val context = LocalContext.current
     val lifecycleOwner = rememberUpdatedState(LocalLifecycleOwner.current)
 
+    println("loading audio with artwork $thumb")
+
     val exoPlayer = remember(videoUri) {
         val mediaBuilder = MediaItem.Builder().setUri(videoUri)
 
@@ -89,7 +131,7 @@ fun VideoView(videoUri: Uri, description: String? = null, onDialog: ((Boolean) -
 
         ExoPlayer.Builder(context).build().apply {
             repeatMode = Player.REPEAT_MODE_ALL
-            videoScalingMode = C.VIDEO_SCALING_MODE_SCALE_TO_FIT_WITH_CROPPING
+            videoScalingMode = C.VIDEO_SCALING_MODE_SCALE_TO_FIT
             volume = 0f
             if (videoUri.scheme?.startsWith("file") == true) {
                 setMediaItem(media)
@@ -116,9 +158,9 @@ fun VideoView(videoUri: Uri, description: String? = null, onDialog: ((Boolean) -
                     .defaultMinSize(minHeight = 70.dp)
                     .align(Alignment.Center)
                     .onVisibilityChanges { visible ->
-                        if (visible) {
+                        if (visible && !exoPlayer.isPlaying) {
                             exoPlayer.play()
-                        } else {
+                        } else if (!visible && exoPlayer.isPlaying) {
                             exoPlayer.pause()
                         }
                     },
@@ -130,6 +172,7 @@ fun VideoView(videoUri: Uri, description: String? = null, onDialog: ((Boolean) -
                             ViewGroup.LayoutParams.WRAP_CONTENT
                         )
                         controllerAutoShow = false
+                        thumb?.let { defaultArtwork = thumb }
                         hideController()
                         resizeMode = if (maxHeight.isFinite) AspectRatioFrameLayout.RESIZE_MODE_FIT else AspectRatioFrameLayout.RESIZE_MODE_FIXED_WIDTH
                         onDialog?.let { innerOnDialog ->
@@ -146,7 +189,6 @@ fun VideoView(videoUri: Uri, description: String? = null, onDialog: ((Boolean) -
                 muted.value = !muted.value
             }
         }
-
     ) {
         val observer = LifecycleEventObserver { _, event ->
             when (event) {
@@ -175,7 +217,10 @@ fun Modifier.onVisibilityChanges(onVisibilityChanges: (Boolean) -> Unit): Modifi
     }
 
     onGloballyPositioned { coordinates ->
-        isVisible = coordinates.isCompletelyVisible(view)
+        val newIsVisible = coordinates.isCompletelyVisible(view)
+        if (isVisible != newIsVisible) {
+            isVisible = newIsVisible
+        }
     }
 }
 

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

@@ -17,9 +17,11 @@ import androidx.compose.foundation.layout.aspectRatio
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.heightIn
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.layout.widthIn
 import androidx.compose.foundation.pager.PagerState
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.shape.RoundedCornerShape
@@ -209,17 +211,21 @@ private fun LocalImageView(
         mutableStateOf<AsyncImagePainter.State?>(null)
     }
 
-    val ratio = remember {
-        aspectRatio(content.dim)
-    }
-
     BoxWithConstraints(contentAlignment = Alignment.Center) {
-        val myModifier = mainImageModifier.also {
-            if (ratio != null) {
-                it.aspectRatio(ratio, maxHeight.isFinite)
-            }
+        val myModifier = remember {
+            mainImageModifier
+                .widthIn(max = maxWidth)
+                .heightIn(max = maxHeight)
+                .run {
+                    aspectRatio(content.dim)?.let { ratio ->
+                        this.aspectRatio(ratio, false)
+                    } ?: this
+                }
+        }
+
+        val contentScale = remember {
+            if (maxHeight.isFinite) ContentScale.Fit else ContentScale.FillWidth
         }
-        val contentScale = if (maxHeight.isFinite) ContentScale.Fit else ContentScale.FillWidth
 
         if (content.localFile != null && content.localFile.exists()) {
             AsyncImage(
@@ -271,10 +277,6 @@ private fun UrlImageView(
         mutableStateOf<Boolean?>(null)
     }
 
-    val ratio = remember {
-        aspectRatio(content.dim)
-    }
-
     LaunchedEffect(key1 = content.url, key2 = imageState) {
         if (imageState is AsyncImagePainter.State.Success) {
             scope.launch(Dispatchers.IO) {
@@ -284,12 +286,20 @@ private fun UrlImageView(
     }
 
     BoxWithConstraints(contentAlignment = Alignment.Center) {
-        val myModifier = mainImageModifier.also {
-            if (ratio != null) {
-                it.aspectRatio(ratio, maxHeight.isFinite)
-            }
+        val myModifier = remember {
+            mainImageModifier
+                .widthIn(max = maxWidth)
+                .heightIn(max = maxHeight)
+                .run {
+                    aspectRatio(content.dim)?.let { ratio ->
+                        this.aspectRatio(ratio, false)
+                    } ?: this
+                }
+        }
+
+        val contentScale = remember {
+            if (maxHeight.isFinite) ContentScale.Fit else ContentScale.FillWidth
         }
-        val contentScale = if (maxHeight.isFinite) ContentScale.Fit else ContentScale.FillWidth
 
         AsyncImage(
             model = content.url,

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

@@ -19,7 +19,7 @@ object BookmarkPrivateFeedFilter : FeedFilter<Note>() {
             ?.map { LocalCache.getOrCreateAddressableNote(it) } ?: emptyList()
 
         return notes.plus(addresses).toSet()
-            .sortedBy { it.createdAt() }
+            .sortedWith(compareBy({ it.createdAt() }, { it.idHex }))
             .reversed()
     }
 }

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

@@ -14,7 +14,7 @@ object BookmarkPublicFeedFilter : FeedFilter<Note>() {
         val addresses = bookmarks?.taggedAddresses()?.map { LocalCache.getOrCreateAddressableNote(it) } ?: emptyList()
 
         return notes.plus(addresses).toSet()
-            .sortedBy { it.createdAt() }
+            .sortedWith(compareBy({ it.createdAt() }, { it.idHex }))
             .reversed()
     }
 }

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

@@ -21,7 +21,7 @@ object ChannelFeedFilter : AdditiveFeedFilter<Note>() {
         return channel.notes
             .values
             .filter { account.isAcceptable(it) }
-            .sortedBy { it.createdAt() }
+            .sortedWith(compareBy({ it.createdAt() }, { it.idHex }))
             .reversed()
     }
 
@@ -35,6 +35,6 @@ object ChannelFeedFilter : AdditiveFeedFilter<Note>() {
     }
 
     override fun sort(collection: Set<Note>): List<Note> {
-        return collection.sortedBy { it.createdAt() }.reversed()
+        return collection.sortedWith(compareBy({ it.createdAt() }, { it.idHex })).reversed()
     }
 }

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

@@ -28,7 +28,7 @@ object ChatroomFeedFilter : AdditiveFeedFilter<Note>() {
 
         return messages.roomMessages
             .filter { myAccount.isAcceptable(it) }
-            .sortedBy { it.createdAt() }
+            .sortedWith(compareBy({ it.createdAt() }, { it.idHex }))
             .reversed()
     }
 
@@ -50,6 +50,6 @@ object ChatroomFeedFilter : AdditiveFeedFilter<Note>() {
     }
 
     override fun sort(collection: Set<Note>): List<Note> {
-        return collection.sortedBy { it.createdAt() }.reversed()
+        return collection.sortedWith(compareBy({ it.createdAt() }, { it.idHex })).reversed()
     }
 }

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

@@ -19,20 +19,20 @@ object ChatroomListKnownFeedFilter : FeedFilter<Note>() {
         val privateMessages = messagingWith.mapNotNull { it ->
             privateChatrooms[it]
                 ?.roomMessages
-                ?.sortedBy { it.createdAt() }
+                ?.sortedWith(compareBy({ it.createdAt() }, { it.idHex }))
                 ?.lastOrNull { it.event != null }
         }
 
         val publicChannels = account.followingChannels().map { it ->
             it.notes.values
                 .filter { account.isAcceptable(it) }
-                .sortedBy { it.createdAt() }
+                .sortedWith(compareBy({ it.createdAt() }, { it.idHex }))
                 .lastOrNull { it.event != null }
         }
 
         return (privateMessages + publicChannels)
             .filterNotNull()
-            .sortedBy { it.createdAt() }
+            .sortedWith(compareBy({ it.createdAt() }, { it.idHex }))
             .reversed()
     }
 }

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

@@ -19,12 +19,12 @@ object ChatroomListNewFeedFilter : FeedFilter<Note>() {
         val privateMessages = messagingWith.mapNotNull { it ->
             privateChatrooms[it]
                 ?.roomMessages
-                ?.sortedBy { it.createdAt() }
+                ?.sortedWith(compareBy({ it.createdAt() }, { it.idHex }))
                 ?.lastOrNull { it.event != null }
         }
 
         return privateMessages
-            .sortedBy { it.createdAt() }
+            .sortedWith(compareBy({ it.createdAt() }, { it.idHex }))
             .reversed()
     }
 }

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

@@ -27,7 +27,7 @@ object GlobalFeedFilter : AdditiveFeedFilter<Note>() {
         return collection
             .asSequence()
             .filter {
-                it.event is BaseTextNoteEvent && it.replyTo.isNullOrEmpty()
+                (it.event is BaseTextNoteEvent || it.event is AudioTrackEvent) && it.replyTo.isNullOrEmpty()
             }
             .filter {
                 val channel = it.channelHex()

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

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

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

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

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

@@ -3,6 +3,7 @@ package com.vitorpamplona.amethyst.ui.dal
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.service.model.AudioTrackEvent
 import com.vitorpamplona.amethyst.service.model.HighlightEvent
 import com.vitorpamplona.amethyst.service.model.LongTextNoteEvent
 import com.vitorpamplona.amethyst.service.model.PollNoteEvent
@@ -30,7 +31,7 @@ object HomeNewThreadFeedFilter : AdditiveFeedFilter<Note>() {
         return collection
             .asSequence()
             .filter { it ->
-                (it.event is TextNoteEvent || it.event is RepostEvent || it.event is LongTextNoteEvent || it.event is PollNoteEvent || it.event is HighlightEvent) &&
+                (it.event is TextNoteEvent || it.event is RepostEvent || it.event is LongTextNoteEvent || it.event is PollNoteEvent || it.event is HighlightEvent || it.event is AudioTrackEvent) &&
                     (it.author?.pubkeyHex in followingKeySet || (it.event?.isTaggedHashes(followingTagSet) ?: false)) &&
                     // && account.isAcceptable(it)  // This filter follows only. No need to check if acceptable
                     it.author?.let { !account.isHidden(it.pubkeyHex) } ?: true &&
@@ -40,6 +41,6 @@ object HomeNewThreadFeedFilter : AdditiveFeedFilter<Note>() {
     }
 
     override fun sort(collection: Set<Note>): List<Note> {
-        return collection.sortedBy { it.createdAt() }.reversed()
+        return collection.sortedWith(compareBy({ it.createdAt() }, { it.idHex })).reversed()
     }
 }

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

@@ -41,14 +41,22 @@ object NotificationFeedFilter : AdditiveFeedFilter<Note>() {
     }
 
     override fun sort(collection: Set<Note>): List<Note> {
-        return collection.sortedBy { it.createdAt() }.reversed()
+        return collection.sortedWith(compareBy({ it.createdAt() }, { it.idHex })).reversed()
     }
 
     fun tagsAnEventByUser(note: Note, author: User): Boolean {
         val event = note.event
 
         if (event is BaseTextNoteEvent) {
-            return (event.citedUsers().contains(author.pubkeyHex) || note.replyTo?.any { it.author === author } == true)
+            val isAuthoredPostCited = event.findCitations().any {
+                LocalCache.notes[it]?.author === author || LocalCache.addressables[it]?.author === author
+            }
+
+            return isAuthoredPostCited ||
+                (
+                    event.citedUsers().contains(author.pubkeyHex) ||
+                        note.replyTo?.any { it.author === author } == true
+                    )
         }
 
         if (event is ReactionEvent) {

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

@@ -19,7 +19,7 @@ object PeopleListFeedFilter : FeedFilter<Note>() {
             .toSet()
 
         return lists
-            .sortedBy { it.createdAt() }
+            .sortedWith(compareBy({ it.createdAt() }, { it.idHex }))
             .reversed()
     }
 }

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

@@ -25,7 +25,7 @@ object UserProfileBookmarksFeedFilter : FeedFilter<Note>() {
 
         return (notes + addresses)
             .filter { account.isAcceptable(it) }
-            .sortedBy { it.createdAt() }
+            .sortedWith(compareBy({ it.createdAt() }, { it.idHex }))
             .reversed()
     }
 }

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

@@ -16,7 +16,7 @@ object UserProfileConversationsFeedFilter : FeedFilter<Note>() {
     override fun feed(): List<Note> {
         return user?.notes
             ?.filter { account?.isAcceptable(it) == true && !it.isNewThread() }
-            ?.sortedBy { it.createdAt() }
+            ?.sortedWith(compareBy({ it.createdAt() }, { it.idHex }))
             ?.reversed() ?: emptyList()
     }
 }

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

@@ -23,7 +23,7 @@ object UserProfileNewThreadFeedFilter : FeedFilter<Note>() {
         return user?.notes
             ?.plus(longFormNotes)
             ?.filter { account?.isAcceptable(it) == true && it.isNewThread() }
-            ?.sortedBy { it.createdAt() }
+            ?.sortedWith(compareBy({ it.createdAt() }, { it.idHex }))
             ?.reversed() ?: emptyList()
     }
 }

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

@@ -14,7 +14,7 @@ object UserProfileReportsFeedFilter : FeedFilter<Note>() {
         return user?.reports
             ?.values
             ?.flatten()
-            ?.sortedBy { it.createdAt() }
+            ?.sortedWith(compareBy({ it.createdAt() }, { it.idHex }))
             ?.reversed() ?: emptyList()
     }
 }

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

@@ -45,6 +45,7 @@ import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.decodePublicKey
 import com.vitorpamplona.amethyst.model.toHexKey
+import com.vitorpamplona.amethyst.ui.components.CreateTextWithEmoji
 import com.vitorpamplona.amethyst.ui.components.ResizeImage
 import com.vitorpamplona.amethyst.ui.components.RobohashAsyncImageProxy
 import com.vitorpamplona.amethyst.ui.note.toShortenHex
@@ -149,7 +150,10 @@ fun AccountSwitchBottomSheet(
                                 val npubShortHex = acc.npub.toShortenHex()
 
                                 user.bestDisplayName()?.let {
-                                    Text(it)
+                                    CreateTextWithEmoji(
+                                        text = it,
+                                        tags = user.info?.latestMetadata?.tags
+                                    )
                                 }
 
                                 Text(npubShortHex)

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

@@ -41,7 +41,6 @@ import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
-import kotlin.time.ExperimentalTime
 
 val bottomNavigationItems = listOf(
     Route.Home,
@@ -136,9 +135,10 @@ fun AppBottomBar(navController: NavHostController, accountViewModel: AccountView
     }
 }
 
-@OptIn(ExperimentalTime::class)
 @Composable
 private fun NotifiableIcon(route: Route, selected: Boolean, accountViewModel: AccountViewModel) {
+    val scope = rememberCoroutineScope()
+
     Box(Modifier.size(if ("Home" == route.base) 25.dp else 23.dp)) {
         Icon(
             painter = painterResource(id = route.icon),
@@ -150,15 +150,10 @@ private fun NotifiableIcon(route: Route, selected: Boolean, accountViewModel: Ac
         val accountState by accountViewModel.accountLiveData.observeAsState()
         val account = accountState?.account ?: return
 
-        // Notification
-        val dbState = LocalCache.live.observeAsState()
-        val db = dbState.value ?: return
-
         val notifState = NotificationCache.live.observeAsState()
         val notif = notifState.value ?: return
 
         var hasNewItems by remember { mutableStateOf<Boolean>(false) }
-        val scope = rememberCoroutineScope()
 
         LaunchedEffect(key1 = notif) {
             scope.launch(Dispatchers.IO) {
@@ -166,9 +161,11 @@ private fun NotifiableIcon(route: Route, selected: Boolean, accountViewModel: Ac
             }
         }
 
-        LaunchedEffect(key1 = db) {
+        LaunchedEffect(Unit) {
             scope.launch(Dispatchers.IO) {
-                hasNewItems = route.hasNewItems(account, notif.cache, db)
+                LocalCache.live.newEventBundles.collect {
+                    hasNewItems = route.hasNewItems(account, notif.cache, it)
+                }
             }
         }
 

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

@@ -24,7 +24,6 @@ import androidx.compose.material.TopAppBar
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.ArrowBack
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.livedata.observeAsState
@@ -40,6 +39,8 @@ 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.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
 import androidx.lifecycle.viewmodel.compose.viewModel
 import androidx.navigation.NavHostController
 import coil.Coil
@@ -71,43 +72,45 @@ import com.vitorpamplona.amethyst.ui.components.RobohashAsyncImageProxy
 import com.vitorpamplona.amethyst.ui.screen.RelayPoolViewModel
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.SpinnerSelectionDialog
+import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 
 @Composable
-fun AppTopBar(navController: NavHostController, scaffoldState: ScaffoldState, accountViewModel: AccountViewModel) {
+fun AppTopBar(followLists: FollowListViewModel, navController: NavHostController, scaffoldState: ScaffoldState, accountViewModel: AccountViewModel) {
     when (currentRoute(navController)?.substringBefore("?")) {
         // Route.Profile.route -> TopBarWithBackButton(navController)
-        Route.Home.base -> HomeTopBar(scaffoldState, accountViewModel)
-        Route.Video.base -> StoriesTopBar(scaffoldState, accountViewModel)
-        Route.Notification.base -> NotificationTopBar(scaffoldState, accountViewModel)
+        Route.Home.base -> HomeTopBar(followLists, scaffoldState, accountViewModel)
+        Route.Video.base -> StoriesTopBar(followLists, scaffoldState, accountViewModel)
+        Route.Notification.base -> NotificationTopBar(followLists, scaffoldState, accountViewModel)
         else -> MainTopBar(scaffoldState, accountViewModel)
     }
 }
 
 @Composable
-fun StoriesTopBar(scaffoldState: ScaffoldState, accountViewModel: AccountViewModel) {
+fun StoriesTopBar(followLists: FollowListViewModel, scaffoldState: ScaffoldState, accountViewModel: AccountViewModel) {
     GenericTopBar(scaffoldState, accountViewModel) { account ->
-        FollowList(account.defaultStoriesFollowList, account.userProfile(), true) { listName ->
+        FollowList(followLists, account.defaultStoriesFollowList, account.userProfile(), true) { listName ->
             account.changeDefaultStoriesFollowList(listName)
         }
     }
 }
 
 @Composable
-fun HomeTopBar(scaffoldState: ScaffoldState, accountViewModel: AccountViewModel) {
+fun HomeTopBar(followLists: FollowListViewModel, scaffoldState: ScaffoldState, accountViewModel: AccountViewModel) {
     GenericTopBar(scaffoldState, accountViewModel) { account ->
-        FollowList(account.defaultHomeFollowList, account.userProfile(), false) { listName ->
+        FollowList(followLists, account.defaultHomeFollowList, account.userProfile(), false) { listName ->
             account.changeDefaultHomeFollowList(listName)
         }
     }
 }
 
 @Composable
-fun NotificationTopBar(scaffoldState: ScaffoldState, accountViewModel: AccountViewModel) {
+fun NotificationTopBar(followLists: FollowListViewModel, scaffoldState: ScaffoldState, accountViewModel: AccountViewModel) {
     GenericTopBar(scaffoldState, accountViewModel) { account ->
-        FollowList(account.defaultNotificationFollowList, account.userProfile(), true) { listName ->
+        FollowList(followLists, account.defaultNotificationFollowList, account.userProfile(), true) { listName ->
             account.changeDefaultNotificationFollowList(listName)
         }
     }
@@ -237,30 +240,19 @@ private fun LoggedInUserPictureDrawer(
 }
 
 @Composable
-fun FollowList(listName: String, loggedIn: User, withGlobal: Boolean, onChange: (String) -> Unit) {
-    // Notification
-    val dbState = LocalCache.live.observeAsState()
-    val db = dbState.value ?: return
-
+fun FollowList(followListsModel: FollowListViewModel, listName: String, loggedIn: User, withGlobal: Boolean, onChange: (String) -> Unit) {
     val kind3Follow = Pair(KIND3_FOLLOWS, stringResource(id = R.string.follow_list_kind3follows))
     val globalFollow = Pair(GLOBAL_FOLLOWS, stringResource(id = R.string.follow_list_global))
 
     val defaultOptions = if (withGlobal) listOf(kind3Follow, globalFollow) else listOf(kind3Follow)
 
-    var followLists by remember { mutableStateOf(defaultOptions) }
-    val followNames = remember { derivedStateOf { followLists.map { it.second } } }
+    val followLists = remember(followListsModel.followLists) {
+        (defaultOptions + followListsModel.followLists)
+    }
 
-    LaunchedEffect(key1 = db) {
-        withContext(Dispatchers.IO) {
-            followLists = defaultOptions + LocalCache.addressables.mapNotNull {
-                val event = (it.value.event as? PeopleListEvent)
-                // Has to have an list
-                if (event != null && event.pubKey == loggedIn.pubkeyHex && (event.tags.size > 1 || event.content.length > 50)) {
-                    Pair(event.dTag(), event.dTag())
-                } else {
-                    null
-                }
-            }.sortedBy { it.second }
+    val followNames = remember(followLists) {
+        derivedStateOf {
+            followLists.map { it.second }
         }
     }
 
@@ -273,6 +265,62 @@ fun FollowList(listName: String, loggedIn: User, withGlobal: Boolean, onChange:
     )
 }
 
+class FollowListViewModel : ViewModel() {
+    var followLists by mutableStateOf<List<Pair<String, String>>>(emptyList())
+    var account: Account? = null
+
+    fun load(account: Account?) {
+        this.account = account
+        refresh()
+    }
+
+    fun refresh() {
+        val scope = CoroutineScope(Job() + Dispatchers.Default)
+        scope.launch {
+            refreshFollows()
+        }
+    }
+
+    private suspend fun refreshFollows() {
+        val myAccount = account ?: return
+
+        val newFollowLists = LocalCache.addressables.mapNotNull {
+            val event = (it.value.event as? PeopleListEvent)
+            // Has to have an list
+            if (event != null && event.pubKey == myAccount.userProfile().pubkeyHex && (event.tags.size > 1 || event.content.length > 50)) {
+                Pair(event.dTag(), event.dTag())
+            } else {
+                null
+            }
+        }.sortedBy { it.second }
+
+        withContext(Dispatchers.Main) {
+            if (followLists != newFollowLists) {
+                followLists = newFollowLists
+            }
+        }
+    }
+
+    var collectorJob: Job? = null
+
+    init {
+        collectorJob = viewModelScope.launch(Dispatchers.IO) {
+            LocalCache.live.newEventBundles.collect { newNotes ->
+                newNotes.forEach {
+                    if (it.event is PeopleListEvent) {
+                        refresh()
+                    }
+                }
+            }
+        }
+    }
+
+    override fun onCleared() {
+        collectorJob?.cancel()
+        super.onCleared()
+    }
+}
+
 @Composable
 fun SimpleTextSpinner(
     placeholder: String,

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

@@ -1,9 +1,11 @@
 package com.vitorpamplona.amethyst.ui.navigation
 
+import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
 import androidx.compose.foundation.clickable
+import androidx.compose.foundation.combinedClickable
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
@@ -56,6 +58,7 @@ import com.vitorpamplona.amethyst.ServiceManager
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.User
 import com.vitorpamplona.amethyst.service.HttpClient
+import com.vitorpamplona.amethyst.ui.components.CreateTextWithEmoji
 import com.vitorpamplona.amethyst.ui.components.ResizeImage
 import com.vitorpamplona.amethyst.ui.components.RobohashAsyncImageProxy
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountBackupDialog
@@ -166,8 +169,9 @@ fun ProfileContent(
                     })
             )
             if (accountUser.bestDisplayName() != null) {
-                Text(
-                    accountUser.bestDisplayName() ?: "",
+                CreateTextWithEmoji(
+                    text = accountUser.bestDisplayName() ?: "",
+                    tags = accountUser.info?.latestMetadata?.tags,
                     modifier = Modifier
                         .padding(top = 7.dp)
                         .clickable(onClick = {
@@ -183,19 +187,22 @@ fun ProfileContent(
                 )
             }
             if (accountUser.bestUsername() != null) {
-                Text(
-                    " @${accountUser.bestUsername()}",
+                CreateTextWithEmoji(
+                    text = " @${accountUser.bestUsername()}",
+                    tags = accountUser.info?.latestMetadata?.tags,
                     color = Color.LightGray,
                     modifier = Modifier
                         .padding(top = 15.dp)
-                        .clickable(onClick = {
-                            accountUser.let {
-                                navController.navigate("User/${it.pubkeyHex}")
+                        .clickable(
+                            onClick = {
+                                accountUser.let {
+                                    navController.navigate("User/${it.pubkeyHex}")
+                                }
+                                coroutineScope.launch {
+                                    scaffoldState.drawerState.close()
+                                }
                             }
-                            coroutineScope.launch {
-                                scaffoldState.drawerState.close()
-                            }
-                        })
+                        )
                 )
             }
             Row(
@@ -294,6 +301,12 @@ fun ListContent(
             title = textTorProxy,
             icon = R.drawable.ic_tor,
             tint = MaterialTheme.colors.onBackground,
+            onLongClick = {
+                coroutineScope.launch {
+                    scaffoldState.drawerState.close()
+                }
+                conectOrbotDialogOpen = true
+            },
             onClick = {
                 if (checked) {
                     disconnectTorDialog = true
@@ -401,12 +414,16 @@ fun NavigationRow(
     })
 }
 
+@OptIn(ExperimentalFoundationApi::class)
 @Composable
-fun IconRow(title: String, icon: Int, tint: Color, onClick: () -> Unit) {
+fun IconRow(title: String, icon: Int, tint: Color, onClick: () -> Unit, onLongClick: (() -> Unit)? = null) {
     Row(
         modifier = Modifier
             .fillMaxWidth()
-            .clickable(onClick = onClick)
+            .combinedClickable(
+                onClick = onClick,
+                onLongClick = onLongClick
+            )
     ) {
         Row(
             modifier = Modifier

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

@@ -27,6 +27,7 @@ import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.ChevronRight
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.livedata.observeAsState
 import androidx.compose.runtime.mutableStateOf
@@ -55,9 +56,12 @@ import com.google.accompanist.flowlayout.FlowRow
 import com.vitorpamplona.amethyst.NotificationCache
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.model.User
 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.ui.components.CreateClickableTextWithEmoji
+import com.vitorpamplona.amethyst.ui.components.CreateTextWithEmoji
 import com.vitorpamplona.amethyst.ui.components.ResizeImage
 import com.vitorpamplona.amethyst.ui.components.RobohashAsyncImageProxy
 import com.vitorpamplona.amethyst.ui.components.RobohashFallbackAsyncImage
@@ -65,6 +69,7 @@ import com.vitorpamplona.amethyst.ui.components.TranslatableRichTextViewer
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 
 val ChatBubbleShapeMe = RoundedCornerShape(15.dp, 15.dp, 3.dp, 15.dp)
 val ChatBubbleShapeThem = RoundedCornerShape(3.dp, 15.dp, 15.dp, 15.dp)
@@ -80,328 +85,486 @@ fun ChatroomMessageCompose(
     navController: NavController,
     onWantsToReply: (Note) -> Unit
 ) {
-    val noteState by baseNote.live().metadata.observeAsState()
-    val note = noteState?.note
-
     val accountState by accountViewModel.accountLiveData.observeAsState()
-    val account = accountState?.account ?: return
+    val account = remember(accountState) { accountState?.account } ?: return
+    val loggedIn = remember(accountState) { accountState?.account?.userProfile() } ?: return
+
+    val noteState by baseNote.live().metadata.observeAsState()
+    val note = remember(noteState) { noteState?.note }
 
     val noteReportsState by baseNote.live().reports.observeAsState()
-    val noteForReports = noteReportsState?.note ?: return
+    val noteForReports = remember(noteReportsState) { noteReportsState?.note } ?: return
 
-    val accountUser = account.userProfile()
+    val noteEvent = note?.event
 
     var popupExpanded by remember { mutableStateOf(false) }
-    var showHiddenNote by remember { mutableStateOf(false) }
 
-    val context = LocalContext.current.applicationContext
-    val scope = rememberCoroutineScope()
-
-    if (note?.event == null) {
-        BlankNote(Modifier)
-    } else if (!account.isAcceptable(noteForReports) && !showHiddenNote) {
-        if (!account.isHidden(noteForReports.author!!)) {
-            HiddenNote(
-                account.getRelevantReports(noteForReports),
-                account.userProfile(),
-                Modifier,
-                innerQuote,
-                navController,
-                onClick = { showHiddenNote = true }
+    if (noteEvent == null) {
+        BlankNote(
+            Modifier.combinedClickable(
+                onClick = { },
+                onLongClick = { popupExpanded = true }
             )
+        )
+
+        note?.let {
+            NoteQuickActionMenu(it, popupExpanded, { popupExpanded = false }, accountViewModel)
         }
     } else {
-        var backgroundBubbleColor: Color
-        var alignment: Arrangement.Horizontal
-        var shape: Shape
+        var showHiddenNote by remember { mutableStateOf(false) }
+        var isAcceptableAndCanPreview by remember { mutableStateOf(Pair(true, true)) }
 
-        val grayTint = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+        LaunchedEffect(key1 = noteReportsState, key2 = accountState) {
+            withContext(Dispatchers.IO) {
+                account.userProfile().let { loggedIn ->
+                    val newCanPreview = note.author === loggedIn ||
+                        (note.author?.let { loggedIn.isFollowingCached(it) } ?: true) ||
+                        !(noteForReports.hasAnyReports())
 
-        if (note.author == accountUser) {
-            backgroundBubbleColor = MaterialTheme.colors.primary.copy(alpha = 0.32f)
-            alignment = Arrangement.End
-            shape = ChatBubbleShapeMe
-        } else {
-            backgroundBubbleColor = MaterialTheme.colors.onSurface.copy(alpha = 0.12f)
-            alignment = Arrangement.Start
-            shape = ChatBubbleShapeThem
-        }
+                    val newIsAcceptable = account.isAcceptable(noteForReports)
 
-        if (parentBackgroundColor != null) {
-            backgroundBubbleColor = backgroundBubbleColor.compositeOver(parentBackgroundColor)
-        } else {
-            backgroundBubbleColor = backgroundBubbleColor.compositeOver(MaterialTheme.colors.background)
-        }
-
-        var isNew by remember { mutableStateOf<Boolean>(false) }
-
-        LaunchedEffect(key1 = routeForLastRead) {
-            routeForLastRead?.let {
-                scope.launch(Dispatchers.IO) {
-                    val lastTime = NotificationCache.load(it)
-
-                    val createdAt = note.createdAt()
-                    if (createdAt != null) {
-                        NotificationCache.markAsRead(it, createdAt)
-                        isNew = createdAt > lastTime
+                    if (newIsAcceptable != isAcceptableAndCanPreview.first && newCanPreview != isAcceptableAndCanPreview.second) {
+                        isAcceptableAndCanPreview = Pair(newIsAcceptable, newCanPreview)
                     }
                 }
             }
         }
 
-        Column() {
-            val modif = if (innerQuote) {
-                Modifier.padding(top = 10.dp, end = 5.dp)
+        if (!isAcceptableAndCanPreview.first && !showHiddenNote) {
+            if (!account.isHidden(noteForReports.author!!)) {
+                HiddenNote(
+                    account.getRelevantReports(noteForReports),
+                    account.userProfile(),
+                    Modifier,
+                    innerQuote,
+                    navController,
+                    onClick = { showHiddenNote = true }
+                )
+            }
+        } else {
+            val backgroundBubbleColor: Color
+            val alignment: Arrangement.Horizontal
+            val shape: Shape
+
+            if (note.author == loggedIn) {
+                backgroundBubbleColor = MaterialTheme.colors.primary.copy(alpha = 0.32f)
+                    .compositeOver(parentBackgroundColor ?: MaterialTheme.colors.background)
+
+                alignment = Arrangement.End
+                shape = ChatBubbleShapeMe
             } else {
-                Modifier
-                    .fillMaxWidth(1f)
-                    .padding(
-                        start = 12.dp,
-                        end = 12.dp,
-                        top = 5.dp,
-                        bottom = 5.dp
-                    )
+                backgroundBubbleColor = MaterialTheme.colors.onSurface.copy(alpha = 0.12f)
+                    .compositeOver(parentBackgroundColor ?: MaterialTheme.colors.background)
+
+                alignment = Arrangement.Start
+                shape = ChatBubbleShapeThem
             }
 
-            Row(
-                modifier = modif,
-                horizontalArrangement = alignment
-            ) {
-                var availableBubbleSize by remember { mutableStateOf(IntSize.Zero) }
-                val modif2 = if (innerQuote) Modifier else Modifier.fillMaxWidth(0.85f)
+            val scope = rememberCoroutineScope()
+
+            LaunchedEffect(key1 = routeForLastRead) {
+                routeForLastRead?.let {
+                    scope.launch(Dispatchers.IO) {
+                        val lastTime = NotificationCache.load(it)
+
+                        val createdAt = note.createdAt()
+                        if (createdAt != null) {
+                            NotificationCache.markAsRead(it, createdAt)
+                        }
+                    }
+                }
+            }
+
+            Column() {
+                val modif = remember {
+                    if (innerQuote) {
+                        Modifier.padding(top = 10.dp, end = 5.dp)
+                    } else {
+                        Modifier
+                            .fillMaxWidth(1f)
+                            .padding(
+                                start = 12.dp,
+                                end = 12.dp,
+                                top = 5.dp,
+                                bottom = 5.dp
+                            )
+                    }
+                }
 
                 Row(
-                    horizontalArrangement = alignment,
-                    modifier = modif2.onSizeChanged {
-                        availableBubbleSize = it
-                    }
+                    modifier = modif,
+                    horizontalArrangement = alignment
                 ) {
-                    Surface(
-                        color = backgroundBubbleColor,
-                        shape = shape,
-                        modifier = Modifier
-                            .combinedClickable(
-                                onClick = { },
-                                onLongClick = { popupExpanded = true }
-                            )
+                    var availableBubbleSize by remember { mutableStateOf(IntSize.Zero) }
+                    val modif2 = if (innerQuote) Modifier else Modifier.fillMaxWidth(0.85f)
+
+                    Row(
+                        horizontalArrangement = alignment,
+                        modifier = modif2.onSizeChanged {
+                            availableBubbleSize = it
+                        }
                     ) {
-                        var bubbleSize by remember { mutableStateOf(IntSize.Zero) }
-
-                        Column(
+                        Surface(
+                            color = backgroundBubbleColor,
+                            shape = shape,
                             modifier = Modifier
-                                .padding(start = 10.dp, end = 5.dp, bottom = 5.dp)
-                                .onSizeChanged {
-                                    bubbleSize = it
-                                }
+                                .combinedClickable(
+                                    onClick = { },
+                                    onLongClick = { popupExpanded = true }
+                                )
                         ) {
-                            val authorState by note.author!!.live().metadata.observeAsState()
-                            val author = authorState?.user!!
+                            var bubbleSize by remember { mutableStateOf(IntSize.Zero) }
 
-                            if (innerQuote || author != accountUser && note.event is ChannelMessageEvent) {
-                                Row(
-                                    verticalAlignment = Alignment.CenterVertically,
-                                    horizontalArrangement = alignment,
-                                    modifier = Modifier.padding(top = 5.dp)
-                                ) {
-                                    RobohashAsyncImageProxy(
-                                        robot = author.pubkeyHex,
-                                        model = ResizeImage(author.profilePicture(), 25.dp),
-                                        contentDescription = stringResource(id = R.string.profile_image),
-                                        modifier = Modifier
-                                            .width(25.dp)
-                                            .height(25.dp)
-                                            .clip(shape = CircleShape)
-                                            .clickable(onClick = {
-                                                author.let {
-                                                    navController.navigate("User/${it.pubkeyHex}")
-                                                }
-                                            })
-                                    )
-
-                                    Text(
-                                        "  ${author.toBestDisplayName()}",
-                                        fontWeight = FontWeight.Bold,
-                                        modifier = Modifier.clickable(onClick = {
-                                            author.let {
-                                                navController.navigate("User/${it.pubkeyHex}")
-                                            }
-                                        })
-                                    )
-                                }
-                            }
-
-                            val replyTo = note.replyTo
-                            if (!innerQuote && !replyTo.isNullOrEmpty()) {
-                                Row(verticalAlignment = Alignment.CenterVertically) {
-                                    replyTo.toSet().mapIndexed { _, note ->
-                                        ChatroomMessageCompose(
-                                            note,
-                                            null,
-                                            innerQuote = true,
-                                            parentBackgroundColor = backgroundBubbleColor,
-                                            accountViewModel = accountViewModel,
-                                            navController = navController,
-                                            onWantsToReply = onWantsToReply
-                                        )
-                                    }
-                                }
-                            }
-
-                            Row(verticalAlignment = Alignment.CenterVertically) {
-                                val event = note.event
-                                if (event is ChannelCreateEvent) {
-                                    val channelInfo = event.channelInfo()
-                                    Text(
-                                        text = note.author?.toBestDisplayName()
-                                            .toString() + " ${stringResource(R.string.created)} " + (
-                                            channelInfo.name
-                                                ?: ""
-                                            ) + " ${stringResource(R.string.with_description_of)} '" + (
-                                            channelInfo.about
-                                                ?: ""
-                                            ) + "', ${stringResource(R.string.and_picture)} '" + (
-                                            channelInfo.picture
-                                                ?: ""
-                                            ) + "'"
-                                    )
-                                } else if (event is ChannelMetadataEvent) {
-                                    val channelInfo = event.channelInfo()
-                                    Text(
-                                        text = note.author?.toBestDisplayName()
-                                            .toString() + " ${stringResource(R.string.changed_chat_name_to)} '" + (
-                                            channelInfo.name
-                                                ?: ""
-                                            ) + "$', {stringResource(R.string.description_to)} '" + (
-                                            channelInfo.about
-                                                ?: ""
-                                            ) + "', ${stringResource(R.string.and_picture_to)} '" + (
-                                            channelInfo.picture
-                                                ?: ""
-                                            ) + "'"
-                                    )
-                                } else {
-                                    val eventContent = accountViewModel.decrypt(note)
-
-                                    val canPreview = note.author == accountUser ||
-                                        (note.author?.let { accountUser.isFollowingCached(it) } ?: true) ||
-                                        !noteForReports.hasAnyReports()
-
-                                    if (eventContent != null) {
-                                        TranslatableRichTextViewer(
-                                            eventContent,
-                                            canPreview,
-                                            Modifier.padding(top = 5.dp),
-                                            note.event?.tags(),
-                                            backgroundBubbleColor,
-                                            accountViewModel,
-                                            navController
-                                        )
-                                    } else {
-                                        TranslatableRichTextViewer(
-                                            stringResource(R.string.could_not_decrypt_the_message),
-                                            true,
-                                            Modifier.padding(top = 5.dp),
-                                            note.event?.tags(),
-                                            backgroundBubbleColor,
-                                            accountViewModel,
-                                            navController
-                                        )
-                                    }
-                                }
-                            }
-
-                            Row(
-                                verticalAlignment = Alignment.CenterVertically,
-                                horizontalArrangement = Arrangement.SpaceBetween,
+                            Column(
                                 modifier = Modifier
-                                    .padding(top = 5.dp)
-                                    .then(
-                                        with(LocalDensity.current) {
-                                            Modifier.widthIn(
-                                                bubbleSize.width.toDp(),
-                                                availableBubbleSize.width.toDp()
+                                    .padding(start = 10.dp, end = 5.dp, bottom = 5.dp)
+                                    .onSizeChanged {
+                                        bubbleSize = it
+                                    }
+                            ) {
+                                if ((innerQuote || note.author != loggedIn) && noteEvent is ChannelMessageEvent) {
+                                    DrawAuthorInfo(
+                                        baseNote,
+                                        alignment,
+                                        navController
+                                    )
+                                }
+
+                                val replyTo = note.replyTo
+                                if (!innerQuote && !replyTo.isNullOrEmpty()) {
+                                    Row(verticalAlignment = Alignment.CenterVertically) {
+                                        replyTo.toSet().mapIndexed { _, note ->
+                                            ChatroomMessageCompose(
+                                                note,
+                                                null,
+                                                innerQuote = true,
+                                                parentBackgroundColor = backgroundBubbleColor,
+                                                accountViewModel = accountViewModel,
+                                                navController = navController,
+                                                onWantsToReply = onWantsToReply
                                             )
                                         }
-                                    )
-                            ) {
-                                Row() {
-                                    Text(
-                                        timeAgoShort(note.createdAt(), context),
-                                        color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f),
-                                        fontSize = 12.sp
-                                    )
-
-                                    RelayBadges(note)
-
-                                    Spacer(modifier = Modifier.width(10.dp))
+                                    }
                                 }
 
-                                Row() {
-                                    LikeReaction(baseNote, grayTint, accountViewModel)
-                                    Spacer(modifier = Modifier.width(5.dp))
-                                    ZapReaction(baseNote, grayTint, accountViewModel)
-                                    Spacer(modifier = Modifier.width(5.dp))
-                                    ReplyReaction(baseNote, grayTint, accountViewModel, showCounter = false) {
-                                        onWantsToReply(baseNote)
+                                Row(verticalAlignment = Alignment.CenterVertically) {
+                                    when (noteEvent) {
+                                        is ChannelCreateEvent -> {
+                                            RenderCreateChannelNote(note)
+                                        }
+
+                                        is ChannelMetadataEvent -> {
+                                            RenderChangeChannelMetadataNote(note)
+                                        }
+
+                                        else -> {
+                                            RenderRegularTextNote(
+                                                note,
+                                                loggedIn,
+                                                isAcceptableAndCanPreview.second,
+                                                backgroundBubbleColor,
+                                                accountViewModel,
+                                                navController
+                                            )
+                                        }
                                     }
                                 }
+
+                                Row(
+                                    verticalAlignment = Alignment.CenterVertically,
+                                    horizontalArrangement = Arrangement.SpaceBetween,
+                                    modifier = Modifier
+                                        .padding(top = 5.dp)
+                                        .then(
+                                            with(LocalDensity.current) {
+                                                Modifier.widthIn(
+                                                    bubbleSize.width.toDp(),
+                                                    availableBubbleSize.width.toDp()
+                                                )
+                                            }
+                                        )
+                                ) {
+                                    StatusRow(
+                                        baseNote,
+                                        accountViewModel,
+                                        onWantsToReply
+                                    )
+                                }
                             }
                         }
                     }
-                }
 
-                NoteQuickActionMenu(note, popupExpanded, { popupExpanded = false }, accountViewModel)
+                    NoteQuickActionMenu(
+                        note,
+                        popupExpanded,
+                        { popupExpanded = false },
+                        accountViewModel
+                    )
+                }
             }
         }
     }
 }
 
 @Composable
-private fun RelayBadges(baseNote: Note) {
-    val noteRelaysState by baseNote.live().relays.observeAsState()
-    val noteRelays = noteRelaysState?.note?.relays ?: emptySet()
+private fun StatusRow(
+    baseNote: Note,
+    accountViewModel: AccountViewModel,
+    onWantsToReply: (Note) -> Unit
+) {
+    val grayTint = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+    val time = remember { baseNote.createdAt() ?: 0 }
 
-    var expanded by remember { mutableStateOf(false) }
+    Row(verticalAlignment = Alignment.CenterVertically) {
+        ChatTimeAgo(time)
+        RelayBadges(baseNote)
+        Spacer(modifier = Modifier.width(10.dp))
+    }
 
-    val relaysToDisplay = if (expanded) noteRelays else noteRelays.take(3)
-
-    val uri = LocalUriHandler.current
-
-    FlowRow(Modifier.padding(start = 10.dp)) {
-        relaysToDisplay.forEach {
-            val url = it.removePrefix("wss://").removePrefix("ws://")
-            Box(
-                Modifier
-                    .size(15.dp)
-                    .padding(1.dp)
-            ) {
-                RobohashFallbackAsyncImage(
-                    robot = "https://$url/favicon.ico",
-                    robotSize = 15.dp,
-                    model = "https://$url/favicon.ico",
-                    contentDescription = stringResource(id = R.string.relay_icon),
-                    colorFilter = ColorFilter.colorMatrix(ColorMatrix().apply { setToSaturation(0f) }),
-                    modifier = Modifier
-                        .fillMaxSize(1f)
-                        .clip(shape = CircleShape)
-                        .background(MaterialTheme.colors.background)
-                        .clickable(onClick = { uri.openUri("https://$url") })
-                )
-            }
-        }
-
-        if (noteRelays.size > 3 && !expanded) {
-            IconButton(
-                modifier = Modifier.then(Modifier.size(15.dp)),
-                onClick = { expanded = true }
-            ) {
-                Icon(
-                    imageVector = Icons.Default.ChevronRight,
-                    null,
-                    modifier = Modifier.size(15.dp),
-                    tint = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
-                )
-            }
+    Row(verticalAlignment = Alignment.CenterVertically) {
+        LikeReaction(baseNote, grayTint, accountViewModel)
+        Spacer(modifier = Modifier.width(5.dp))
+        ZapReaction(baseNote, grayTint, accountViewModel)
+        Spacer(modifier = Modifier.width(5.dp))
+        ReplyReaction(baseNote, grayTint, accountViewModel, showCounter = false, iconSize = 16.dp) {
+            onWantsToReply(baseNote)
         }
     }
 }
+
+@Composable
+fun ChatTimeAgo(time: Long) {
+    val context = LocalContext.current
+
+    var timeStr by remember { mutableStateOf("") }
+
+    LaunchedEffect(key1 = time) {
+        withContext(Dispatchers.IO) {
+            timeStr = timeAgoShort(time, context = context)
+        }
+    }
+
+    Text(
+        timeStr,
+        color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f),
+        fontSize = 12.sp
+    )
+}
+
+@Composable
+private fun RenderRegularTextNote(
+    note: Note,
+    loggedIn: User,
+    canPreview: Boolean,
+    backgroundBubbleColor: Color,
+    accountViewModel: AccountViewModel,
+    navController: NavController
+) {
+    val tags = remember { note.event?.tags() }
+    val eventContent = remember { accountViewModel.decrypt(note) }
+    val modifier = remember { Modifier.padding(top = 5.dp) }
+
+    if (eventContent != null) {
+        TranslatableRichTextViewer(
+            eventContent,
+            canPreview,
+            modifier,
+            tags,
+            backgroundBubbleColor,
+            accountViewModel,
+            navController
+        )
+    } else {
+        TranslatableRichTextViewer(
+            stringResource(R.string.could_not_decrypt_the_message),
+            true,
+            modifier,
+            tags,
+            backgroundBubbleColor,
+            accountViewModel,
+            navController
+        )
+    }
+}
+
+@Composable
+private fun RenderChangeChannelMetadataNote(
+    note: Note
+) {
+    val noteEvent = note.event as? ChannelMetadataEvent ?: return
+
+    val channelInfo = noteEvent.channelInfo()
+    val text = note.author?.toBestDisplayName()
+        .toString() + " ${stringResource(R.string.changed_chat_name_to)} '" + (
+        channelInfo.name
+            ?: ""
+        ) + "', ${stringResource(R.string.description_to)} '" + (
+        channelInfo.about
+            ?: ""
+        ) + "', ${stringResource(R.string.and_picture_to)} '" + (
+        channelInfo.picture
+            ?: ""
+        ) + "'"
+
+    CreateTextWithEmoji(
+        text = text,
+        tags = note.author?.info?.latestMetadata?.tags
+    )
+}
+
+@Composable
+private fun RenderCreateChannelNote(note: Note) {
+    val noteEvent = note.event as? ChannelCreateEvent ?: return
+    val channelInfo = remember { noteEvent.channelInfo() }
+
+    val text = note.author?.toBestDisplayName()
+        .toString() + " ${stringResource(R.string.created)} " + (
+        channelInfo.name
+            ?: ""
+        ) + " ${stringResource(R.string.with_description_of)} '" + (
+        channelInfo.about
+            ?: ""
+        ) + "', ${stringResource(R.string.and_picture)} '" + (
+        channelInfo.picture
+            ?: ""
+        ) + "'"
+
+    CreateTextWithEmoji(
+        text = text,
+        tags = note.author?.info?.latestMetadata?.tags
+    )
+}
+
+@Composable
+private fun DrawAuthorInfo(
+    baseNote: Note,
+    alignment: Arrangement.Horizontal,
+    navController: NavController
+) {
+    val userState by baseNote.author!!.live().metadata.observeAsState()
+
+    val pubkeyHex = remember { baseNote.author?.pubkeyHex } ?: return
+    val route = remember { "User/$pubkeyHex" }
+    val userDisplayName = remember(userState) { userState?.user?.toBestDisplayName() }
+    val userProfilePicture = remember(userState) { ResizeImage(userState?.user?.profilePicture(), 25.dp) }
+    val userTags = remember(userState) { userState?.user?.info?.latestMetadata?.tags }
+
+    Row(
+        verticalAlignment = Alignment.CenterVertically,
+        horizontalArrangement = alignment,
+        modifier = Modifier.padding(top = 5.dp)
+    ) {
+        RobohashAsyncImageProxy(
+            robot = pubkeyHex,
+            model = userProfilePicture,
+            contentDescription = stringResource(id = R.string.profile_image),
+            modifier = Modifier
+                .width(25.dp)
+                .height(25.dp)
+                .clip(shape = CircleShape)
+                .clickable(onClick = {
+                    navController.navigate(route)
+                })
+        )
+
+        CreateClickableTextWithEmoji(
+            clickablePart = "  $userDisplayName",
+            suffix = "",
+            tags = userTags,
+            fontWeight = FontWeight.Bold,
+            overrideColor = MaterialTheme.colors.onBackground,
+            route = route,
+            navController = navController
+        )
+    }
+}
+
+data class RelayBadgesState(
+    val shouldDisplayExpandButton: Boolean,
+    val noteRelays: List<String>,
+    val noteRelaysSimple: List<String>
+)
+
+@Composable
+private fun RelayBadges(baseNote: Note) {
+    val noteRelaysState by baseNote.live().relays.observeAsState()
+
+    val state: RelayBadgesState by remember(noteRelaysState) {
+        val newShouldDisplayExpandButton = (noteRelaysState?.note?.relays?.size ?: 0) > 3
+        val noteRelays = noteRelaysState?.note?.relays?.toList() ?: emptyList()
+        val noteRelaysSimple = noteRelaysState?.note?.relays?.take(3)?.toList() ?: emptyList()
+
+        mutableStateOf(RelayBadgesState(newShouldDisplayExpandButton, noteRelays, noteRelaysSimple))
+    }
+
+    var expanded by remember { mutableStateOf(false) }
+
+    val relaysToDisplay by remember {
+        derivedStateOf {
+            if (expanded) state.noteRelays else state.noteRelaysSimple
+        }
+    }
+
+    FlowRow(Modifier.padding(start = 10.dp)) {
+        relaysToDisplay.forEach {
+            RenderRelay(it)
+        }
+    }
+
+    if (state.shouldDisplayExpandButton && !expanded) {
+        IconButton(
+            modifier = Modifier.then(Modifier.size(15.dp)),
+            onClick = { expanded = true }
+        ) {
+            Icon(
+                imageVector = Icons.Default.ChevronRight,
+                null,
+                modifier = Modifier.size(15.dp),
+                tint = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+            )
+        }
+    }
+}
+
+@Composable
+private fun RenderRelay(dirtyUrl: String) {
+    val uri = LocalUriHandler.current
+    val website = remember {
+        val cleanUrl = dirtyUrl.removePrefix("wss://").removePrefix("ws://")
+        "https://$cleanUrl"
+    }
+    val iconUrl = remember {
+        val cleanUrl = dirtyUrl.removePrefix("wss://").removePrefix("ws://")
+        "https://$cleanUrl/favicon.ico"
+    }
+
+    val clickableModifier = remember {
+        Modifier
+            .size(15.dp)
+            .padding(1.dp)
+            .clickable(onClick = { uri.openUri(website) })
+    }
+
+    val colorFilter = remember {
+        ColorFilter.colorMatrix(ColorMatrix().apply { setToSaturation(0.5f) })
+    }
+
+    val iconModifier = remember {
+        Modifier
+            .fillMaxSize(1f)
+            .clip(shape = CircleShape)
+    }
+
+    Box(
+        modifier = clickableModifier
+    ) {
+        RobohashFallbackAsyncImage(
+            robot = iconUrl,
+            robotSize = 15.dp,
+            model = iconUrl,
+            contentDescription = stringResource(id = R.string.relay_icon),
+            colorFilter = colorFilter,
+            modifier = iconModifier.background(MaterialTheme.colors.background)
+        )
+    }
+}

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

@@ -276,8 +276,8 @@ private fun AuthorPictureAndComment(
             (zapRequest.event as? LnZapRequestEvent)?.let {
                 val decryptedContent = accountViewModel.decryptZap(zapRequest)
                 if (decryptedContent != null) {
-                    val author = LocalCache.getOrCreateUser(decryptedContent.pubKey)
-                    content = Pair(author, decryptedContent.content)
+                    val newAuthor = LocalCache.getOrCreateUser(decryptedContent.pubKey)
+                    content = Pair(newAuthor, decryptedContent.content)
                 } else {
                     if (!zapRequest.event?.content().isNullOrBlank()) {
                         content = Pair(author, zapRequest.event?.content())

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

@@ -12,6 +12,7 @@ import androidx.compose.foundation.combinedClickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
@@ -24,6 +25,8 @@ import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.shape.CutCornerShape
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.text.ClickableText
+import androidx.compose.material.Button
+import androidx.compose.material.ButtonDefaults
 import androidx.compose.material.Divider
 import androidx.compose.material.DropdownMenu
 import androidx.compose.material.DropdownMenuItem
@@ -37,6 +40,7 @@ import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Bolt
 import androidx.compose.material.icons.filled.ExpandMore
 import androidx.compose.material.icons.filled.MoreVert
+import androidx.compose.material.icons.filled.PushPin
 import androidx.compose.material.lightColors
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
@@ -48,8 +52,10 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
+import androidx.compose.ui.Alignment.Companion.CenterVertically
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Brush
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.ColorFilter
 import androidx.compose.ui.graphics.ColorMatrix
@@ -81,7 +87,9 @@ import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.Channel
 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.model.NoteState
 import com.vitorpamplona.amethyst.model.User
+import com.vitorpamplona.amethyst.service.model.AudioTrackEvent
 import com.vitorpamplona.amethyst.service.model.BadgeAwardEvent
 import com.vitorpamplona.amethyst.service.model.BadgeDefinitionEvent
 import com.vitorpamplona.amethyst.service.model.ChannelCreateEvent
@@ -92,6 +100,9 @@ import com.vitorpamplona.amethyst.service.model.FileHeaderEvent
 import com.vitorpamplona.amethyst.service.model.FileStorageHeaderEvent
 import com.vitorpamplona.amethyst.service.model.HighlightEvent
 import com.vitorpamplona.amethyst.service.model.LongTextNoteEvent
+import com.vitorpamplona.amethyst.service.model.Participant
+import com.vitorpamplona.amethyst.service.model.PeopleListEvent
+import com.vitorpamplona.amethyst.service.model.PinListEvent
 import com.vitorpamplona.amethyst.service.model.PollNoteEvent
 import com.vitorpamplona.amethyst.service.model.PrivateDmEvent
 import com.vitorpamplona.amethyst.service.model.ReactionEvent
@@ -100,13 +111,14 @@ import com.vitorpamplona.amethyst.service.model.ReportedKey
 import com.vitorpamplona.amethyst.service.model.RepostEvent
 import com.vitorpamplona.amethyst.service.model.TextNoteEvent
 import com.vitorpamplona.amethyst.ui.components.ClickableUrl
-import com.vitorpamplona.amethyst.ui.components.CreateClickableText
+import com.vitorpamplona.amethyst.ui.components.CreateClickableTextWithEmoji
 import com.vitorpamplona.amethyst.ui.components.ObserveDisplayNip05Status
 import com.vitorpamplona.amethyst.ui.components.ResizeImage
 import com.vitorpamplona.amethyst.ui.components.RobohashAsyncImage
 import com.vitorpamplona.amethyst.ui.components.RobohashAsyncImageProxy
 import com.vitorpamplona.amethyst.ui.components.RobohashFallbackAsyncImage
 import com.vitorpamplona.amethyst.ui.components.TranslatableRichTextViewer
+import com.vitorpamplona.amethyst.ui.components.VideoView
 import com.vitorpamplona.amethyst.ui.components.ZoomableContent
 import com.vitorpamplona.amethyst.ui.components.ZoomableContentView
 import com.vitorpamplona.amethyst.ui.components.ZoomableLocalImage
@@ -126,6 +138,7 @@ import nostr.postr.toNpub
 import java.io.File
 import java.math.BigDecimal
 import java.net.URL
+import java.util.Locale
 import kotlin.time.ExperimentalTime
 import kotlin.time.measureTimedValue
 
@@ -366,6 +379,18 @@ fun NoteComposeInner(
                                 RenderBadgeAward(note, backgroundColor, accountViewModel, navController)
                             }
 
+                            is PeopleListEvent -> {
+                                RenderPeopleList(noteState, backgroundColor, accountViewModel, navController)
+                            }
+
+                            is AudioTrackEvent -> {
+                                RenderAudioTrack(note, loggedIn, accountViewModel, navController)
+                            }
+
+                            is PinListEvent -> {
+                                RenderPinListEvent(noteState, backgroundColor, accountViewModel, navController)
+                            }
+
                             is PrivateDmEvent -> {
                                 RenderPrivateMessage(note, makeItShort, isAcceptableAndCanPreview.second, backgroundColor, accountViewModel, navController)
                             }
@@ -630,6 +655,114 @@ private fun RenderPrivateMessage(
     )
 }
 
+@Composable
+fun RenderPeopleList(
+    noteState: NoteState?,
+    backgroundColor: Color,
+    accountViewModel: AccountViewModel,
+    navController: NavController
+) {
+    DisplayPeopleList(noteState, backgroundColor, accountViewModel, navController)
+
+    noteState?.note?.let {
+        ReactionsRow(it, accountViewModel, navController)
+    }
+
+    Divider(
+        modifier = Modifier.padding(top = 10.dp),
+        thickness = 0.25.dp
+    )
+}
+
+@Composable
+fun DisplayPeopleList(
+    noteState: NoteState?,
+    backgroundColor: Color,
+    accountViewModel: AccountViewModel,
+    navController: NavController
+) {
+    val note = remember(noteState) { noteState?.note } ?: return
+    val noteEvent = note.event as? PeopleListEvent ?: return
+
+    var members by remember { mutableStateOf<List<User>>(listOf()) }
+
+    val account = accountViewModel.userProfile()
+    var expanded by remember {
+        mutableStateOf(false)
+    }
+
+    val toMembersShow = if (expanded) {
+        members
+    } else {
+        members.take(3)
+    }
+
+    Text(
+        text = "#${noteEvent.dTag()}",
+        fontWeight = FontWeight.Bold,
+        maxLines = 1,
+        overflow = TextOverflow.Ellipsis,
+        modifier = Modifier
+            .fillMaxWidth()
+            .padding(5.dp),
+        textAlign = TextAlign.Center
+    )
+
+    LaunchedEffect(key1 = noteState) {
+        withContext(Dispatchers.IO) {
+            members = noteEvent.bookmarkedPeople().mapNotNull { hex ->
+                LocalCache.checkGetOrCreateUser(hex)
+            }.sortedBy { account.isFollowing(it) }.reversed()
+        }
+    }
+
+    Box {
+        FlowRow(modifier = Modifier.padding(top = 5.dp)) {
+            toMembersShow.forEach { user ->
+                Row(modifier = Modifier.fillMaxWidth()) {
+                    UserCompose(
+                        user,
+                        overallModifier = Modifier,
+                        accountViewModel = accountViewModel,
+                        navController = navController
+                    )
+                }
+            }
+        }
+
+        if (members.size > 3 && !expanded) {
+            Row(
+                verticalAlignment = Alignment.CenterVertically,
+                horizontalArrangement = Arrangement.Center,
+                modifier = Modifier
+                    .align(Alignment.BottomCenter)
+                    .fillMaxWidth()
+                    .background(
+                        brush = Brush.verticalGradient(
+                            colors = listOf(
+                                backgroundColor.copy(alpha = 0f),
+                                backgroundColor
+                            )
+                        )
+                    )
+            ) {
+                Button(
+                    modifier = Modifier.padding(top = 10.dp),
+                    onClick = { expanded = !expanded },
+                    shape = RoundedCornerShape(20.dp),
+                    colors = ButtonDefaults.buttonColors(
+                        backgroundColor = MaterialTheme.colors.primary.copy(alpha = 0.32f)
+                            .compositeOver(MaterialTheme.colors.background)
+                    ),
+                    contentPadding = PaddingValues(vertical = 6.dp, horizontal = 16.dp)
+                ) {
+                    Text(text = stringResource(R.string.show_more), color = Color.White)
+                }
+            }
+        }
+    }
+}
+
 @Composable
 private fun RenderBadgeAward(
     note: Note,
@@ -750,6 +883,135 @@ private fun RenderRepost(
     }
 }
 
+@Composable
+private fun RenderPinListEvent(
+    noteState: NoteState?,
+    backgroundColor: Color,
+    accountViewModel: AccountViewModel,
+    navController: NavController
+) {
+    val noteEvent = noteState?.note?.event as? PinListEvent ?: return
+
+    PinListHeader(noteState, backgroundColor, accountViewModel, navController)
+
+    ReactionsRow(noteState?.note, accountViewModel, navController)
+
+    Divider(
+        modifier = Modifier.padding(top = 10.dp),
+        thickness = 0.25.dp
+    )
+}
+
+@Composable
+fun PinListHeader(
+    noteState: NoteState?,
+    backgroundColor: Color,
+    accountViewModel: AccountViewModel,
+    navController: NavController
+) {
+    val note = remember(noteState) { noteState?.note } ?: return
+    val noteEvent = note.event as? PinListEvent ?: return
+
+    var pins by remember { mutableStateOf<List<String>>(noteEvent.pins()) }
+
+    var expanded by remember {
+        mutableStateOf(false)
+    }
+
+    val pinsToShow = if (expanded) {
+        pins
+    } else {
+        pins.take(3)
+    }
+
+    Text(
+        text = "#${noteEvent.dTag()}",
+        fontWeight = FontWeight.Bold,
+        maxLines = 1,
+        overflow = TextOverflow.Ellipsis,
+        modifier = Modifier
+            .fillMaxWidth()
+            .padding(5.dp),
+        textAlign = TextAlign.Center
+    )
+
+    Box {
+        FlowRow(modifier = Modifier.padding(top = 5.dp)) {
+            pinsToShow.forEach { pin ->
+                Row(modifier = Modifier.fillMaxWidth(), verticalAlignment = CenterVertically) {
+                    Icon(
+                        imageVector = Icons.Default.PushPin,
+                        contentDescription = null,
+                        tint = MaterialTheme.colors.onBackground.copy(0.32f),
+                        modifier = Modifier.size(15.dp)
+                    )
+
+                    Spacer(modifier = Modifier.width(5.dp))
+
+                    TranslatableRichTextViewer(
+                        content = pin,
+                        canPreview = true,
+                        tags = emptyList(),
+                        backgroundColor = backgroundColor,
+                        accountViewModel = accountViewModel,
+                        navController = navController
+                    )
+                }
+            }
+        }
+
+        if (pins.size > 3 && !expanded) {
+            Row(
+                verticalAlignment = Alignment.CenterVertically,
+                horizontalArrangement = Arrangement.Center,
+                modifier = Modifier
+                    .align(Alignment.BottomCenter)
+                    .fillMaxWidth()
+                    .background(
+                        brush = Brush.verticalGradient(
+                            colors = listOf(
+                                backgroundColor.copy(alpha = 0f),
+                                backgroundColor
+                            )
+                        )
+                    )
+            ) {
+                Button(
+                    modifier = Modifier.padding(top = 10.dp),
+                    onClick = { expanded = !expanded },
+                    shape = RoundedCornerShape(20.dp),
+                    colors = ButtonDefaults.buttonColors(
+                        backgroundColor = MaterialTheme.colors.primary.copy(alpha = 0.32f)
+                            .compositeOver(MaterialTheme.colors.background)
+                    ),
+                    contentPadding = PaddingValues(vertical = 6.dp, horizontal = 16.dp)
+                ) {
+                    Text(text = stringResource(R.string.show_more), color = Color.White)
+                }
+            }
+        }
+    }
+}
+
+@Composable
+private fun RenderAudioTrack(
+    note: Note,
+    loggedIn: User,
+    accountViewModel: AccountViewModel,
+    navController: NavController
+) {
+    val noteEvent = note.event as? AudioTrackEvent ?: return
+
+    AudioTrackHeader(noteEvent, note, loggedIn, navController)
+
+    ReactionsRow(note, accountViewModel, navController)
+
+    Divider(
+        modifier = Modifier.padding(top = 10.dp),
+        thickness = 0.25.dp
+    )
+}
+
 @Composable
 private fun RenderLongFormContent(
     note: Note,
@@ -1099,13 +1361,15 @@ fun DisplayHighlight(
                 val userState by userBase.live().metadata.observeAsState()
                 val route = remember { "User/${userBase.pubkeyHex}" }
                 val userDisplayName = remember(userState) { userState?.user?.toBestDisplayName() }
+                val userTags = remember(userState) { userState?.user?.info?.latestMetadata?.tags }
 
                 if (userDisplayName != null) {
-                    CreateClickableText(
-                        userDisplayName,
-                        "",
-                        route,
-                        navController
+                    CreateClickableTextWithEmoji(
+                        clickablePart = userDisplayName,
+                        suffix = "",
+                        tags = userTags,
+                        route = route,
+                        navController = navController
                     )
                 }
             }
@@ -1393,45 +1657,124 @@ fun FileStorageHeaderDisplay(baseNote: Note) {
         }
     }
 
-    val noteState = fileNote?.live()?.metadata?.observeAsState()
-    val note = noteState?.value?.note
+    fileNote?.let { fileNote2 ->
+        val noteState by fileNote2.live().metadata.observeAsState()
+        val note = remember(noteState) { noteState?.note }
 
-    var content by remember { mutableStateOf<ZoomableContent?>(null) }
+        var content by remember { mutableStateOf<ZoomableContent?>(null) }
 
-    LaunchedEffect(key1 = eventHeader.id, key2 = noteState, key3 = note?.event) {
-        withContext(Dispatchers.IO) {
-            val uri = "nostr:" + baseNote.toNEvent()
-            val localDir = note?.idHex?.let { File(File(appContext.externalCacheDir, "NIP95"), it) }
-            val blurHash = eventHeader.blurhash()
-            val dimensions = eventHeader.dimensions()
-            val description = eventHeader.content
-            val mimeType = eventHeader.mimeType()
+        LaunchedEffect(key1 = eventHeader.id, key2 = noteState, key3 = note?.event) {
+            withContext(Dispatchers.IO) {
+                val uri = "nostr:" + baseNote.toNEvent()
+                val localDir = note?.idHex?.let { File(File(appContext.externalCacheDir, "NIP95"), it) }
+                val blurHash = eventHeader.blurhash()
+                val dimensions = eventHeader.dimensions()
+                val description = eventHeader.content
+                val mimeType = eventHeader.mimeType()
 
-            content = if (mimeType?.startsWith("image") == true) {
-                ZoomableLocalImage(
-                    localFile = localDir,
-                    mimeType = mimeType,
-                    description = description,
-                    blurhash = blurHash,
-                    dim = dimensions,
-                    isVerified = true,
-                    uri = uri
-                )
-            } else {
-                ZoomableLocalVideo(
-                    localFile = localDir,
-                    mimeType = mimeType,
-                    description = description,
-                    dim = dimensions,
-                    isVerified = true,
-                    uri = uri
-                )
+                content = if (mimeType?.startsWith("image") == true) {
+                    ZoomableLocalImage(
+                        localFile = localDir,
+                        mimeType = mimeType,
+                        description = description,
+                        blurhash = blurHash,
+                        dim = dimensions,
+                        isVerified = true,
+                        uri = uri
+                    )
+                } else {
+                    ZoomableLocalVideo(
+                        localFile = localDir,
+                        mimeType = mimeType,
+                        description = description,
+                        dim = dimensions,
+                        isVerified = true,
+                        uri = uri
+                    )
+                }
             }
         }
+
+        content?.let {
+            ZoomableContentView(content = it, listOf(it))
+        }
+    }
+}
+
+@Composable
+fun AudioTrackHeader(noteEvent: AudioTrackEvent, note: Note, loggedIn: User, navController: NavController) {
+    val media = remember { noteEvent.media() }
+    val cover = remember { noteEvent.cover() }
+    val subject = remember { noteEvent.subject() }
+    val content = remember { noteEvent.content() }
+    val participants = remember { noteEvent.participants() }
+
+    var participantUsers by remember { mutableStateOf<List<Pair<Participant, User>>>(emptyList()) }
+
+    LaunchedEffect(key1 = participants) {
+        withContext(Dispatchers.IO) {
+            participantUsers = participants.mapNotNull { part -> LocalCache.checkGetOrCreateUser(part.key)?.let { Pair(part, it) } }
+        }
     }
 
-    content?.let {
-        ZoomableContentView(content = it, listOf(it))
+    Row(modifier = Modifier.padding(top = 5.dp)) {
+        Column(modifier = Modifier.fillMaxWidth(), horizontalAlignment = Alignment.CenterHorizontally) {
+            Row() {
+                subject?.let {
+                    Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.padding(top = 5.dp, bottom = 5.dp)) {
+                        Text(
+                            text = it,
+                            fontWeight = FontWeight.Bold,
+                            maxLines = 3,
+                            overflow = TextOverflow.Ellipsis,
+                            modifier = Modifier.fillMaxWidth()
+                        )
+                    }
+                }
+            }
+
+            participantUsers.forEach {
+                Row(
+                    verticalAlignment = Alignment.CenterVertically,
+                    modifier = Modifier
+                        .padding(top = 5.dp, start = 10.dp, end = 10.dp)
+                        .clickable {
+                            navController.navigate("User/${it.second.pubkeyHex}")
+                        }
+                ) {
+                    UserPicture(it.second, loggedIn, 25.dp)
+                    Spacer(Modifier.width(5.dp))
+                    UsernameDisplay(it.second, Modifier.weight(1f))
+                    Spacer(Modifier.width(5.dp))
+                    it.first.role?.let {
+                        Text(
+                            text = it.capitalize(Locale.ROOT),
+                            color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f),
+                            maxLines = 1
+                        )
+                    }
+                }
+            }
+
+            media?.let { media ->
+                Row(
+                    verticalAlignment = Alignment.CenterVertically,
+                    modifier = Modifier.padding(10.dp)
+                ) {
+                    cover?.let { cover ->
+                        VideoView(
+                            videoUri = media,
+                            description = noteEvent.subject(),
+                            thumbUri = cover
+                        )
+                    }
+                        ?: VideoView(
+                            videoUri = media,
+                            noteEvent.subject()
+                        )
+                }
+            }
+        }
     }
 }
 
@@ -1598,7 +1941,7 @@ private fun RelayIconCompose(url: String) {
             .clickable(onClick = { uri.openUri("https://$url") })
     }
     val colorFilter = remember {
-        ColorFilter.colorMatrix(ColorMatrix().apply { setToSaturation(0f) })
+        ColorFilter.colorMatrix(ColorMatrix().apply { setToSaturation(0.5f) })
     }
 
     Box(boxModifier) {

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

@@ -62,6 +62,9 @@ import androidx.core.graphics.ColorUtils
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.model.AddressableNote
 import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.service.model.AudioTrackEvent
+import com.vitorpamplona.amethyst.service.model.FileHeaderEvent
+import com.vitorpamplona.amethyst.service.model.PeopleListEvent
 import com.vitorpamplona.amethyst.ui.components.SelectTextDialog
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.ReportNoteDialog
@@ -81,11 +84,19 @@ val externalLinkForNote = { note: Note ->
     if (note is AddressableNote) {
         if (note.event?.getReward() != null) {
             "https://nostrbounties.com/b/${note.address().toNAddr()}"
+        } else if (note.event is PeopleListEvent) {
+            "https://listr.lol/a/${note.address()?.toNAddr()}"
+        } else if (note.event is AudioTrackEvent) {
+            "https://zapstr.live/?track=${note.address()?.toNAddr()}"
         } else {
-            "https://habla.news/a/${note.address().toNAddr()}"
+            "https://habla.news/a/${note.address()?.toNAddr()}"
         }
     } else {
-        "https://snort.social/e/${note.toNEvent()}"
+        if (note.event is FileHeaderEvent) {
+            "https://filestr.vercel.app/e/${note.toNEvent()}"
+        } else {
+            "https://snort.social/e/${note.toNEvent()}"
+        }
     }
 }
 
@@ -128,7 +139,7 @@ fun NoteQuickActionMenu(note: Note, popupExpanded: Boolean, onDismiss: () -> Uni
 
     if (popupExpanded) {
         val isOwnNote = accountViewModel.isLoggedUser(note.author)
-        val isFollowingUser = !isOwnNote && accountViewModel.isFollowing(note.author!!)
+        val isFollowingUser = !isOwnNote && accountViewModel.isFollowing(note.author)
 
         Popup(onDismissRequest = onDismiss) {
             Card(

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

@@ -28,6 +28,7 @@ import androidx.compose.ui.unit.sp
 import androidx.compose.ui.window.Dialog
 import androidx.compose.ui.window.DialogProperties
 import androidx.compose.ui.window.Popup
+import androidx.lifecycle.viewmodel.compose.viewModel
 import androidx.navigation.NavController
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.model.Note
@@ -37,7 +38,6 @@ import com.vitorpamplona.amethyst.ui.theme.BitcoinOrange
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
-import java.math.BigDecimal
 import java.util.*
 import kotlin.math.roundToInt
 
@@ -49,19 +49,45 @@ fun PollNote(
     accountViewModel: AccountViewModel,
     navController: NavController
 ) {
-    val zapsState by baseNote.live().zaps.observeAsState()
-    val zappedNote = zapsState?.note ?: return
-
     val accountState by accountViewModel.accountLiveData.observeAsState()
-    val account = accountState?.account ?: return
+    val account = remember(accountState) { accountState?.account } ?: return
 
-    val pollViewModel = PollNoteViewModel()
-    pollViewModel.load(account, zappedNote)
+    val pollViewModel: PollNoteViewModel = viewModel()
 
-    pollViewModel.pollEvent?.pollOptions()?.forEach { poll_op ->
+    LaunchedEffect(key1 = baseNote) {
+        pollViewModel.load(account, baseNote)
+    }
+
+    PollNote(
+        baseNote = baseNote,
+        pollViewModel = pollViewModel,
+        canPreview = canPreview,
+        backgroundColor = backgroundColor,
+        accountViewModel = accountViewModel,
+        navController = navController
+    )
+}
+
+@Composable
+fun PollNote(
+    baseNote: Note,
+    pollViewModel: PollNoteViewModel,
+    canPreview: Boolean,
+    backgroundColor: Color,
+    accountViewModel: AccountViewModel,
+    navController: NavController
+) {
+    val zapsState by baseNote.live().zaps.observeAsState()
+
+    LaunchedEffect(key1 = zapsState) {
+        withContext(Dispatchers.IO) {
+            pollViewModel.refreshTallies()
+        }
+    }
+
+    pollViewModel.tallies.forEach { poll_op ->
         OptionNote(
-            poll_op.key,
-            poll_op.value,
+            poll_op,
             pollViewModel,
             baseNote,
             accountViewModel,
@@ -74,8 +100,7 @@ fun PollNote(
 
 @Composable
 private fun OptionNote(
-    optionNumber: Int,
-    optionText: String,
+    poolOption: PollOption,
     pollViewModel: PollNoteViewModel,
     baseNote: Note,
     accountViewModel: AccountViewModel,
@@ -88,32 +113,17 @@ private fun OptionNote(
         modifier = Modifier.padding(vertical = 3.dp)
     ) {
         if (!pollViewModel.canZap()) {
-            val defaultColor = MaterialTheme.colors.primary.copy(alpha = 0.32f)
-            var optionTally by remember { mutableStateOf(Pair(BigDecimal.ZERO, defaultColor)) }
-
-            LaunchedEffect(key1 = optionNumber, key2 = pollViewModel) {
-                withContext(Dispatchers.IO) {
-                    val myTally = pollViewModel.optionVoteTally(optionNumber)
-                    val color = if (
-                        pollViewModel.consensusThreshold != null &&
-                        myTally >= pollViewModel.consensusThreshold!!
-                    ) {
-                        Color.Green.copy(alpha = 0.32f)
-                    } else {
-                        defaultColor
-                    }
-
-                    if (myTally > optionTally.first || color != optionTally.second) {
-                        optionTally = Pair(myTally, color)
-                    }
-                }
+            val color = if (poolOption.consensusThreadhold) {
+                Color.Green.copy(alpha = 0.32f)
+            } else {
+                MaterialTheme.colors.primary.copy(alpha = 0.32f)
             }
 
             ZapVote(
                 baseNote,
+                poolOption,
                 accountViewModel,
                 pollViewModel,
-                optionNumber,
                 nonClickablePrepend = {
                     Box(
                         Modifier
@@ -121,14 +131,14 @@ private fun OptionNote(
                             .clip(shape = RoundedCornerShape(15.dp))
                             .border(
                                 2.dp,
-                                optionTally.second,
+                                color,
                                 RoundedCornerShape(15.dp)
                             )
                     ) {
                         LinearProgressIndicator(
                             modifier = Modifier.matchParentSize(),
-                            color = optionTally.second,
-                            progress = optionTally.first.toFloat()
+                            color = color,
+                            progress = poolOption.tally.toFloat()
                         )
 
                         Row(
@@ -141,7 +151,7 @@ private fun OptionNote(
                                     .width(40.dp)
                             ) {
                                 Text(
-                                    text = "${(optionTally.first.toFloat() * 100).roundToInt()}%",
+                                    text = "${(poolOption.tally.toFloat() * 100).roundToInt()}%",
                                     fontWeight = FontWeight.Bold
                                 )
                             }
@@ -152,7 +162,7 @@ private fun OptionNote(
                                     .padding(15.dp)
                             ) {
                                 TranslatableRichTextViewer(
-                                    optionText,
+                                    poolOption.descriptor,
                                     canPreview,
                                     Modifier,
                                     pollViewModel.pollEvent?.tags(),
@@ -170,9 +180,9 @@ private fun OptionNote(
         } else {
             ZapVote(
                 baseNote,
+                poolOption,
                 accountViewModel,
                 pollViewModel,
-                optionNumber,
                 nonClickablePrepend = {},
                 clickablePrepend = {
                     Box(
@@ -186,7 +196,7 @@ private fun OptionNote(
                             )
                     ) {
                         TranslatableRichTextViewer(
-                            optionText,
+                            poolOption.descriptor,
                             canPreview,
                             Modifier.padding(15.dp),
                             pollViewModel.pollEvent?.tags(),
@@ -205,9 +215,9 @@ private fun OptionNote(
 @OptIn(ExperimentalFoundationApi::class)
 fun ZapVote(
     baseNote: Note,
+    poolOption: PollOption,
     accountViewModel: AccountViewModel,
     pollViewModel: PollNoteViewModel,
-    pollOption: Int,
     modifier: Modifier = Modifier,
     nonClickablePrepend: @Composable () -> Unit,
     clickablePrepend: @Composable () -> Unit
@@ -264,7 +274,7 @@ fun ZapVote(
                             )
                             .show()
                     }
-                } else if (pollViewModel.isVoteAmountAtomic() && pollViewModel.isPollOptionZappedBy(pollOption, accountViewModel.userProfile())) {
+                } else if (pollViewModel.isVoteAmountAtomic() && poolOption.zappedByLoggedIn) {
                     // only allow one vote per option when min==max, i.e. atomic vote amount specified
                     scope.launch {
                         Toast
@@ -281,7 +291,7 @@ fun ZapVote(
                         accountViewModel.zap(
                             baseNote,
                             account.zapAmountChoices.first() * 1000,
-                            pollOption,
+                            poolOption.option,
                             "",
                             context,
                             onError = {
@@ -311,7 +321,7 @@ fun ZapVote(
                 baseNote,
                 accountViewModel,
                 pollViewModel,
-                pollOption,
+                poolOption.option,
                 onDismiss = {
                     wantsToZap = false
                     zappingProgress = 0f
@@ -335,17 +345,7 @@ fun ZapVote(
 
         clickablePrepend()
 
-        var optionWasZappedByLoggedInUser by remember { mutableStateOf(false) }
-
-        LaunchedEffect(key1 = zapsState) {
-            withContext(Dispatchers.IO) {
-                if (!optionWasZappedByLoggedInUser) {
-                    optionWasZappedByLoggedInUser = pollViewModel.isPollOptionZappedBy(pollOption, accountViewModel.userProfile())
-                }
-            }
-        }
-
-        if (optionWasZappedByLoggedInUser) {
+        if (poolOption.zappedByLoggedIn) {
             zappingProgress = 1f
             Icon(
                 imageVector = Icons.Default.Bolt,
@@ -372,20 +372,10 @@ fun ZapVote(
         }
     }
 
-    var wasZappedByLoggedInUser by remember { mutableStateOf(false) }
-
-    LaunchedEffect(key1 = zapsState) {
-        withContext(Dispatchers.IO) {
-            if (!wasZappedByLoggedInUser) {
-                wasZappedByLoggedInUser = accountViewModel.calculateIfNoteWasZappedByAccount(zappedNote)
-            }
-        }
-    }
-
     // only show tallies after a user has zapped note
-    if (baseNote.author == accountViewModel.userProfile() || wasZappedByLoggedInUser) {
+    if (baseNote.author == accountViewModel.userProfile() || pollViewModel.wasZappedByLoggedInAccount) {
         Text(
-            showAmount(pollViewModel.zappedPollOptionAmount(pollOption)),
+            showAmount(poolOption.zappedValue),
             fontSize = 14.sp,
             color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f),
             modifier = modifier

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

@@ -1,5 +1,9 @@
 package com.vitorpamplona.amethyst.ui.note
 
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.setValue
+import androidx.lifecycle.ViewModel
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.model.User
@@ -8,19 +12,30 @@ import java.math.BigDecimal
 import java.math.RoundingMode
 import java.util.*
 
-class PollNoteViewModel {
+data class PollOption(
+    val option: Int,
+    val descriptor: String,
+    val zappedValue: BigDecimal,
+    val tally: BigDecimal,
+    val consensusThreadhold: Boolean,
+    val zappedByLoggedIn: Boolean
+)
+
+class PollNoteViewModel : ViewModel() {
     var account: Account? = null
     private var pollNote: Note? = null
 
     var pollEvent: PollNoteEvent? = null
-    private var pollOptions: Map<Int, String>? = null
+    var pollOptions: Map<Int, String>? = null
     var valueMaximum: Int? = null
     var valueMinimum: Int? = null
     private var closedAt: Int? = null
     var consensusThreshold: BigDecimal? = null
 
     var totalZapped: BigDecimal = BigDecimal.ZERO
-    var wasZappedByAuthor: Boolean = false
+    var wasZappedByLoggedInAccount: Boolean = false
+
+    var tallies by mutableStateOf<List<PollOption>>(emptyList())
 
     fun load(acc: Account, note: Note?) {
         account = acc
@@ -32,15 +47,35 @@ class PollNoteViewModel {
         consensusThreshold = pollEvent?.getTagInt(CONSENSUS_THRESHOLD)?.toFloat()?.div(100)?.toBigDecimal()
         closedAt = pollEvent?.getTagInt(CLOSED_AT)
 
+        refreshTallies()
+    }
+
+    fun refreshTallies() {
         totalZapped = totalZapped()
-        wasZappedByAuthor = note?.let { account?.calculateIfNoteWasZappedByAccount(it) } ?: false
+        wasZappedByLoggedInAccount = pollNote?.let { account?.calculateIfNoteWasZappedByAccount(it) } ?: false
+
+        tallies = pollOptions?.keys?.map {
+            val zappedInOption = zappedPollOptionAmount(it)
+
+            val myTally = if (totalZapped.compareTo(BigDecimal.ZERO) > 0) {
+                zappedInOption.divide(totalZapped, 2, RoundingMode.HALF_UP)
+            } else {
+                BigDecimal.ZERO
+            }
+
+            val zappedByLoggedIn = account?.userProfile()?.let { it1 -> isPollOptionZappedBy(it, it1) } ?: false
+
+            val consensus = consensusThreshold != null && myTally >= consensusThreshold!!
+
+            PollOption(it, pollOptions?.get(it) ?: "", zappedInOption, myTally, consensus, zappedByLoggedIn)
+        } ?: emptyList()
     }
 
     fun canZap(): Boolean {
         val account = account ?: return false
         val user = account.userProfile() ?: return false
         val note = pollNote ?: return false
-        return user != note.author && !wasZappedByAuthor
+        return user != note.author && !wasZappedByLoggedInAccount
     }
 
     fun isVoteAmountAtomic() = valueMaximum != null && valueMinimum != null && valueMinimum == valueMaximum
@@ -88,14 +123,6 @@ class PollNoteViewModel {
         return false
     }
 
-    fun optionVoteTally(op: Int): BigDecimal {
-        return if (totalZapped.compareTo(BigDecimal.ZERO) > 0) {
-            zappedPollOptionAmount(op).divide(totalZapped, 2, RoundingMode.HALF_UP)
-        } else {
-            BigDecimal.ZERO
-        }
-    }
-
     fun isPollOptionZappedBy(option: Int, user: User): Boolean {
         return pollNote!!.zaps
             .any {
@@ -105,7 +132,7 @@ class PollNoteViewModel {
             }
     }
 
-    fun zappedPollOptionAmount(option: Int): BigDecimal {
+    private fun zappedPollOptionAmount(option: Int): BigDecimal {
         return pollNote?.zaps?.values?.sumOf {
             val event = it?.event as? LnZapEvent
             if (event?.zappedPollOption() == option) {
@@ -116,7 +143,7 @@ class PollNoteViewModel {
         } ?: BigDecimal(0)
     }
 
-    fun totalZapped(): BigDecimal {
+    private fun totalZapped(): BigDecimal {
         return pollNote?.zaps?.values?.sumOf {
             val zapEvent = (it?.event as? LnZapEvent)
 

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

@@ -18,6 +18,7 @@ import androidx.navigation.NavController
 import com.google.accompanist.flowlayout.FlowRow
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.model.*
+import com.vitorpamplona.amethyst.ui.components.CreateClickableTextWithEmoji
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 
@@ -59,8 +60,9 @@ fun ReplyInformation(replyTo: List<Note>?, dupMentions: List<User>?, account: Ac
                     val innerUser = innerUserState?.user
 
                     innerUser?.let { myUser ->
-                        ClickableText(
-                            AnnotatedString("$prefix@${myUser.toBestDisplayName()}"),
+                        CreateClickableTextWithEmoji(
+                            clickablePart = "$prefix@${myUser.toBestDisplayName()}",
+                            tags = myUser.info?.latestMetadata?.tags,
                             style = LocalTextStyle.current.copy(color = MaterialTheme.colors.primary.copy(alpha = 0.52f), fontSize = 13.sp),
                             onClick = { onUserTagClick(myUser) }
                         )
@@ -196,8 +198,9 @@ fun ReplyInformationChannel(
                     val innerUser = innerUserState?.user
 
                     innerUser?.let { myUser ->
-                        ClickableText(
-                            AnnotatedString("$prefix@${myUser.toBestDisplayName()}"),
+                        CreateClickableTextWithEmoji(
+                            clickablePart = "$prefix@${myUser.toBestDisplayName()}",
+                            tags = myUser.info?.latestMetadata?.tags,
                             style = LocalTextStyle.current.copy(color = MaterialTheme.colors.primary.copy(alpha = 0.52f), fontSize = 13.sp),
                             onClick = { onUserTagClick(myUser) }
                         )

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

@@ -25,7 +25,17 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 
 @Composable
-fun UserCompose(baseUser: User, accountViewModel: AccountViewModel, navController: NavController) {
+fun UserCompose(
+    baseUser: User,
+    overallModifier: Modifier = Modifier
+        .padding(
+            start = 12.dp,
+            end = 12.dp,
+            top = 10.dp
+        ),
+    accountViewModel: AccountViewModel,
+    navController: NavController
+) {
     val accountState by accountViewModel.accountLiveData.observeAsState()
     val account = accountState?.account ?: return
 
@@ -41,12 +51,7 @@ fun UserCompose(baseUser: User, accountViewModel: AccountViewModel, navControlle
         )
     ) {
         Row(
-            modifier = Modifier
-                .padding(
-                    start = 12.dp,
-                    end = 12.dp,
-                    top = 10.dp
-                ),
+            modifier = overallModifier,
             verticalAlignment = Alignment.CenterVertically
         ) {
             UserPicture(baseUser, navController, account.userProfile(), 55.dp)

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

@@ -5,34 +5,31 @@ import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.livedata.observeAsState
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextOverflow
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.model.User
+import com.vitorpamplona.amethyst.ui.components.CreateTextWithEmoji
 
 @Composable
 fun NoteUsernameDisplay(baseNote: Note, weight: Modifier = Modifier) {
     val noteState by baseNote.live().metadata.observeAsState()
-    val note = noteState?.note ?: return
+    val author = remember(noteState) { noteState?.note?.author } ?: return
 
-    val author = note.author
-
-    if (author != null) {
-        UsernameDisplay(author, weight)
-    }
+    UsernameDisplay(author, weight)
 }
 
 @Composable
 fun UsernameDisplay(baseUser: User, weight: Modifier = Modifier) {
     val userState by baseUser.live().metadata.observeAsState()
-    val user = userState?.user ?: return
+    val bestUserName = remember(userState) { userState?.user?.bestUsername() }
+    val bestDisplayName = remember(userState) { userState?.user?.bestDisplayName() }
+    val npubDisplay = remember { baseUser.pubkeyDisplayHex() }
+    val tags = remember(userState) { userState?.user?.info?.latestMetadata?.tags }
 
-    val bestUserName = user.bestUsername()
-    val bestDisplayName = user.bestDisplayName()
-    val npubDisplay = user.pubkeyDisplayHex()
-
-    UserNameDisplay(bestUserName, bestDisplayName, npubDisplay, weight)
+    UserNameDisplay(bestUserName, bestDisplayName, npubDisplay, tags, weight)
 }
 
 @Composable
@@ -40,31 +37,36 @@ private fun UserNameDisplay(
     bestUserName: String?,
     bestDisplayName: String?,
     npubDisplay: String,
+    tags: List<List<String>>?,
     modifier: Modifier
 ) {
     if (bestUserName != null && bestDisplayName != null) {
-        Text(
-            bestDisplayName,
+        CreateTextWithEmoji(
+            text = bestDisplayName,
+            tags = tags,
             fontWeight = FontWeight.Bold
         )
-        Text(
-            "@$bestUserName",
+        CreateTextWithEmoji(
+            text = "@$bestUserName",
+            tags = tags,
             color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f),
             maxLines = 1,
             overflow = TextOverflow.Ellipsis,
             modifier = modifier
         )
     } else if (bestDisplayName != null) {
-        Text(
-            bestDisplayName,
+        CreateTextWithEmoji(
+            text = bestDisplayName,
+            tags = tags,
             fontWeight = FontWeight.Bold,
             maxLines = 1,
             overflow = TextOverflow.Ellipsis,
             modifier = modifier
         )
     } else if (bestUserName != null) {
-        Text(
-            "@$bestUserName",
+        CreateTextWithEmoji(
+            text = "@$bestUserName",
+            tags = tags,
             fontWeight = FontWeight.Bold,
             maxLines = 1,
             overflow = TextOverflow.Ellipsis,

app/src/main/java/com/vitorpamplona/amethyst/ui/qrcode/ShowQRDialog.kt

@@ -34,6 +34,7 @@ import androidx.compose.ui.window.DialogProperties
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.model.User
 import com.vitorpamplona.amethyst.ui.actions.CloseButton
+import com.vitorpamplona.amethyst.ui.components.CreateTextWithEmoji
 import com.vitorpamplona.amethyst.ui.components.ResizeImage
 import com.vitorpamplona.amethyst.ui.components.RobohashAsyncImageProxy
 import com.vitorpamplona.amethyst.ui.qrcode.NIP19QrCodeScanner
@@ -83,10 +84,10 @@ fun ShowQRDialog(user: User, onScan: (String) -> Unit, onClose: () -> Unit) {
                                         .background(MaterialTheme.colors.background)
                                 )
                             }
-                            Row(horizontalArrangement = Arrangement.Center, modifier = Modifier.fillMaxWidth()) {
-                                Text(
-                                    user.bestDisplayName() ?: "",
-                                    modifier = Modifier.padding(top = 5.dp),
+                            Row(horizontalArrangement = Arrangement.Center, modifier = Modifier.fillMaxWidth().padding(top = 5.dp)) {
+                                CreateTextWithEmoji(
+                                    text = user.bestDisplayName() ?: user.bestUsername() ?: "",
+                                    tags = user.info?.latestMetadata?.tags,
                                     fontWeight = FontWeight.Bold,
                                     fontSize = 18.sp
                                 )

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

@@ -3,6 +3,7 @@ package com.vitorpamplona.amethyst.ui.screen
 import android.util.Log
 import androidx.compose.runtime.mutableStateOf
 import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.Note
@@ -58,7 +59,7 @@ open class CardFeedViewModel(val localFilter: FeedFilter<Note>) : ViewModel() {
             if (newCards.isNotEmpty()) {
                 lastNotes = notes
                 lastAccount = (localFilter as? NotificationFeedFilter)?.account
-                updateFeed((oldNotesState.feed.value + newCards).distinctBy { it.id() }.sortedBy { it.createdAt() }.reversed())
+                updateFeed((oldNotesState.feed.value + newCards).distinctBy { it.id() }.sortedWith(compareBy({ it.createdAt() }, { it.id() })).reversed())
             }
         } else {
             val cards = convertToCard(notes)
@@ -128,7 +129,7 @@ open class CardFeedViewModel(val localFilter: FeedFilter<Note>) : ViewModel() {
             val reactionsInCard = reactionsPerEvent[baseNote] ?: emptyList()
             val zapsInCard = zapsPerEvent[baseNote] ?: emptyMap()
 
-            val singleList = (boostsInCard + zapsInCard.values + reactionsInCard).sortedBy { it.createdAt() }.reversed()
+            val singleList = (boostsInCard + zapsInCard.values + reactionsInCard).sortedWith(compareBy({ it.createdAt() }, { it.idHex })).reversed()
             singleList.chunked(50).map { chunk ->
                 MultiSetCard(
                     baseNote,
@@ -156,7 +157,7 @@ open class CardFeedViewModel(val localFilter: FeedFilter<Note>) : ViewModel() {
             }
         }
 
-        return (multiCards + textNoteCards + userZaps).sortedBy { it.createdAt() }.reversed()
+        return (multiCards + textNoteCards + userZaps).sortedWith(compareBy({ it.createdAt() }, { it.id() })).reversed()
     }
 
     private fun updateFeed(notes: List<Card>) {
@@ -189,7 +190,7 @@ open class CardFeedViewModel(val localFilter: FeedFilter<Note>) : ViewModel() {
             if (newCards.isNotEmpty()) {
                 lastNotes = lastNotesCopy + newItems
                 lastAccount = (localFilter as? NotificationFeedFilter)?.account
-                updateFeed((oldNotesState.feed.value + newCards).distinctBy { it.id() }.sortedBy { it.createdAt() }.reversed())
+                updateFeed((oldNotesState.feed.value + newCards).distinctBy { it.id() }.sortedWith(compareBy({ it.createdAt() }, { it.id() })).reversed())
             }
         } else {
             // Refresh Everything
@@ -222,17 +223,19 @@ open class CardFeedViewModel(val localFilter: FeedFilter<Note>) : ViewModel() {
         }
     }
 
-    private val cacheListener: (Set<Note>) -> Unit = { newNotes ->
-        if (localFilter is AdditiveFeedFilter && _feedContent.value is CardFeedState.Loaded) {
-            invalidateInsertData(newNotes)
-        } else {
-            // Refresh Everything
-            invalidateData()
-        }
-    }
+    var collectorJob: Job? = null
 
     init {
-        LocalCache.live.observeForever(cacheListener)
+        collectorJob = viewModelScope.launch(Dispatchers.IO) {
+            LocalCache.live.newEventBundles.collect { newNotes ->
+                if (localFilter is AdditiveFeedFilter && _feedContent.value is CardFeedState.Loaded) {
+                    invalidateInsertData(newNotes)
+                } else {
+                    // Refresh Everything
+                    invalidateData()
+                }
+            }
+        }
     }
 
     fun clear() {
@@ -242,7 +245,7 @@ open class CardFeedViewModel(val localFilter: FeedFilter<Note>) : ViewModel() {
 
     override fun onCleared() {
         clear()
-        LocalCache.live.removeObserver(cacheListener)
+        collectorJob?.cancel()
         super.onCleared()
     }
 }

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

@@ -66,13 +66,13 @@ fun FeedView(
                 when (state) {
                     is FeedState.Empty -> {
                         FeedEmpty {
-                            refreshing = true
+                            refresh()
                         }
                     }
 
                     is FeedState.FeedError -> {
                         FeedError(state.errorMessage) {
-                            refreshing = true
+                            refresh()
                         }
                     }
 

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

@@ -2,6 +2,7 @@ package com.vitorpamplona.amethyst.ui.screen
 
 import androidx.compose.runtime.mutableStateOf
 import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.ui.components.BundledInsert
@@ -98,7 +99,9 @@ abstract class FeedViewModel(val localFilter: FeedFilter<Note>) : ViewModel() {
         val oldNotesState = _feedContent.value
         if (localFilter is AdditiveFeedFilter && oldNotesState is FeedState.Loaded) {
             val newList = localFilter.updateListWith(oldNotesState.feed.value, newItems.toSet())
-            updateFeed(newList)
+            if (newList !== oldNotesState.feed.value) {
+                updateFeed(newList)
+            }
         } else {
             // Refresh Everything
             refreshSuspended()
@@ -122,21 +125,23 @@ abstract class FeedViewModel(val localFilter: FeedFilter<Note>) : ViewModel() {
         }
     }
 
-    private val cacheListener: (Set<Note>) -> Unit = { newNotes ->
-        if (localFilter is AdditiveFeedFilter && _feedContent.value is FeedState.Loaded) {
-            invalidateInsertData(newNotes)
-        } else {
-            // Refresh Everything
-            invalidateData()
+    var collectorJob: Job? = null
+
+    init {
+        collectorJob = viewModelScope.launch(Dispatchers.IO) {
+            LocalCache.live.newEventBundles.collect { newNotes ->
+                if (localFilter is AdditiveFeedFilter && _feedContent.value is FeedState.Loaded) {
+                    invalidateInsertData(newNotes)
+                } else {
+                    // Refresh Everything
+                    invalidateData()
+                }
+            }
         }
     }
 
-    init {
-        LocalCache.live.observeForever(cacheListener)
-    }
-
     override fun onCleared() {
-        LocalCache.live.removeObserver(cacheListener)
+        collectorJob?.cancel()
         super.onCleared()
     }
 }

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

@@ -2,6 +2,7 @@ package com.vitorpamplona.amethyst.ui.screen
 
 import androidx.compose.runtime.mutableStateOf
 import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.ui.components.BundledUpdate
@@ -67,16 +68,18 @@ open class LnZapFeedViewModel(val dataSource: FeedFilter<Pair<Note, Note>>) : Vi
         bundler.invalidate()
     }
 
-    private val cacheListener: (Set<Note>) -> Unit = { newNotes ->
-        invalidateData()
-    }
+    var collectorJob: Job? = null
 
     init {
-        LocalCache.live.observeForever(cacheListener)
+        collectorJob = viewModelScope.launch(Dispatchers.IO) {
+            LocalCache.live.newEventBundles.collect { newNotes ->
+                invalidateData()
+            }
+        }
     }
 
     override fun onCleared() {
-        LocalCache.live.removeObserver(cacheListener)
+        collectorJob?.cancel()
         super.onCleared()
     }
 }

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

@@ -53,9 +53,12 @@ import androidx.navigation.NavController
 import coil.compose.AsyncImage
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.service.model.AudioTrackEvent
 import com.vitorpamplona.amethyst.service.model.BadgeDefinitionEvent
 import com.vitorpamplona.amethyst.service.model.HighlightEvent
 import com.vitorpamplona.amethyst.service.model.LongTextNoteEvent
+import com.vitorpamplona.amethyst.service.model.PeopleListEvent
+import com.vitorpamplona.amethyst.service.model.PinListEvent
 import com.vitorpamplona.amethyst.service.model.PollNoteEvent
 import com.vitorpamplona.amethyst.ui.components.ObserveDisplayNip05Status
 import com.vitorpamplona.amethyst.ui.components.TranslatableRichTextViewer
@@ -349,7 +352,13 @@ fun NoteMaster(
                     )
             ) {
                 Column() {
-                    if (noteEvent is HighlightEvent) {
+                    if (noteEvent is PeopleListEvent) {
+                        DisplayPeopleList(noteState, MaterialTheme.colors.background, accountViewModel, navController)
+                    } else if (noteEvent is AudioTrackEvent) {
+                        AudioTrackHeader(noteEvent, note, account.userProfile(), navController)
+                    } else if (noteEvent is PinListEvent) {
+                        PinListHeader(noteState, MaterialTheme.colors.background, accountViewModel, navController)
+                    } else if (noteEvent is HighlightEvent) {
                         DisplayHighlight(
                             noteEvent.quote(),
                             noteEvent.author(),

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

@@ -2,8 +2,8 @@ package com.vitorpamplona.amethyst.ui.screen
 
 import androidx.compose.runtime.mutableStateOf
 import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
 import com.vitorpamplona.amethyst.model.LocalCache
-import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.model.User
 import com.vitorpamplona.amethyst.ui.components.BundledUpdate
 import com.vitorpamplona.amethyst.ui.dal.FeedFilter
@@ -72,16 +72,18 @@ open class UserFeedViewModel(val dataSource: FeedFilter<User>) : ViewModel() {
         bundler.invalidate()
     }
 
-    private val cacheListener: (Set<Note>) -> Unit = { newNotes ->
-        invalidateData()
-    }
+    var collectorJob: Job? = null
 
     init {
-        LocalCache.live.observeForever(cacheListener)
+        collectorJob = viewModelScope.launch(Dispatchers.IO) {
+            LocalCache.live.newEventBundles.collect { newNotes ->
+                invalidateData()
+            }
+        }
     }
 
     override fun onCleared() {
-        LocalCache.live.removeObserver(cacheListener)
+        collectorJob?.cancel()
         super.onCleared()
     }
 }

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

@@ -386,7 +386,6 @@ private fun JoinButton(account: Account, channel: Channel, navController: NavCon
         modifier = Modifier.padding(horizontal = 3.dp),
         onClick = {
             account.joinChannel(channel.idHex)
-            navController.navigate(Route.Message.route)
         },
         shape = RoundedCornerShape(20.dp),
         colors = ButtonDefaults

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

@@ -20,11 +20,14 @@ import androidx.compose.material.rememberScaffoldState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.livedata.observeAsState
+import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Modifier
+import androidx.lifecycle.viewmodel.compose.viewModel
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.rememberNavController
-import com.vitorpamplona.amethyst.buttons.NewChannelButton
+import com.vitorpamplona.amethyst.ui.buttons.ChannelFabColumn
 import com.vitorpamplona.amethyst.ui.buttons.NewNoteButton
 import com.vitorpamplona.amethyst.ui.navigation.*
 import com.vitorpamplona.amethyst.ui.navigation.AccountSwitchBottomSheet
@@ -50,6 +53,12 @@ fun MainScreen(accountViewModel: AccountViewModel, accountStateViewModel: Accoun
         skipHalfExpanded = true
     )
 
+    val accountState by accountViewModel.accountLiveData.observeAsState()
+    val account = remember(accountState) { accountState?.account }
+
+    val followLists: FollowListViewModel = viewModel()
+    followLists.load(account)
+
     ModalBottomSheetLayout(
         sheetState = sheetState,
         sheetContent = {
@@ -64,7 +73,7 @@ fun MainScreen(accountViewModel: AccountViewModel, accountStateViewModel: Accoun
                 AppBottomBar(navController, accountViewModel)
             },
             topBar = {
-                AppTopBar(navController, scaffoldState, accountViewModel)
+                AppTopBar(followLists, navController, scaffoldState, accountViewModel)
             },
             drawerContent = {
                 DrawerContent(navController, scaffoldState, sheetState, accountViewModel)
@@ -101,7 +110,7 @@ fun FloatingButtons(navController: NavHostController, accountViewModel: AccountV
                     NewNoteButton(state.account, accountViewModel, navController)
                 }
                 if (currentRoute(navController) == Route.Message.base) {
-                    NewChannelButton(state.account)
+                    ChannelFabColumn(state.account, navController)
                 }
                 if (currentRoute(navController)?.substringBefore("?") == Route.Video.base) {
                     NewImageButton(accountViewModel, navController)

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

@@ -1,5 +1,6 @@
 package com.vitorpamplona.amethyst.ui.screen.loggedIn
 
+import android.content.Context
 import android.content.Intent
 import android.net.Uri
 import android.widget.Toast
@@ -18,7 +19,6 @@ import androidx.compose.material.icons.filled.ContentCopy
 import androidx.compose.material.icons.filled.EditNote
 import androidx.compose.material.icons.filled.Link
 import androidx.compose.material.icons.filled.MoreVert
-import androidx.compose.material.icons.filled.Share
 import androidx.compose.runtime.*
 import androidx.compose.runtime.livedata.observeAsState
 import androidx.compose.ui.Alignment
@@ -64,6 +64,7 @@ import com.vitorpamplona.amethyst.service.model.PayInvoiceErrorResponse
 import com.vitorpamplona.amethyst.service.model.PayInvoiceSuccessResponse
 import com.vitorpamplona.amethyst.service.model.ReportEvent
 import com.vitorpamplona.amethyst.ui.actions.NewUserMetadataView
+import com.vitorpamplona.amethyst.ui.components.CreateTextWithEmoji
 import com.vitorpamplona.amethyst.ui.components.DisplayNip05ProfileStatus
 import com.vitorpamplona.amethyst.ui.components.InvoiceRequest
 import com.vitorpamplona.amethyst.ui.components.ResizeImage
@@ -95,6 +96,7 @@ import com.vitorpamplona.amethyst.ui.screen.RelayFeedView
 import com.vitorpamplona.amethyst.ui.screen.RelayFeedViewModel
 import com.vitorpamplona.amethyst.ui.screen.UserFeedView
 import com.vitorpamplona.amethyst.ui.theme.BitcoinOrange
+import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
@@ -125,7 +127,7 @@ fun ProfileScreen(userId: String?, accountViewModel: AccountViewModel, navContro
 @Composable
 fun ProfileScreen(user: User, accountViewModel: AccountViewModel, navController: NavController) {
     val accountState by accountViewModel.accountLiveData.observeAsState()
-    val account = accountState?.account ?: return
+    val account = remember(accountState) { accountState?.account } ?: return
 
     UserProfileNewThreadFeedFilter.loadUserProfile(account, user)
     UserProfileConversationsFeedFilter.loadUserProfile(account, user)
@@ -139,6 +141,10 @@ fun ProfileScreen(user: User, accountViewModel: AccountViewModel, navController:
 
     val lifeCycleOwner = LocalLifecycleOwner.current
 
+    LaunchedEffect(Unit) {
+        NostrUserProfileDataSource.start()
+    }
+
     DisposableEffect(accountViewModel) {
         val observer = LifecycleEventObserver { _, event ->
             if (event == Lifecycle.Event.ON_RESUME) {
@@ -214,64 +220,14 @@ fun ProfileScreen(user: User, accountViewModel: AccountViewModel, navController:
                         }
                     ) {
                         val tabs = listOf<@Composable() (() -> Unit)?>(
-                            {
-                                Text(text = stringResource(R.string.notes))
-                            },
-                            {
-                                Text(text = stringResource(R.string.replies))
-                            },
-                            {
-                                val userState by baseUser.live().follows.observeAsState()
-                                val userFollows = userState?.user?.transientFollowCount() ?: "--"
-
-                                Text(text = "$userFollows ${stringResource(R.string.follows)}")
-                            },
-                            {
-                                val userState by baseUser.live().follows.observeAsState()
-                                val userFollowers = userState?.user?.transientFollowerCount() ?: "--"
-
-                                Text(text = "$userFollowers ${stringResource(id = R.string.followers)}")
-                            },
-                            {
-                                val userState by baseUser.live().zaps.observeAsState()
-                                val userZaps = userState?.user
-
-                                var zapAmount by remember { mutableStateOf<BigDecimal?>(null) }
-
-                                LaunchedEffect(key1 = userState) {
-                                    withContext(Dispatchers.IO) {
-                                        val tempAmount = userZaps?.zappedAmount()
-                                        withContext(Dispatchers.Main) {
-                                            zapAmount = tempAmount
-                                        }
-                                    }
-                                }
-
-                                Text(text = "${showAmount(zapAmount)} ${stringResource(id = R.string.zaps)}")
-                            },
-                            {
-                                val userState by baseUser.live().bookmarks.observeAsState()
-                                val bookmarkList = userState?.user?.latestBookmarkList
-                                val userBookmarks =
-                                    (bookmarkList?.taggedEvents()?.count() ?: 0) + (bookmarkList?.taggedAddresses()?.count() ?: 0)
-
-                                Text(text = "$userBookmarks ${stringResource(R.string.bookmarks)}")
-                            },
-                            {
-                                val userState by baseUser.live().reports.observeAsState()
-                                val userReports = userState?.user?.reports?.values?.flatten()?.count()
-
-                                Text(text = "$userReports ${stringResource(R.string.reports)}")
-                            },
-                            {
-                                val userState by baseUser.live().relays.observeAsState()
-                                val userRelaysBeingUsed = userState?.user?.relaysBeingUsed?.size ?: "--"
-
-                                val userStateRelayInfo by baseUser.live().relayInfo.observeAsState()
-                                val userRelays = userStateRelayInfo?.user?.latestContactList?.relays()?.size ?: "--"
-
-                                Text(text = "$userRelaysBeingUsed / $userRelays ${stringResource(R.string.relays)}")
-                            }
+                            { Text(text = stringResource(R.string.notes)) },
+                            { Text(text = stringResource(R.string.replies)) },
+                            { FollowTabHeader(baseUser) },
+                            { FollowersTabHeader(baseUser) },
+                            { ZapTabHeader(baseUser) },
+                            { BookmarkTabHeader(baseUser) },
+                            { ReportsTabHeader(baseUser) },
+                            { RelaysTabHeader(baseUser) }
                         )
 
                         tabs.forEachIndexed { index, function ->
@@ -306,6 +262,72 @@ fun ProfileScreen(user: User, accountViewModel: AccountViewModel, navController:
     }
 }
 
+@Composable
+private fun RelaysTabHeader(baseUser: User) {
+    val userState by baseUser.live().relays.observeAsState()
+    val userRelaysBeingUsed = remember(userState) { userState?.user?.relaysBeingUsed?.size ?: "--" }
+
+    val userStateRelayInfo by baseUser.live().relayInfo.observeAsState()
+    val userRelays = remember(userStateRelayInfo) { userStateRelayInfo?.user?.latestContactList?.relays()?.size ?: "--" }
+
+    Text(text = "$userRelaysBeingUsed / $userRelays ${stringResource(R.string.relays)}")
+}
+
+@Composable
+private fun ReportsTabHeader(baseUser: User) {
+    val userState by baseUser.live().reports.observeAsState()
+    val userReports = remember(userState) { userState?.user?.reports?.values?.flatten()?.count() }
+
+    Text(text = "$userReports ${stringResource(R.string.reports)}")
+}
+
+@Composable
+private fun BookmarkTabHeader(baseUser: User) {
+    val userState by baseUser.live().bookmarks.observeAsState()
+    val userBookmarks = remember(userState) {
+        val bookmarkList = userState?.user?.latestBookmarkList
+        (bookmarkList?.taggedEvents()?.count() ?: 0) + (
+            bookmarkList?.taggedAddresses()?.count()
+                ?: 0
+            )
+    }
+
+    Text(text = "$userBookmarks ${stringResource(R.string.bookmarks)}")
+}
+
+@Composable
+private fun ZapTabHeader(baseUser: User) {
+    val userState by baseUser.live().zaps.observeAsState()
+    var zapAmount by remember { mutableStateOf<BigDecimal?>(null) }
+
+    LaunchedEffect(key1 = userState) {
+        withContext(Dispatchers.IO) {
+            val tempAmount = baseUser.zappedAmount()
+            withContext(Dispatchers.Main) {
+                zapAmount = tempAmount
+            }
+        }
+    }
+
+    Text(text = "${showAmount(zapAmount)} ${stringResource(id = R.string.zaps)}")
+}
+
+@Composable
+private fun FollowersTabHeader(baseUser: User) {
+    val userState by baseUser.live().follows.observeAsState()
+    val userFollowers = remember(userState) { userState?.user?.transientFollowerCount() ?: "--" }
+
+    Text(text = "$userFollowers ${stringResource(id = R.string.followers)}")
+}
+
+@Composable
+private fun FollowTabHeader(baseUser: User) {
+    val userState by baseUser.live().follows.observeAsState()
+    val userFollows = remember(userState) { userState?.user?.transientFollowCount() ?: "--" }
+
+    Text(text = "$userFollows ${stringResource(R.string.follows)}")
+}
+
 @Composable
 private fun ProfileHeader(
     baseUser: User,
@@ -316,9 +338,6 @@ private fun ProfileHeader(
     var popupExpanded by remember { mutableStateOf(false) }
     var zoomImageDialogOpen by remember { mutableStateOf(false) }
 
-    val accountUserState by account.userProfile().live().follows.observeAsState()
-    val accountUser = accountUserState?.user ?: return
-
     val coroutineScope = rememberCoroutineScope()
     val clipboardManager = LocalClipboardManager.current
 
@@ -398,23 +417,7 @@ private fun ProfileHeader(
                     // No need for this button anymore
                     // NPubCopyButton(baseUser)
 
-                    if (accountUser == baseUser) {
-                        EditButton(account)
-                    }
-
-                    if (account.isHidden(baseUser)) {
-                        ShowUserButton {
-                            account.showUser(baseUser.pubkeyHex)
-                        }
-                    } else if (accountUser.isFollowingCached(baseUser)) {
-                        UnfollowButton { coroutineScope.launch(Dispatchers.IO) { account.unfollow(baseUser) } }
-                    } else {
-                        if (baseUser.isFollowingCached(accountUser)) {
-                            FollowButton({ coroutineScope.launch(Dispatchers.IO) { account.follow(baseUser) } }, R.string.follow_back)
-                        } else {
-                            FollowButton({ coroutineScope.launch(Dispatchers.IO) { account.follow(baseUser) } }, R.string.follow)
-                        }
-                    }
+                    ProfileActions(baseUser, account, coroutineScope)
                 }
             }
 
@@ -430,37 +433,74 @@ private fun ProfileHeader(
     }
 }
 
-@OptIn(ExperimentalLayoutApi::class)
+@Composable
+private fun ProfileActions(
+    baseUser: User,
+    account: Account,
+    coroutineScope: CoroutineScope
+) {
+    val accountUserState by account.userProfile().live().follows.observeAsState()
+    val accountUser = remember(accountUserState) { accountUserState?.user } ?: return
+
+    if (accountUser == baseUser) {
+        EditButton(account)
+    }
+
+    if (account.isHidden(baseUser)) {
+        ShowUserButton {
+            account.showUser(baseUser.pubkeyHex)
+        }
+    } else if (accountUser.isFollowingCached(baseUser)) {
+        UnfollowButton { coroutineScope.launch(Dispatchers.IO) { account.unfollow(baseUser) } }
+    } else {
+        if (baseUser.isFollowingCached(accountUser)) {
+            FollowButton(
+                { coroutineScope.launch(Dispatchers.IO) { account.follow(baseUser) } },
+                R.string.follow_back
+            )
+        } else {
+            FollowButton(
+                { coroutineScope.launch(Dispatchers.IO) { account.follow(baseUser) } },
+                R.string.follow
+            )
+        }
+    }
+}
+
 @Composable
 private fun DrawAdditionalInfo(baseUser: User, account: Account, accountViewModel: AccountViewModel, navController: NavController) {
     val userState by baseUser.live().metadata.observeAsState()
-    val user = userState?.user ?: return
-
-    val userBadgeState by baseUser.live().badges.observeAsState()
-    val userBadge = userBadgeState?.user ?: return
+    val user = remember(userState) { userState?.user } ?: return
+    val tags = remember(userState) { userState?.user?.info?.latestMetadata?.tags }
 
     val uri = LocalUriHandler.current
     val clipboardManager = LocalClipboardManager.current
     val context = LocalContext.current
     val scope = rememberCoroutineScope()
 
-    Row(verticalAlignment = Alignment.Bottom) {
-        user.bestDisplayName()?.let {
-            Text(
-                it,
-                modifier = Modifier.padding(top = 7.dp),
+    (user.bestDisplayName() ?: user.bestUsername())?.let {
+        Row(verticalAlignment = Alignment.Bottom, modifier = Modifier.padding(top = 7.dp)) {
+            CreateTextWithEmoji(
+                text = it,
+                tags = tags,
                 fontWeight = FontWeight.Bold,
                 fontSize = 25.sp
             )
         }
     }
-    Row(verticalAlignment = Alignment.CenterVertically) {
+
+    if (user.bestDisplayName() != null) {
         user.bestUsername()?.let {
-            Text(
-                "@$it",
-                color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f),
+            Row(
+                verticalAlignment = Alignment.CenterVertically,
                 modifier = Modifier.padding(top = 1.dp, bottom = 1.dp)
-            )
+            ) {
+                CreateTextWithEmoji(
+                    text = "@$it",
+                    tags = tags,
+                    color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                )
+            }
         }
     }
 
@@ -513,23 +553,7 @@ private fun DrawAdditionalInfo(baseUser: User, account: Account, accountViewMode
         }
     }
 
-    userBadge.acceptedBadges?.let { note ->
-        (note.event as? BadgeProfilesEvent)?.let { event ->
-            FlowRow(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.padding(vertical = 5.dp)) {
-                event.badgeAwardEvents().forEach { badgeAwardEvent ->
-                    val baseNote = LocalCache.notes[badgeAwardEvent]
-                    if (baseNote != null) {
-                        val badgeAwardState by baseNote.live().metadata.observeAsState()
-                        val baseBadgeDefinition = badgeAwardState?.note?.replyTo?.firstOrNull()
-
-                        if (baseBadgeDefinition != null) {
-                            BadgeThumb(baseBadgeDefinition, navController, 35.dp)
-                        }
-                    }
-                }
-            }
-        }
-    }
+    DisplayBadges(baseUser, navController)
 
     DisplayNip05ProfileStatus(user)
 
@@ -552,9 +576,58 @@ private fun DrawAdditionalInfo(baseUser: User, account: Account, accountViewMode
         }
     }
 
-    var zapExpanded by remember { mutableStateOf(false) }
+    val lud16 = remember(userState) { user.info?.lud16?.trim() ?: user.info?.lud06?.trim() }
+    val pubkeyHex = remember { baseUser.pubkeyHex }
+    DisplayLNAddress(lud16, pubkeyHex, account, scope, context)
 
-    val lud16 = user.info?.lud16?.trim() ?: user.info?.lud06?.trim()
+    val identities = user.info?.latestMetadata?.identityClaims()
+    if (!identities.isNullOrEmpty()) {
+        identities.forEach { identity: IdentityClaim ->
+            Row(verticalAlignment = Alignment.CenterVertically) {
+                Icon(
+                    tint = Color.Unspecified,
+                    painter = painterResource(id = identity.toIcon()),
+                    contentDescription = stringResource(identity.toDescriptor()),
+                    modifier = Modifier.size(16.dp)
+                )
+
+                ClickableText(
+                    text = AnnotatedString(identity.identity),
+                    onClick = { runCatching { uri.openUri(identity.toProofUrl()) } },
+                    style = LocalTextStyle.current.copy(color = MaterialTheme.colors.primary),
+                    modifier = Modifier
+                        .padding(top = 1.dp, bottom = 1.dp, start = 5.dp)
+                        .weight(1f)
+                )
+            }
+        }
+    }
+
+    user.info?.about?.let {
+        Row(
+            modifier = Modifier.padding(top = 5.dp, bottom = 5.dp)
+        ) {
+            TranslatableRichTextViewer(
+                content = it,
+                canPreview = false,
+                tags = null,
+                backgroundColor = MaterialTheme.colors.background,
+                accountViewModel = accountViewModel,
+                navController = navController
+            )
+        }
+    }
+}
+
+@Composable
+private fun DisplayLNAddress(
+    lud16: String?,
+    userHex: String,
+    account: Account,
+    scope: CoroutineScope,
+    context: Context
+) {
+    var zapExpanded by remember { mutableStateOf(false) }
 
     if (!lud16.isNullOrEmpty()) {
         Row(verticalAlignment = Alignment.CenterVertically) {
@@ -576,10 +649,13 @@ private fun DrawAdditionalInfo(baseUser: User, account: Account, accountViewMode
         }
 
         if (zapExpanded) {
-            Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.padding(vertical = 5.dp)) {
+            Row(
+                verticalAlignment = Alignment.CenterVertically,
+                modifier = Modifier.padding(vertical = 5.dp)
+            ) {
                 InvoiceRequest(
                     lud16,
-                    baseUser.pubkeyHex,
+                    userHex,
                     account,
                     onSuccess = {
                         // pay directly
@@ -619,44 +695,34 @@ private fun DrawAdditionalInfo(baseUser: User, account: Account, accountViewMode
             }
         }
     }
+}
 
-    val identities = user.info?.latestMetadata?.identityClaims()
-    if (!identities.isNullOrEmpty()) {
-        identities.forEach { identity: IdentityClaim ->
-            Row(verticalAlignment = Alignment.CenterVertically) {
-                Icon(
-                    tint = Color.Unspecified,
-                    painter = painterResource(id = identity.toIcon()),
-                    contentDescription = stringResource(identity.toDescriptor()),
-                    modifier = Modifier.size(16.dp)
-                )
+@Composable
+@OptIn(ExperimentalLayoutApi::class)
+private fun DisplayBadges(
+    baseUser: User,
+    navController: NavController
+) {
+    val userBadgeState by baseUser.live().badges.observeAsState()
+    val userBadge = remember(userBadgeState) { userBadgeState?.user } ?: return
 
-                ClickableText(
-                    text = AnnotatedString(identity.identity),
-                    onClick = { runCatching { uri.openUri(identity.toProofUrl()) } },
-                    style = LocalTextStyle.current.copy(color = MaterialTheme.colors.primary),
-                    modifier = Modifier
-                        .padding(top = 1.dp, bottom = 1.dp, start = 5.dp)
-                        .weight(1f)
-                )
+    userBadge.acceptedBadges?.let { note ->
+        (note.event as? BadgeProfilesEvent)?.let { event ->
+            FlowRow(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.padding(vertical = 5.dp)) {
+                event.badgeAwardEvents().forEach { badgeAwardEvent ->
+                    val baseNote = LocalCache.notes[badgeAwardEvent]
+                    if (baseNote != null) {
+                        val badgeAwardState by baseNote.live().metadata.observeAsState()
+                        val baseBadgeDefinition = badgeAwardState?.note?.replyTo?.firstOrNull()
+
+                        if (baseBadgeDefinition != null) {
+                            BadgeThumb(baseBadgeDefinition, navController, 35.dp)
+                        }
+                    }
+                }
             }
         }
     }
-
-    user.info?.about?.let {
-        Row(
-            modifier = Modifier.padding(top = 5.dp, bottom = 5.dp)
-        ) {
-            TranslatableRichTextViewer(
-                content = it,
-                canPreview = false,
-                tags = null,
-                backgroundColor = MaterialTheme.colors.background,
-                accountViewModel = accountViewModel,
-                navController = navController
-            )
-        }
-    }
 }
 
 @Composable
@@ -727,9 +793,8 @@ fun BadgeThumb(
 @Composable
 private fun DrawBanner(baseUser: User) {
     val userState by baseUser.live().metadata.observeAsState()
-    val user = userState?.user ?: return
+    val banner = remember(userState) { userState?.user?.info?.banner }
 
-    val banner = user.info?.banner
     val clipboardManager = LocalClipboardManager.current
     var zoomImageDialogOpen by remember { mutableStateOf(false) }
 
@@ -767,61 +832,51 @@ private fun DrawBanner(baseUser: User) {
 
 @Composable
 fun TabNotesNewThreads(accountViewModel: AccountViewModel, navController: NavController) {
-    val accountState by accountViewModel.accountLiveData.observeAsState()
-    if (accountState != null) {
-        val feedViewModel: NostrUserProfileNewThreadsFeedViewModel = viewModel()
+    val feedViewModel: NostrUserProfileNewThreadsFeedViewModel = viewModel()
 
-        LaunchedEffect(Unit) {
-            feedViewModel.invalidateData()
-        }
+    LaunchedEffect(Unit) {
+        feedViewModel.invalidateData()
+    }
 
-        Column(Modifier.fillMaxHeight()) {
-            Column(
-                modifier = Modifier.padding(vertical = 0.dp)
-            ) {
-                FeedView(feedViewModel, accountViewModel, navController, null, enablePullRefresh = false)
-            }
+    Column(Modifier.fillMaxHeight()) {
+        Column(
+            modifier = Modifier.padding(vertical = 0.dp)
+        ) {
+            FeedView(feedViewModel, accountViewModel, navController, null, enablePullRefresh = false)
         }
     }
 }
 
 @Composable
 fun TabNotesConversations(accountViewModel: AccountViewModel, navController: NavController) {
-    val accountState by accountViewModel.accountLiveData.observeAsState()
-    if (accountState != null) {
-        val feedViewModel: NostrUserProfileConversationsFeedViewModel = viewModel()
+    val feedViewModel: NostrUserProfileConversationsFeedViewModel = viewModel()
 
-        LaunchedEffect(Unit) {
-            feedViewModel.invalidateData()
-        }
+    LaunchedEffect(Unit) {
+        feedViewModel.invalidateData()
+    }
 
-        Column(Modifier.fillMaxHeight()) {
-            Column(
-                modifier = Modifier.padding(vertical = 0.dp)
-            ) {
-                FeedView(feedViewModel, accountViewModel, navController, null, enablePullRefresh = false)
-            }
+    Column(Modifier.fillMaxHeight()) {
+        Column(
+            modifier = Modifier.padding(vertical = 0.dp)
+        ) {
+            FeedView(feedViewModel, accountViewModel, navController, null, enablePullRefresh = false)
         }
     }
 }
 
 @Composable
 fun TabBookmarks(baseUser: User, accountViewModel: AccountViewModel, navController: NavController) {
-    val accountState by accountViewModel.accountLiveData.observeAsState()
-    val userState by baseUser.live().bookmarks.observeAsState()
-    if (accountState != null) {
-        val feedViewModel: NostrUserProfileBookmarksFeedViewModel = viewModel()
+    val feedViewModel: NostrUserProfileBookmarksFeedViewModel = viewModel()
 
-        LaunchedEffect(userState) {
-            feedViewModel.invalidateData()
-        }
+    LaunchedEffect(Unit) {
+        feedViewModel.invalidateData()
+    }
 
-        Column(Modifier.fillMaxHeight()) {
-            Column(
-                modifier = Modifier.padding(vertical = 0.dp)
-            ) {
-                FeedView(feedViewModel, accountViewModel, navController, null, enablePullRefresh = false)
-            }
+    Column(Modifier.fillMaxHeight()) {
+        Column(
+            modifier = Modifier.padding(vertical = 0.dp)
+        ) {
+            FeedView(feedViewModel, accountViewModel, navController, null, enablePullRefresh = false)
         }
     }
 }
@@ -937,41 +992,6 @@ fun TabRelays(user: User, accountViewModel: AccountViewModel) {
     }
 }
 
-@Composable
-private fun NPubCopyButton(
-    user: User
-) {
-    val clipboardManager = LocalClipboardManager.current
-    var popupExpanded by remember { mutableStateOf(false) }
-
-    Button(
-        modifier = Modifier
-            .padding(horizontal = 3.dp)
-            .width(50.dp),
-        onClick = { popupExpanded = true },
-        shape = RoundedCornerShape(20.dp),
-        colors = ButtonDefaults
-            .buttonColors(
-                backgroundColor = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
-            )
-    ) {
-        Icon(
-            tint = Color.White,
-            imageVector = Icons.Default.Share,
-            contentDescription = stringResource(R.string.copies_the_public_key_to_the_clipboard_for_sharing)
-        )
-
-        DropdownMenu(
-            expanded = popupExpanded,
-            onDismissRequest = { popupExpanded = false }
-        ) {
-            DropdownMenuItem(onClick = { clipboardManager.setText(AnnotatedString(user.pubkeyNpub())); popupExpanded = false }) {
-                Text(stringResource(R.string.copy_public_key_npub_to_the_clipboard))
-            }
-        }
-    }
-}
-
 @Composable
 private fun MessageButton(user: User, navController: NavController) {
     Button(

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

@@ -131,6 +131,8 @@ fun SearchScreen(
 }
 
 class SearchBarViewModel : ViewModel() {
+    var account: Account? = null
+
     var searchValue by mutableStateOf("")
     val searchResults = mutableStateOf<List<User>>(emptyList())
     val searchResultsNotes = mutableStateOf<List<Note>>(emptyList())
@@ -156,8 +158,8 @@ class SearchBarViewModel : ViewModel() {
         }
 
         hashtagResults.value = findHashtags(searchValue)
-        searchResults.value = LocalCache.findUsersStartingWith(searchValue)
-        searchResultsNotes.value = LocalCache.findNotesStartingWith(searchValue).sortedBy { it.createdAt() }.reversed()
+        searchResults.value = LocalCache.findUsersStartingWith(searchValue).sortedWith(compareBy({ account?.isFollowing(it) }, { it.toBestDisplayName() })).reversed()
+        searchResultsNotes.value = LocalCache.findNotesStartingWith(searchValue).sortedWith(compareBy({ it.createdAt() }, { it.idHex })).reversed()
         searchResultsChannels.value = LocalCache.findChannelsStartingWith(searchValue)
     }
 
@@ -185,25 +187,24 @@ class SearchBarViewModel : ViewModel() {
 @Composable
 private fun SearchBar(accountViewModel: AccountViewModel, navController: NavController) {
     val searchBarViewModel: SearchBarViewModel = viewModel()
+    searchBarViewModel.account = accountViewModel.accountLiveData.value?.account
 
     val scope = rememberCoroutineScope()
     val listState = rememberLazyListState()
 
     val onlineSearch = NostrSearchEventOrUserDataSource
 
-    val dbState = LocalCache.live.observeAsState()
-    val db = dbState.value ?: return
-
     // Create a channel for processing search queries.
     val searchTextChanges = remember {
         CoroutineChannel<String>(CoroutineChannel.CONFLATED)
     }
 
-    LaunchedEffect(db) {
-        withContext(Dispatchers.IO) {
-            if (searchBarViewModel.isSearching()) {
-                println("Search Active")
-                searchBarViewModel.invalidateData()
+    LaunchedEffect(Unit) {
+        scope.launch(Dispatchers.IO) {
+            LocalCache.live.newEventBundles.collect {
+                if (searchBarViewModel.isSearching()) {
+                    searchBarViewModel.invalidateData()
+                }
             }
         }
     }
@@ -337,7 +338,7 @@ private fun SearchBar(accountViewModel: AccountViewModel, navController: NavCont
     }
 }
 
-val hashtagSearch = Pattern.compile("(?:\\s|\\A)#([A-Za-z0-9_\\-]+)")
+val hashtagSearch = Pattern.compile("(?:\\s|\\A)#([^\\s!@#\$%^&*()=+./,\\[{\\]};:'\"?><]+)")
 
 fun findHashtags(content: String): List<String> {
     val matcher = hashtagSearch.matcher(content)

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

@@ -275,7 +275,7 @@ private fun RenderVideoOrPictureNote(
                             Icon(
                                 imageVector = Icons.Default.MoreVert,
                                 null,
-                                modifier = Modifier.size(15.dp),
+                                modifier = Modifier.size(20.dp),
                                 tint = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
                             )
 

app/src/main/res/values-hu/strings.xml

@@ -333,11 +333,45 @@
 
     <string name="upload_server_relays_nip95">Saját csomópontjaid (NIP-95)</string>
     <string name="upload_server_relays_nip95_explainer">A fájlokat a csomópontokra töltik fel és ott tárolják. Rögzített URL-től mentesek (harmadik féltől való függőség). Győződj meg róla, hogy legalább egy NIP-95 csomópont a csomópontlistában szerepel</string>
-    
-    
-    
+
+
+
     <string name="follow_list_selection">Követek Lista</string>
     <string name="follow_list_kind3follows">Mindenki akit követek</string>
     <string name="follow_list_global">Globális</string>
+    <string name="connect_through_your_orbot_setup_markdown">
+        ## Kapcsolódj a TOR-on keresztül az Orbot segítségével
+        \n\n1. Telepítsd az [Orbot-ot](https://play.google.com/store/apps/details?id=org.torproject.android)
+        \n2. Indítsd el az Orbot-ot
+        \n3. Az Orbot-ban ellenőrizd a Socks portokat. Az alapbeállítás 9050
+        \n4. Ha szükséges az Orbot-ban változtasd meg a portot
+        \n5. Ezen a felületen állítsd be a Socks portot
+        \n6. Kattíts az Aktiválás gombra, hogy az Orbot-ot átjátszóként használd
+    </string>
+    <string name="orbot_socks_port">Orbot Socks portja</string>
+    <string name="invalid_port_number">Érvénytelen Port szám</string>
+    <string name="use_orbot">Használd az Orbot-ot</string>
+    <string name="disconnect_from_your_orbot_setup">TOR/Orbot Lekapcsolása</string>
 
+    <string name="app_notification_channel_id" translatable="false">DefaultChannelID</string>
+    <string name="app_notification_private_message" translatable="false">New notification arrived</string>
+
+    <string name="app_notification_dms_channel_id" translatable="false">PrivateMessagesID</string>
+    <string name="app_notification_dms_channel_name">Privát üzenetek</string>
+    <string name="app_notification_dms_channel_description">Értesítést küld, amikor privát üzeneted érkezik</string>
+
+    <string name="app_notification_zaps_channel_id" translatable="false">ZapsID</string>
+    <string name="app_notification_zaps_channel_name">Zap-et kaptál</string>
+    <string name="app_notification_zaps_channel_description">Értesítést küld, amikor valaki neked Zap-et küldött</string>
+    <string name="app_notification_zaps_channel_message">%1$s sats</string>
+    <string name="app_notification_zaps_channel_message_from">%1$s -tól</string>
+    <string name="app_notification_zaps_channel_message_for">%1$s -ért</string>
+
+    <string name="reply_notify">Értesítés: </string>
+
+    <string name="channel_list_join_conversation">Csatlakozz a beszélgetéshez</string>
+    <string name="channel_list_user_or_group_id">Felhasználó vagy Csoport azonosító</string>
+    <string name="channel_list_user_or_group_id_demo">npub, nevent vagy hex</string>
+    <string name="channel_list_create_channel">Létrehoz</string>
+    <string name="channel_list_join_channel">Csatlakozás</string>
 </resources>

app/src/main/res/values-sv

@@ -0,0 +1,408 @@
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <string name="app_name_release" translatable="false">Amethyst</string>
+    <string name="app_name_debug" translatable="false">Amethyst Debug</string>
+    <string name="point_to_the_qr_code">Point to the QR Code</string>
+    <string name="show_qr">Visa QR</string>
+    <string name="profile_image">Profilbild</string>
+    <string name="scan_qr">Scanna QR</string>
+    <string name=”show_anyway">Visa ändå</string>
+    <string name="post_was_flagged_as_inappropriate_by">Inlägget flaggades som olämpligt av</string>
+    <string name=”post_not_found">Inlägg hittades inte</string>
+    <string name=”channel_image">Kanal bild</string>
+    <string name="referenced_event_not_found">Refererad händelse hittades inte</string>
+    <string name="could_not_decrypt_the_message">Kunde inte dekryptera meddelandet</string>
+    <string name=”group_picture">Grupp bild</string>
+    <string name="explicit_content">Explicit Innehåll</string>
+    <string name="spam">Spam</string>
+    <string name="impersonation">Imitation</string>
+    <string name="illegal_behavior">Olagligt beteende</string>
+    <string name="unknown">Okänd</string>
+    <string name=”relay_icon">Relä ikon</string>
+    <string name="unknown_author">Okänd användare</string>
+    <string name=”copy_text">Kopiera Text</string>
+    <string name=”copy_user_pubkey">Kopiera användarens ID</string>
+    <string name=”copy_note_id">Kopiera anteckningens ID</string>
+    <string name=”broadcast">Sänd ut</string>
+    <string name="request_deletion">Begär radering</string>
+    <string name=”block_hide_user"><![CDATA[Blockera och göm användare]]></string>
+    <string name="report_spam_scam">Rapportera Spam / Scam</string>
+    <string name="report_impersonation">Rapportera identitetsstöld</string>
+    <string name="report_explicit_content">Rapportera explicit innehåll</string>
+    <string name="report_illegal_behaviour">Rapportera olagligt beteende</string>
+    <string name="login_with_a_private_key_to_be_able_to_reply">Logga in med en privat nyckel för att kunna svara</string>
+    <string name="login_with_a_private_key_to_be_able_to_boost_posts">Logga in med en privat nyckel för att kunna boosta inlägg</string>
+    <string name="login_with_a_private_key_to_like_posts">Logga in med en privat nyckel för att gilla inlägg</string>
+    <string name="no_zap_amount_setup_long_press_to_change">Ingen konfiguration av Zap-belopp. Tryck länge för att ändra</string>
+    <string name="login_with_a_private_key_to_be_able_to_send_zaps">Logga in med en privat nyckel för att kunna skicka Zaps</string>
+    <string name="zaps">Zaps</string>
+    <string name="view_count">Antal visningar</string>
+    <string name="boost">Boost</string>
+    <string name="boosted">boosted</string>
+    <string name="quote">Citera</string>
+    <string name="new_amount_in_sats">Nytt belopp i Sats</string>
+    <string name=”add">Lägg till</string>
+    <string name=”replying_to">"Svarar till "</string>
+    <string name="and">" och "</string>
+    <string name="in_channel">"i kanalen "</string>
+    <string name="profile_banner">Profil Banner</string>
+    <string name="following">" Följer"</string>
+    <string name="followers">" Följare"</string>
+    <string name="profile">Profil</string>
+    <string name="security_filters">Säkerhets Filter</string>
+    <string name=”log_out">Logga ut</string>
+    <string name=”show_more">Visa mer</string>
+    <string name="lightning_invoice">Lightning Faktura</string>
+    <string name="pay">Betala</string>
+    <string name="lightning_tips">Lightning Dricks</string>
+    <string name="note_to_receiver">Notering till mottagaren</string>
+    <string name=”thank_you_so_much">Tack så mycket!</string>
+    <string name="amount_in_sats">Summa i Sats</string>
+    <string name="send_sats">Skicka Sats</string>
+    <string name="error_parsing_preview_for">"Fel vid analys av förhandsvisning för %1$s : %2$s"</string>
+    <string name="preview_card_image_for">"Förhandsgranska kortbild för %1$s"</string>
+    <string name=”new_channel">Ny kanal</string>
+    <string name=”channel_name">Kanal Namn</string>
+    <string name="my_awesome_group">Min fantastiska grupp</string>
+    <string name="picture_url">Bild Url</string>
+    <string name="description">Beskrivning</string>
+    <string name=”about_us">"Om oss.. "</string>
+    <string name=”what_s_on_your_mind">Vad tänker du på?</string>
+    <string name="post">Dela</string>
+    <string name="save">Spara</string>
+    <string name="create">Skapa</string>
+    <string name="cancel">Avbryt</string>
+    <string name="failed_to_upload_the_image">Det gick inte att ladda upp bilden</string>
+    <string name="relay_address">Relä Adress</string>
+    <string name="posts">Inlägg</string>
+    <string name="bytes">Bytes</string>
+    <string name="errors">Errors</string>
+    <string name=”home_feed">Hem Flöde</string>
+    <string name=”private_message_feed">Privata Meddelande Flöde</string>
+    <string name="public_chat_feed">Publik Chat Flöde</string>
+    <string name="global_feed">Globalt Flöde</string>
+    <string name="search_feed">Sök i Flödet</string>
+    <string name=”add_a_relay">Lägg till Relä</string>
+    <string name="display_name">Visningsnamn</string>
+    <string name=”my_display_name">Mitt visningsnamn</string>
+    <string name="username">Användarnamn</string>
+    <string name=”my_username">Mitt användarnamn</string>
+    <string name=”about_me">Om mig</string>
+    <string name="avatar_url">Avatar URL</string>
+    <string name="banner_url">Banner URL</string>
+    <string name="website_url">Websida URL</string>
+    <string name="ln_address">LN Adress</string>
+    <string name="ln_url_outdated">LN URL (Utdaterad)</string>
+    <string name=”image_saved_to_the_gallery">Bild sparad till galleriet</string>
+    <string name=”failed_to_save_the_image">Misslyckades att spara bilden</string>
+    <string name=”upload_image">Ladda upp bilden</string>
+    <string name=”uploading">Laddar upp…</string>
+    <string name="user_does_not_have_a_lightning_address_setup_to_receive_sats">Användaren har inte en Lightningadressinställning för att ta emot sats</string>
+    <string name=”reply_here">"svara här.. "</string>
+    <string name="copies_the_note_id_to_the_clipboard_for_sharing">Kopierar antecknings-ID till urklipp för delning</string>
+    <string name="copy_channel_id_note_to_the_clipboard">Kopiera kanal-ID (anteckningen) till Urklipp</string>
+    <string name="edits_the_channel_metadata">Redigerar kanalmetadata</string>
+    <string name=”join">Gå med</string>
+    <string name="known">Känd</string>
+    <string name="new_requests">Nya förfrågningar</string>
+    <string name="blocked_users">Blockerade användare</string>
+    <string name="new_threads">Nya trådar</string>
+    <string name="conversations">konversationer</string>
+    <string name="notes">Anteckningar</string>
+    <string name="replies">Svar</string>
+    <string name="follows">"Följer"</string>
+    <string name="reports">"Rapporter"</string>
+    <string name="more_options">Fler alternativ</string>
+    <string name="relays">" Reläer"</string>
+    <string name="website">Websida</string>
+    <string name="lightning_address">Lightning Adress</string>
+    <string name="copies_the_nsec_id_your_password_to_the_clipboard_for_backup">Kopierar Nsec ID (ditt lösenord) till urklipp för säkerhetskopiering</string>
+    <string name="copy_private_key_to_the_clipboard">Kopiera hemlig nyckel till urklipp</string>
+    <string name="copies_the_public_key_to_the_clipboard_for_sharing">Kopierar den publika nyckeln till urklipp för delning</string>
+    <string name="copy_public_key_npub_to_the_clipboard">Kopiera Public Key (NPub) till Urklipp</string>
+    <string name=”send_a_direct_message">Skicka ett direkt meddelande</string>
+    <string name="edits_the_user_s_metadata">Redigerar användarens metadata</string>
+    <string name="follow">Följ</string>
+    <string name=”follow_back">Följ tillbaka</string>
+    <string name=”unblock”>Sluta blockera</string>
+    <string name="copy_user_id">Kopiera Användarens ID</string>
+    <string name=”unblock_user”>Sluta blockera Användare</string>
+    <string name="npub_hex_username">"npub, hex, användarnamn "</string>
+    <string name="clear">Rensa</string>
+    <string name="app_logo">App Logo</string>
+    <string name="nsec_npub_hex_private_key">nsec / npub / hex privat nyckel</string>
+    <string name=”show_password">Visa lösenord</string>
+    <string name=”hide_password">Göm lösenord</string>
+    <string name="invalid_key">Ogiltig nyckel</string>
+    <string name=”i_accept_the">"Jag accepterar  "</string>
+    <string name="terms_of_use">villkor</string>
+    <string name="acceptance_of_terms_is_required">Godkännande av villkor krävs</string>
+    <string name="key_is_required">Nyckel krävs</string>
+    <string name=”login">Inloggning</string>
+    <string name="generate_a_new_key">Skapa en ny nyckel</string>
+    <string name=”loading_feed">Ladda flöde</string>
+    <string name="error_loading_replies">"Det gick inte att läsa in svar: "</string>
+    <string name=”try_again">Försök igen</string>
+    <string name=”feed_is_empty">Flöde är tomt.</string>
+    <string name="refresh">Uppdatera</string>
+    <string name="created">Skapad</string>
+    <string name="with_description_of">med beskrivning av</string>
+    <string name=”and_picture">och bild</string>
+    <string name="changed_chat_name_to">ändra chat namn till</string>
+    <string name="description_to">beskrivning till</string>
+    <string name="and_picture_to">och bild till</string>
+    <string name="leave">Lämna</string>
+    <string name=”unfollow">Sluta följa</string>
+    <string name=”channel_created">Kanal skapad</string>
+    <string name="channel_information_changed_to">"Kanalinformation ändrad till"</string>
+    <string name="public_chat">Publik Chat</string>
+    <string name="posts_received">mottagna inlägg</string>
+    <string name=”remove">Ta bort</string>
+    <string name="sats" translatable="false">sats</string>
+    <string name="translations_auto">Auto</string>
+    <string name=”translations_translated_from">översatt från</string>
+    <string name="translations_to">till</string>
+    <string name=”translations_show_in_lang_first">Visa i %1$s first</string>
+    <string name=”translations_always_translate_to_lang">Översätt alltid till %1$s</string>
+    <string name=”translations_never_translate_from_lang">Översätt aldrig från %1$s</string>
+    <string name="nip_05" translatable="false">NIP-05</string>
+    <string name="lnurl" translatable="false">LNURL...</string>
+    <string name="never">aldrig</string>
+    <string name="now">nu</string>
+    <string name="h">h</string>
+    <string name="m">m</string>
+    <string name="d">d</string>
+    <string name="nudity">Naket</string>
+    <string name="profanity_hateful_speech">Svordomar / Hatiskt tal</string>
+    <string name="report_hateful_speech">Anmäl hattal</string>
+    <string name="report_nudity_porn">Rapportera nakenhet/porr</string>
+    <string name="others">andras</string>
+    <string name="mark_all_known_as_read">Markera alla kända som lästa</string>
+    <string name="mark_all_new_as_read">Markera alla nya som lästa</string>
+    <string name="mark_all_as_read">Markera allt som läst</string>
+    <string name="backup_keys">Backup-nycklar</string>
+    <string name="account_backup_tips_md" tools:ignore="Typos">
+        ## Nyckelsäkerhetskopiering och säkerhetstips
+        \n\nDitt konto är skyddat av en hemlig nyckel. Nyckeln är en lång slumpmässig sträng som börjar med **nsec1**. Alla som har tillgång till din hemliga nyckel kan publicera innehåll med din identitet.
+        \n\n- Lägg **inte** in din hemliga nyckel på någon webbplats eller programvara som du inte litar på.
+        \n- Amethyst-utvecklare kommer **aldrig** att be dig om din hemliga nyckel.
+        \n- **Behåll en säker säkerhetskopia av din hemliga nyckel för kontoåterställning. Vi rekommenderar att du använder en lösenordshanterare.    </string>
+    <string name="secret_key_copied_to_clipboard">Hemlig nyckel (nsec) kopierad till urklipp</string>
+    <string name="copy_my_secret_key">Kopiera min hemliga nyckel</string>
+    <string name="biometric_authentication_failed">Autentisering misslyckades</string>
+    <string name="biometric_error">Error</string>
+    <string name=”badge_created_by">"Skapad av %1$s"</string>
+    <string name=”badge_award_image_for”>"Tilldelad Badge för %1$s"</string>
+    <string name=”new_badge_award_notif">Du har blivit tilldelad en ny Badge </string>
+    <string name="award_granted_to">Badge utmärkelse tilldelas</string>
+    <string name="copied_note_text_to_clipboard">Kopierade anteckningstext till urklipp</string>
+    <string name="copied_user_id_to_clipboard" tools:ignore="Typos">Kopierade författarens @npub till urklipp</string>
+    <string name="copied_note_id_to_clipboard" tools:ignore="Typos">Kopierade antecknings-ID (@note1) till urklipp</string>
+    <string name="select_text_dialog_top">Välj Text</string>
+    <string name="github" translatable="false">Github Gist med bevis</string>
+    <string name="telegram" translatable="false">Telegram</string>
+    <string name="mastodon" translatable="false">Mastodon antecknings ID med bevis</string>
+    <string name="twitter" translatable="false">Twitter Status med bevis</string>
+    <string name="github_proof_url_template" translatable="false">https://gist.github.com/&lt;user&gt;/&lt;gist&gt;</string>
+    <string name="telegram_proof_url_template" translatable="false">https://t.me/&lt;proof post&gt;</string>
+    <string name="mastodon_proof_url_template" translatable="false">https://&lt;server&gt;/&lt;user&gt;/&lt;proof post&gt;</string>
+    <string name="twitter_proof_url_template" translatable="false">https://twitter.com/&lt;user&gt;/status/&lt;proof post&gt;</string>
+    <string name="private_conversation_notification">"&lt;Kan inte dekryptera privat meddelande&gt;\n\nDu citerades i en privat/krypterad konversation mellan %1$s och %2$s."</string>
+    <string name=”account_switch_add_account_dialog_title">Lägg till nytt konto</string>
+    <string name="drawer_accounts">Konton</string>
+    <string name=”account_switch_select_account">Välj konto</string>
+    <string name=”account_switch_add_account_btn">Lägg till nytt konto</string>
+    <string name=”account_switch_active_account">Aktivt konto</string>
+    <string name=”account_switch_has_private_key">Har privat nyckel</string>
+    <string name=”account_switch_pubkey_only">Läs bara, ingen privat nyckel</string>
+    <string name="back">Back</string>
+    <string name="quick_action_select">Välj</string>
+    <string name="quick_action_share_browser_link">Dela webbläsarlänk</string>
+    <string name="quick_action_share">Dela</string>
+    <string name="quick_action_copy_user_id">Användar ID</string>
+    <string name="quick_action_copy_note_id">Antecknings ID</string>
+    <string name="quick_action_copy_text">Kopiera Text</string>
+    <string name="quick_action_delete">Radera</string>
+    <string name=”quick_action_unfollow">Sluta följa</string>
+    <string name="quick_action_follow">Följ</string>
+    <string name="quick_action_request_deletion_alert_title">Begär radering</string>
+    <string name="quick_action_request_deletion_alert_body">Amethyst kommer att begära att din anteckning tas bort från de reläer du för närvarande är ansluten till. Det finns ingen garanti för att din anteckning kommer att raderas permanent från dessa reläer eller från andra reläer där den kan lagras.</string>
+    <string name="quick_action_block_dialog_btn">Blockera</string>
+    <string name="quick_action_delete_dialog_btn">Radera</string>
+    <string name="quick_action_block">Blockera</string>
+    <string name="quick_action_report">Rapportera</string>
+    <string name="quick_action_delete_button">Radera</string>
+    <string name=”quick_action_dont_show_again_button”>Visa inte igen</string>
+    <string name="report_dialog_spam">Spam eller scams</string>
+    <string name="report_dialog_profanity">Svordomar eller hatiskt beteende</string>
+    <string name="report_dialog_impersonation">Skadlig identitetsstöld</string>
+    <string name="report_dialog_nudity">Nakenhet eller grafiskt innehåll</string>
+    <string name="report_dialog_illegal">Olagligt beteende</string>
+    <string name="report_dialog_blocking_a_user">Blockering av en användare kommer att dölja deras innehåll i din app. Dina anteckningar är fortfarande offentliga, inklusive för personer du blockerar. Blockerade användare listas på skärmen Säkerhetsfilter.</string>
+    <string name="report_dialog_block_hide_user_btn"><![CDATA[Blockera & Göm användare]]></string>
+    <string name="report_dialog_report_btn">Rapportera missbruk</string>
+    <string name="report_dialog_reminder_public">Alla rapporter som publiceras kommer att vara offentliga.</string>
+    <string name="report_dialog_additional_reason_placeholder">Ge eventuellt ytterligare sammanhang om din rapport...</string>
+    <string name="report_dialog_additional_reason_label">Ytterligare sammanhang</string>
+    <string name="report_dialog_select_reason_label">Anledning</string>
+    <string name=”report_dialog_select_reason_placeholder">Välj anledning…</string>
+    <string name=”report_dialog_post_report_btn">Skicka rapport</string>
+    <string name=”report_dialog_title">Blockera och rapportera</string>
+    <string name="block_only">Blockera</string>
+
+    <string name="bookmarks">Bokmärken</string>
+    <string name=”private_bookmarks">Privata Bokmärken</string>
+    <string name="public_bookmarks">Publika Bokmärken</string>
+    <string name="add_to_private_bookmarks">Lägg till i Privata Bokmärken</string>
+    <string name=”add_to_public_bookmarks">Lägg till i Publika Bokmärken</string>
+    <string name="remove_from_private_bookmarks">Ta bort från Privata Bokmärken</string>
+    <string name="remove_from_public_bookmarks">Ta bort från Publika Bokmärken</string>
+
+    <string name="wallet_connect_service">Wallet Connect Service</string>
+    <string name="wallet_connect_service_explainer">Tillåter en Nostr Secret att betala zaps utan att lämna appen. Håll hemligheten säker och använd ett privat relä om möjligt</string>
+    <string name="wallet_connect_service_pubkey">Wallet Connect Pubkey</string>
+    <string name="wallet_connect_service_relay">Wallet Connect Relay</string>
+    <string name="wallet_connect_service_secret">Wallet Connect Secret</string>
+    <string name="wallet_connect_service_show_secret">Visa secret key</string>
+    <string name="wallet_connect_service_secret_placeholder">nsec / hex privat nyckel</string>
+
+    <string name="pledge_amount_in_sats">Pantbelopp i Sats</string>
+    <string name="post_poll">Dela Poll</string>
+    <string name="poll_heading_required">Obligatoriska fält:</string>
+    <string name="poll_zap_recipients">Zap mottagare</string>
+    <string name="poll_primary_description">Beskrivning av primär omröstning…</string>
+    <string name="poll_option_index">Alternativ %s</string>
+    <string name="poll_option_description">Beskrivning av omröstningsalternativ</string>
+    <string name="poll_heading_optional">Valfria fält:</string>
+    <string name=”poll_zap_value_min">Minsta Zap</string>
+    <string name=”poll_zap_value_max”>Maximal Zap</string>
+    <string name="poll_consensus_threshold">Konsensus</string>
+    <string name="poll_consensus_threshold_percent">(0–100)%</string>
+    <string name=”poll_closing_time">Avsluta efter</string>
+    <string name="poll_closing_time_days">dagar</string>
+    <string name="poll_is_closed">Omröstningen är stängd för nya röster</string>
+    <string name="poll_zap_amount">Zap belopp</string>
+    <string name="one_vote_per_user_on_atomic_votes">Endast en röst per användare tillåts i denna typ av omröstning</string>
+
+    <string name=”looking_for_event">"Letar efter Event %1$s"</string>
+
+    <string name="custom_zaps_add_a_message">Lägg till ett offentligt meddelande</string>
+    <string name="custom_zaps_add_a_message_private">Lägg till ett privat meddelande</string>
+    <string name="custom_zaps_add_a_message_nonzap">Lägg till ett fakturameddelande</string>
+
+    <string name="custom_zaps_add_a_message_example">Tack för allt ditt arbete!</string>
+
+    <string name="lightning_create_and_add_invoice">Skapa och lägg till</string>
+    <string name="poll_author_no_vote">Omröstningsskapare kan inte rösta i sina egna omröstningar.</string>
+    <string name="poll_hashtag" translatable="false">#zappoll</string>
+
+    <string name="hash_verification_passed">Bilden är densamma sedan inlägget</string>
+    <string name="hash_verification_failed">Bilden har ändrats. Användaren kanske inte har sett förändringen</string>
+
+    <string name=”content_description_add_image">Lägg till Bild</string>
+    <string name=”content_description_add_video">Lägg till Video</string>
+    <string name=”content_description_add_document">Lägg till Dokument</string>
+
+    <string name=”add_content">Lägg till Meddelande</string>
+    <string name="content_description">Beskrivning av innehållet</string>
+    <string name="content_description_example">En blå båt på en vit sandstrand vid solnedgången</string>
+
+    <string name="zap_type">Zap Typ</string>
+    <string name="zap_type_explainer">Zap Typ för alla alternativ</string>
+
+    <string name="zap_type_public">Publik</string>
+    <string name="zap_type_public_explainer">Alla kan se transaktionen och meddelandet</string>
+
+    <string name="zap_type_private">Privat</string>
+    <string name="zap_type_private_explainer">Avsändare och mottagare kan se varandra och läsa meddelandet</string>
+
+    <string name="zap_type_anonymous">Anonym</string>
+    <string name="zap_type_anonymous_explainer">Mottagaren och allmänheten vet inte vem som skickade betalningen</string>
+
+    <string name=”zap_type_nonzap">Ingen Zap</string>
+    <string name="zap_type_nonzap_explainer">Inga spår i Nostr, bara i Lightning</string>
+
+
+    <string name="file_server">Fil Server</string>
+    <string name="zap_forward_lnAddress">LnAdress or @Användare</string>
+
+    <string name="upload_server_imgur">imgur.com - betrodd</string>
+    <string name="upload_server_imgur_explainer">Imgur kan ändra filen</string>
+
+    <string name="upload_server_nostrimg">nostrimg.com - betrodd</string>
+    <string name=”upload_server_nostrimg_explainer">NostrImg kan ändra filen</string>
+
+    <string name="upload_server_nostrbuild">nostr.build - betrodd</string>
+    <string name="upload_server_nostrbuild_explainer">Nostr.build kan ändra filen</string>
+
+    <string name="upload_server_nostrfilesdev">nostrfiles.dev - betrodd</string>
+    <string name="upload_server_nostrfilesdev_explainer">Nostrfiles.dev kan ändra filen</string>
+
+
+    <string name="upload_server_imgur_nip94">Verifierbar Imgur (NIP-94)</string>
+    <string name="upload_server_imgur_nip94_explainer">Kontrollerar om Imgur modifierat filen. Nytt NIP: andra klienter kanske inte ser det</string>
+
+    <string name="upload_server_nostrimg_nip94">Verifierbar NostrImg (NIP-94)</string>
+    <string name="upload_server_nostrimg_nip94_explainer">Kontrollerar om NostrImg modifierat filen. Nytt NIP: andra klienter kanske inte ser det</string>
+
+    <string name="upload_server_nostrbuild_nip94">Verifierbar Nostr.build (NIP-94)</string>
+    <string name="upload_server_nostrbuild_nip94_explainer">Kontrollerar om Nostr.build modifierat filen. Nytt NIP: andra klienter kanske inte ser det</string>
+
+    <string name="upload_server_nostrfilesdev_nip94">Verifierbar Nostrfiles.dev (NIP-94)</string>
+    <string name="upload_server_nostrfilesdev_nip94_explainer">Kontrollerar om Nostrfiles.dev modifierat filen. Nytt NIP: andra klienter kanske inte ser det</string>
+
+
+    <string name=”upload_server_relays_nip95">Dina Reläer (NIP-95)</string>
+    <string name="upload_server_relays_nip95_explainer">Filer är värd för dina reläer. Nytt NIP: kontrollera om de stöder</string>
+
+    <string name="connect_via_tor_short">Tor/Orbot Inställningar</string>
+    <string name="connect_via_tor">Anslut via dina Orbot-inställiningar</string>
+
+    <string name="do_you_really_want_to_disable_tor_title">Koppla från Orbot/Tor?</string>
+    <string name="do_you_really_want_to_disable_tor_text">Dina data kommer omedelbart att överföras till det vanliga nätverket</string>
+    <string name="yes">Ja</string>
+    <string name="no">Nej</string>
+
+
+    <string name="follow_list_selection">Följ lista</string>
+    <string name="follow_list_kind3follows">Alla följare</string>
+    <string name="follow_list_global">Global</string>
+    <string name="connect_through_your_orbot_setup_markdown">
+        ## Anslut genom Tor med Orbot
+        \n\n1. Installera [Orbot](https://play.google.com/store/apps/details?id=org.torproject.android)
+        \n2. Starta Orbot
+        \n3. Kontrollera Socks-porten i Orbot. Standarden använder 9050
+        \n4. Ändra vid behov porten i Orbot
+        \n5. Konfigurera Socks-porten på den här skärmen
+        \n6. Tryck på knappen Aktivera för att använda Orbot som proxy</string>
+    <string name="orbot_socks_port">Orbot Socks Port</string>
+    <string name="invalid_port_number">Ogiltigt portnummer</string>
+    <string name="use_orbot">Använd Orbot</string>
+    <string name=”disconnect_from_your_orbot_setup">Koppla ifrån Tor/Orbot</string>
+
+    <string name="app_notification_channel_id" translatable="false">Standardkanal-ID</string>
+    <string name="app_notification_private_message" translatable=”false">Ny notifikation har kommit</string>
+
+    <string name="app_notification_dms_channel_id" translatable="false">PrivataMeddelandID</string>
+    <string name="app_notification_dms_channel_name">Privata Meddelade</string>
+    <string name="app_notification_dms_channel_description">Meddelar dig när ett privat meddelande kommer</string>
+
+    <string name="app_notification_zaps_channel_id" translatable="false">ZapsID</string>
+    <string name="app_notification_zaps_channel_name">Zaps Mottaget</string>
+    <string name="app_notification_zaps_channel_description">Meddela dig när någon zappar dig</string>
+    <string name="app_notification_zaps_channel_message">%1$s sats</string>
+    <string name="app_notification_zaps_channel_message_from">Från %1$s</string>
+    <string name="app_notification_zaps_channel_message_for">till %1$s</string>
+
+    <string name="reply_notify">Meddela: </string>
+
+    <string name="channel_list_join_conversation">Gå med i konversation</string>
+    <string name="channel_list_user_or_group_id">Användare eller grupp ID</string>
+    <string name="channel_list_user_or_group_id_demo">npub, nevent or hex</string>
+    <string name="channel_list_create_channel">Skapa</string>
+    <string name=”channel_list_join_channel">Gå med</string>
+</resources>
+
+
+
+
+

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

@@ -394,4 +394,12 @@
     <string name="app_notification_zaps_channel_message">%1$s sats</string>
     <string name="app_notification_zaps_channel_message_from">From %1$s</string>
     <string name="app_notification_zaps_channel_message_for">for %1$s</string>
+
+    <string name="reply_notify">Notify: </string>
+
+    <string name="channel_list_join_conversation">Join Conversation</string>
+    <string name="channel_list_user_or_group_id">User or Group\'s ID</string>
+    <string name="channel_list_user_or_group_id_demo">npub, nevent or hex</string>
+    <string name="channel_list_create_channel">Create</string>
+    <string name="channel_list_join_channel">Join</string>
 </resources>

app/src/play/java/com/vitorpamplona/amethyst/ui/components/TranslatableRichTextViewer.kt

@@ -14,6 +14,7 @@ import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Check
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.livedata.observeAsState
 import androidx.compose.runtime.mutableStateOf
@@ -48,7 +49,7 @@ fun TranslatableRichTextViewer(
     accountViewModel: AccountViewModel,
     navController: NavController
 ) {
-    val translatedTextState = remember {
+    var translatedTextState by remember {
         mutableStateOf(ResultOrError(content, null, null, null))
     }
 
@@ -56,7 +57,7 @@ fun TranslatableRichTextViewer(
     var langSettingsPopupExpanded by remember { mutableStateOf(false) }
 
     val accountState by accountViewModel.accountLanguagesLiveData.observeAsState()
-    val account = accountState?.account ?: return
+    val account = remember(accountState) { accountState?.account } ?: return
 
     val scope = rememberCoroutineScope()
 
@@ -72,13 +73,17 @@ fun TranslatableRichTextViewer(
                         val preference = account.preferenceBetween(task.result.sourceLang!!, task.result.targetLang!!)
                         showOriginal = preference == task.result.sourceLang
                     }
-                    translatedTextState.value = task.result
+                    translatedTextState = task.result
                 }
             }
         }
     }
 
-    val toBeViewed = if (showOriginal) content else translatedTextState.value.result ?: content
+    val toBeViewed by remember {
+        derivedStateOf {
+            if (showOriginal) content else translatedTextState.result ?: content
+        }
+    }
 
     Column() {
         ExpandableRichTextViewer(
@@ -91,8 +96,8 @@ fun TranslatableRichTextViewer(
             navController
         )
 
-        val target = translatedTextState.value.targetLang
-        val source = translatedTextState.value.sourceLang
+        val target = translatedTextState.targetLang
+        val source = translatedTextState.sourceLang
 
         if (source != null && target != null) {
             if (source != target) {

app/src/test/java/com/vitorpamplona/amethyst/service/Nip30Test.kt

@@ -0,0 +1,58 @@
+package com.vitorpamplona.amethyst.service
+
+import junit.framework.TestCase.assertEquals
+import org.junit.Test
+
+class Nip30Test {
+    @Test()
+    fun parseEmoji() {
+        val input = "Alex Gleason :soapbox:"
+
+        assertEquals(
+            listOf("Alex Gleason ", ":soapbox:", ""),
+            NIP30Parser().buildArray(input)
+        )
+    }
+
+    @Test()
+    fun parseEmojiInverted() {
+        val input = ":soapbox:Alex Gleason"
+
+        assertEquals(
+            listOf("", ":soapbox:", "Alex Gleason"),
+            NIP30Parser().buildArray(input)
+        )
+    }
+
+    @Test()
+    fun parseEmoji2() {
+        val input = "Hello :gleasonator: \uD83D\uDE02 :ablobcatrainbow: :disputed: yolo"
+
+        assertEquals(
+            listOf("Hello ", ":gleasonator:", " 😂 ", ":ablobcatrainbow:", " ", ":disputed:", " yolo"),
+            NIP30Parser().buildArray(input)
+        )
+
+        println(NIP30Parser().buildArray(input).joinToString(","))
+    }
+
+    @Test()
+    fun parseEmoji3() {
+        val input = "hello vitor: how can I help:"
+
+        assertEquals(
+            listOf("hello vitor: how can I help:"),
+            NIP30Parser().buildArray(input)
+        )
+    }
+
+    @Test()
+    fun parseJapanese() {
+        val input = "\uD883\uDEDE\uD883\uDEDE麺の:x30EDE:。:\uD883\uDEDE:(Violation of NIP-30)"
+
+        assertEquals(
+            listOf("\uD883\uDEDE\uD883\uDEDE麺の", ":x30EDE:", "。:\uD883\uDEDE:(Violation of NIP-30)"),
+            NIP30Parser().buildArray(input)
+        )
+    }
+}

fastlane/metadata/android/fr-FR/full_description.txt

@@ -0,0 +1 @@
+<p><i>Amethyst</i> apporte le meilleur réseau social sur votre téléphone Android. Insérez simplement votre clé privée Nostr et commencez à poster.</p><p><a href='https://github.com/nostr-protocol/nostr' target='_blank' rel='nofollow noopener'>Nostr</a> est un protocole ouvert qui permet de créer un réseau "social" mondial résistant à la censure, en transférant des notes et d'autres éléments à l'aide de relais. Il ne repose pas sur un serveur central de confiance, ce qui le rend résistant; il est basé sur des clés et des signatures cryptographiques, ce qui le rend inviolable; il ne repose pas sur des techniques P2P, ce qui le rend efficace.

fastlane/metadata/android/fr-FR/short_description.txt

@@ -0,0 +1 @@
+Nostr Client pour Android