v0.64.3

Added #Cashu

.github/workflows/create-release.yml

@@ -47,7 +47,7 @@ jobs:
           keyPassword: ${{ secrets.KEY_PASSWORD }}
 
       - name: Build APK
-        run: ./gradlew assembleRelease --stacktrace --no-daemon
+        run: ./gradlew assembleRelease --stacktrace
 
       - name: Sign APK (Google Play)
         uses: r0adkll/sign-android-release@v1

README.md

@@ -4,6 +4,11 @@
 
 Amethyst brings the best social network to your Android phone. Just insert your Nostr private key and start posting. 
 
+[<img src="./docs/design/obtainium.png"
+alt="Get it on Obtaininum"
+height="80">](https://github.com/ImranR98/Obtainium)
+[<img src="https://github.com/machiav3lli/oandbackupx/raw/034b226cea5c1b30eb4f6a6f313e4dadcbb0ece4/badge_github.png" alt="Get it on GitHub"
+height="80">](https://github.com/vitorpamplona/amethyst/releases)
 [<img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png"
      alt="Get it on F-Droid"
      height="80">](https://f-droid.org/packages/com.vitorpamplona.amethyst/)
@@ -11,15 +16,15 @@ Amethyst brings the best social network to your Android phone. Just insert your
      alt="Get it on Google Play"
      height="80">](https://play.google.com/store/apps/details?id=com.vitorpamplona.amethyst)
 
-Or get the latest APK from the [Releases Section](https://github.com/vitorpamplona/amethyst/releases/latest).
-
 # Current Features
 
 - [x] Event Builders / WebSocket Subscriptions (NIP-01)
 - [x] Home Feed
 - [x] Notifications Feed
 - [x] Global Feed
-- [x] Reactions (likes NIP-25, boost, reply)
+- [x] Replies and mentions (NIP-10)
+- [x] Reactions (NIP-25)
+- [x] Reposts (NIP-18)
 - [x] Image/Video/Url/LnInvoice Previews
 - [x] View Threads
 - [x] Private Messages (NIP-04)
@@ -56,6 +61,7 @@ Or get the latest APK from the [Releases Section](https://github.com/vitorpamplo
 - [x] Relay Authentication (NIP-42)
 - [x] Content stored in relays themselves (NIP-95)
 - [x] Custom Emoji (NIP-30)
+- [x] Zap Forwarding (NIP-57)
 - [x] Text Note References (NIP-27)
 - [x] Audio Tracks (zapstr.live) (NIP-TBD)
 - [x] Push Notifications (Zaps and Messages)
@@ -64,11 +70,15 @@ Or get the latest APK from the [Releases Section](https://github.com/vitorpamplo
 - [x] View Individual Reactions (Like, Boost, Zaps, Reports) per Post
 - [x] Recommended Application Handlers (NIP-89)
 - [x] Events with a Subject (NIP-14)
+- [x] Generic Reposts (kind:16)
+- [x] Live Activities & Live Chats (NIP-102)
+- [x] Relay Pages (NIP-11)
+- [x] HTTP Auth (NIP-98)
+- [x] Zapraiser (NIP-TBD)
 - [ ] Marketplace (NIP-15)
 - [ ] Image/Video Capture in the app
 - [ ] Local Database
 - [ ] Bookmarks, Pinned Posts, Muted Events (NIP-51)
-- [ ] Relay Pages (NIP-11)
 - [ ] Proof of Work in the Phone (NIP-13, NIP-20)
 - [ ] Workspaces
 - [ ] Expiration Support (NIP-40)
@@ -184,6 +194,12 @@ Information that you share is publicly visible to anyone reading from relays tha
 ## Information Permanence ##
 Information shared on nostr should be assumed permanent for privacy purposes. There is no way to guarantee deleting or editing any content once posted. 
 
+# Screenshots
+
+| Home Feed                                 | Messages                                     | Live Streams                                    | Notifications                                          |
+|-------------------------------------------|----------------------------------------------|-------------------------------------------------|--------------------------------------------------------|
+| ![Home Feed](./docs/screenshots/home.png) | ![Messages](./docs/screenshots/messages.png) | ![Live Streams](./docs/screenshots/replies.png) | ![Notifications](./docs/screenshots/notifications.png) |
+
 # Contributing
 
 [Issues](https://github.com/vitorpamplona/amethyst/issues) and [pull requests](https://github.com/vitorpamplona/amethyst/pulls) are very welcome.

app/build.gradle

@@ -13,8 +13,8 @@ android {
         applicationId "com.vitorpamplona.amethyst"
         minSdk 26
         targetSdk 33
-        versionCode 210
-        versionName "0.58.3"
+        versionCode 234
+        versionName "0.64.3"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {
@@ -181,7 +181,7 @@ dependencies {
     playImplementation 'com.google.mlkit:translate:17.0.1'
 
     // PushNotifications
-    playImplementation platform('com.google.firebase:firebase-bom:32.1.0')
+    playImplementation platform('com.google.firebase:firebase-bom:32.1.1')
     playImplementation 'com.google.firebase:firebase-messaging-ktx'
 
     // Charts

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

@@ -64,6 +64,7 @@ private object PrefKeys {
     const val SHOW_SENSITIVE_CONTENT = "show_sensitive_content"
     const val WARN_ABOUT_REPORTS = "warn_about_reports"
     const val FILTER_SPAM_FROM_STRANGERS = "filter_spam_from_strangers"
+    const val LAST_READ_PER_ROUTE = "last_read_route_per_route"
     val LAST_READ: (String) -> String = { route -> "last_read_route_$route" }
 }
 
@@ -223,6 +224,7 @@ object LocalPreferences {
             putInt(PrefKeys.PROXY_PORT, account.proxyPort)
             putBoolean(PrefKeys.WARN_ABOUT_REPORTS, account.warnAboutPostsWithReports)
             putBoolean(PrefKeys.FILTER_SPAM_FROM_STRANGERS, account.filterSpamFromStrangers)
+            putString(PrefKeys.LAST_READ_PER_ROUTE, gson.toJson(account.lastReadPerRoute))
 
             if (account.showSensitiveContent == null) {
                 remove(PrefKeys.SHOW_SENSITIVE_CONTENT)
@@ -320,6 +322,18 @@ object LocalPreferences {
             val filterSpam = getBoolean(PrefKeys.FILTER_SPAM_FROM_STRANGERS, true)
             val warnAboutReports = getBoolean(PrefKeys.WARN_ABOUT_REPORTS, true)
 
+            val lastReadPerRoute = try {
+                getString(PrefKeys.LAST_READ_PER_ROUTE, null)?.let {
+                    gson.fromJson(
+                        it,
+                        object : TypeToken<Map<String, Long>>() {}.type
+                    ) as Map<String, Long>
+                } ?: mapOf()
+            } catch (e: Throwable) {
+                e.printStackTrace()
+                mapOf()
+            }
+
             val a = Account(
                 loggedIn = Persona(privKey = privKey?.hexToByteArray(), pubKey = pubKey.hexToByteArray()),
                 followingChannels = followingChannels,
@@ -343,25 +357,14 @@ object LocalPreferences {
                 proxyPort = proxyPort,
                 showSensitiveContent = showSensitiveContent,
                 warnAboutPostsWithReports = warnAboutReports,
-                filterSpamFromStrangers = filterSpam
+                filterSpamFromStrangers = filterSpam,
+                lastReadPerRoute = lastReadPerRoute
             )
 
             return a
         }
     }
 
-    fun saveLastRead(route: String, timestampInSecs: Long) {
-        encryptedPreferences(currentAccount()).edit().apply {
-            putLong(PrefKeys.LAST_READ(route), timestampInSecs)
-        }.apply()
-    }
-
-    fun loadLastRead(route: String): Long {
-        encryptedPreferences(currentAccount()).run {
-            return getLong(PrefKeys.LAST_READ(route), 0)
-        }
-    }
-
     fun migrateSingleUserPrefs() {
         if (currentAccount() != null) return
 

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

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

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

@@ -14,7 +14,6 @@ import com.vitorpamplona.amethyst.service.HttpClient
 import com.vitorpamplona.amethyst.service.NostrAccountDataSource
 import com.vitorpamplona.amethyst.service.NostrChannelDataSource
 import com.vitorpamplona.amethyst.service.NostrChatroomListDataSource
-import com.vitorpamplona.amethyst.service.NostrGlobalDataSource
 import com.vitorpamplona.amethyst.service.NostrHomeDataSource
 import com.vitorpamplona.amethyst.service.NostrSingleChannelDataSource
 import com.vitorpamplona.amethyst.service.NostrSingleEventDataSource
@@ -23,6 +22,7 @@ import com.vitorpamplona.amethyst.service.NostrThreadDataSource
 import com.vitorpamplona.amethyst.service.NostrUserProfileDataSource
 import com.vitorpamplona.amethyst.service.NostrVideoDataSource
 import com.vitorpamplona.amethyst.service.relays.Client
+import com.vitorpamplona.amethyst.ui.actions.ImageUploader
 
 object ServiceManager {
     private var account: Account? = null
@@ -66,6 +66,7 @@ object ServiceManager {
             NostrHomeDataSource.account = myAccount
             NostrChatroomListDataSource.account = myAccount
             NostrVideoDataSource.account = myAccount
+            ImageUploader.account = myAccount
 
             // Notification Elements
             NostrHomeDataSource.start()
@@ -87,7 +88,6 @@ object ServiceManager {
         NostrChannelDataSource.stop()
         NostrChatroomListDataSource.stop()
 
-        NostrGlobalDataSource.stop()
         NostrSingleChannelDataSource.stop()
         NostrSingleEventDataSource.stop()
         NostrSingleUserDataSource.stop()

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

@@ -70,13 +70,15 @@ class Account(
     var proxyPort: Int,
     var showSensitiveContent: Boolean? = null,
     var warnAboutPostsWithReports: Boolean = true,
-    var filterSpamFromStrangers: Boolean = true
+    var filterSpamFromStrangers: Boolean = true,
+    var lastReadPerRoute: Map<String, Long> = mapOf<String, Long>()
 ) {
     var transientHiddenUsers: Set<String> = setOf()
 
     // Observers line up here.
     val live: AccountLiveData = AccountLiveData(this)
     val liveLanguages: AccountLiveData = AccountLiveData(this)
+    val liveLastRead: AccountLiveData = AccountLiveData(this)
     val saveable: AccountLiveData = AccountLiveData(this)
 
     var userProfileCache: User? = null
@@ -101,7 +103,7 @@ class Account(
     }
 
     fun followingChannels(): List<Channel> {
-        return followingChannels.map { LocalCache.getOrCreateChannel(it) }
+        return followingChannels.mapNotNull { LocalCache.checkGetOrCreateChannel(it) }
     }
 
     fun isWriteable(): Boolean {
@@ -320,6 +322,12 @@ class Account(
         }
     }
 
+    fun createHTTPAuthorization(url: String, method: String, body: String? = null): HTTPAuthorizationEvent? {
+        if (!isWriteable()) return null
+
+        return HTTPAuthorizationEvent.create(url, method, body, loggedIn.privKey!!)
+    }
+
     fun boost(note: Note) {
         if (!isWriteable()) return
 
@@ -329,9 +337,15 @@ class Account(
         }
 
         note.event?.let {
-            val event = RepostEvent.create(it, loggedIn.privKey!!)
-            Client.send(event)
-            LocalCache.consume(event)
+            if (it.kind() == 1) {
+                val event = RepostEvent.create(it, loggedIn.privKey!!)
+                Client.send(event)
+                LocalCache.consume(event)
+            } else {
+                val event = GenericRepostEvent.create(it, loggedIn.privKey!!)
+                Client.send(event)
+                LocalCache.consume(event)
+            }
         }
     }
 
@@ -499,6 +513,7 @@ class Account(
         tags: List<String>? = null,
         zapReceiver: String? = null,
         wantsToMarkAsSensitive: Boolean,
+        zapRaiserAmount: Long? = null,
         replyingTo: String?,
         root: String?,
         directMentions: Set<HexKey>
@@ -517,6 +532,7 @@ class Account(
             extraTags = tags,
             zapReceiver = zapReceiver,
             markAsSensitive = wantsToMarkAsSensitive,
+            zapRaiserAmount = zapRaiserAmount,
             replyingTo = replyingTo,
             root = root,
             directMentions = directMentions,
@@ -537,7 +553,8 @@ class Account(
         consensusThreshold: Int?,
         closedAt: Int?,
         zapReceiver: String? = null,
-        wantsToMarkAsSensitive: Boolean
+        wantsToMarkAsSensitive: Boolean,
+        zapRaiserAmount: Long? = null
     ) {
         if (!isWriteable()) return
 
@@ -557,14 +574,15 @@ class Account(
             consensusThreshold = consensusThreshold,
             closedAt = closedAt,
             zapReceiver = zapReceiver,
-            markAsSensitive = wantsToMarkAsSensitive
+            markAsSensitive = wantsToMarkAsSensitive,
+            zapRaiserAmount = zapRaiserAmount
         )
         // println("Sending new PollNoteEvent: %s".format(signedEvent.toJson()))
         Client.send(signedEvent)
         LocalCache.consume(signedEvent)
     }
 
-    fun sendChannelMessage(message: String, toChannel: String, replyTo: List<Note>?, mentions: List<User>?, zapReceiver: String? = null, wantsToMarkAsSensitive: Boolean) {
+    fun sendChannelMessage(message: String, toChannel: String, replyTo: List<Note>?, mentions: List<User>?, zapReceiver: String? = null, wantsToMarkAsSensitive: Boolean, zapRaiserAmount: Long? = null) {
         if (!isWriteable()) return
 
         // val repliesToHex = listOfNotNull(replyingTo?.idHex).ifEmpty { null }
@@ -578,13 +596,35 @@ class Account(
             mentions = mentionsHex,
             zapReceiver = zapReceiver,
             markAsSensitive = wantsToMarkAsSensitive,
+            zapRaiserAmount = zapRaiserAmount,
             privateKey = loggedIn.privKey!!
         )
         Client.send(signedEvent)
         LocalCache.consume(signedEvent, null)
     }
 
-    fun sendPrivateMessage(message: String, toUser: User, replyingTo: Note? = null, mentions: List<User>?, zapReceiver: String? = null, wantsToMarkAsSensitive: Boolean) {
+    fun sendLiveMessage(message: String, toChannel: ATag, replyTo: List<Note>?, mentions: List<User>?, zapReceiver: String? = null, wantsToMarkAsSensitive: Boolean, zapRaiserAmount: Long? = null) {
+        if (!isWriteable()) return
+
+        // val repliesToHex = listOfNotNull(replyingTo?.idHex).ifEmpty { null }
+        val repliesToHex = replyTo?.map { it.idHex }
+        val mentionsHex = mentions?.map { it.pubkeyHex }
+
+        val signedEvent = LiveActivitiesChatMessageEvent.create(
+            message = message,
+            activity = toChannel,
+            replyTos = repliesToHex,
+            mentions = mentionsHex,
+            zapReceiver = zapReceiver,
+            markAsSensitive = wantsToMarkAsSensitive,
+            zapRaiserAmount = zapRaiserAmount,
+            privateKey = loggedIn.privKey!!
+        )
+        Client.send(signedEvent)
+        LocalCache.consume(signedEvent, null)
+    }
+
+    fun sendPrivateMessage(message: String, toUser: User, replyingTo: Note? = null, mentions: List<User>?, zapReceiver: String? = null, wantsToMarkAsSensitive: Boolean, zapRaiserAmount: Long? = null) {
         if (!isWriteable()) return
 
         val repliesToHex = listOfNotNull(replyingTo?.idHex).ifEmpty { null }
@@ -598,6 +638,7 @@ class Account(
             mentions = mentionsHex,
             zapReceiver = zapReceiver,
             markAsSensitive = wantsToMarkAsSensitive,
+            zapRaiserAmount = zapRaiserAmount,
             privateKey = loggedIn.privKey!!,
             advertiseNip18 = false
         )
@@ -1093,7 +1134,7 @@ class Account(
             user.countReportAuthorsBy(followingKeySet()) < 5
     }
 
-    fun isAcceptableDirect(note: Note): Boolean {
+    private fun isAcceptableDirect(note: Note): Boolean {
         if (!warnAboutPostsWithReports) {
             return note.reportsBy(userProfile()).isEmpty()
         }
@@ -1109,7 +1150,7 @@ class Account(
         return note.author?.let { isAcceptable(it) } ?: true && // if user hasn't hided this author
             isAcceptableDirect(note) &&
             (
-                note.event !is RepostEvent ||
+                (note.event !is RepostEvent && note.event !is GenericRepostEvent) ||
                     (note.replyTo?.firstOrNull { isAcceptableDirect(it) } != null)
                 ) // is not a reaction about a blocked post
     }
@@ -1117,7 +1158,7 @@ class Account(
     fun getRelevantReports(note: Note): Set<Note> {
         val followsPlusMe = userProfile().latestContactList?.verifiedFollowKeySetAndMe ?: emptySet()
 
-        val innerReports = if (note.event is RepostEvent) {
+        val innerReports = if (note.event is RepostEvent || note.event is GenericRepostEvent) {
             note.replyTo?.map { getRelevantReports(it) }?.flatten() ?: emptyList()
         } else {
             emptyList()
@@ -1154,6 +1195,19 @@ class Account(
         live.invalidateData()
     }
 
+    fun markAsRead(route: String, timestampInSecs: Long) {
+        val lastTime = lastReadPerRoute[route]
+        if (lastTime == null || timestampInSecs > lastTime) {
+            lastReadPerRoute = lastReadPerRoute + Pair(route, timestampInSecs)
+            saveable.invalidateData()
+            liveLastRead.invalidateData()
+        }
+    }
+
+    fun loadLastRead(route: String): Long {
+        return lastReadPerRoute[route] ?: 0
+    }
+
     fun registerObservers() {
         // Observes relays to restart connections
         userProfile().live().relays.observeForever {
@@ -1174,8 +1228,7 @@ class Account(
             GlobalScope.launch(Dispatchers.IO) {
                 it.cache.spamMessages.snapshot().values.forEach {
                     if (it.pubkeyHex !in transientHiddenUsers && it.duplicatedMessages.size >= 5) {
-                        val userToBlock = LocalCache.getOrCreateUser(it.pubkeyHex)
-                        if (userToBlock != userProfile() && userToBlock.pubkeyHex !in followingKeySet()) {
+                        if (it.pubkeyHex != userProfile().pubkeyHex && it.pubkeyHex !in followingKeySet()) {
                             transientHiddenUsers = transientHiddenUsers + it.pubkeyHex
                             live.invalidateData()
                         }
@@ -1186,6 +1239,7 @@ class Account(
     }
 
     init {
+        Log.d("Init", "Account")
         backupContactList?.let {
             println("Loading saved contacts ${it.toJson()}")
             if (userProfile().latestContactList == null) {

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

@@ -2,6 +2,7 @@ package com.vitorpamplona.amethyst.model
 
 import android.util.Log
 import android.util.LruCache
+import androidx.compose.runtime.Stable
 import androidx.lifecycle.LiveData
 import com.vitorpamplona.amethyst.OptOutFromFilters
 import com.vitorpamplona.amethyst.service.checkNotInMainThread
@@ -17,7 +18,6 @@ class AntiSpamFilter {
     val recentMessages = LruCache<Int, String>(1000)
     val spamMessages = LruCache<Int, Spammer>(1000)
 
-    @Synchronized
     fun isSpam(event: Event, relay: Relay?): Boolean {
         checkNotInMainThread()
 
@@ -44,15 +44,9 @@ class AntiSpamFilter {
             Log.w("Potential SPAM Message", "${event.id} ${recentMessages[hash]} ${spamMessages[hash] != null} ${relay?.url} ${event.content.replace("\n", " | ")}")
 
             // Log down offenders
-            if (spamMessages.get(hash) == null) {
-                spamMessages.put(hash, Spammer(event.pubKey, setOf(recentMessages[hash], event.id)))
-                liveSpam.invalidateData()
-            } else {
-                val spammer = spamMessages.get(hash)
-                spammer.duplicatedMessages = spammer.duplicatedMessages + event.id
+            logOffender(hash, event)
 
-                liveSpam.invalidateData()
-            }
+            liveSpam.invalidateData()
 
             return true
         }
@@ -62,9 +56,20 @@ class AntiSpamFilter {
         return false
     }
 
+    @Synchronized
+    private fun logOffender(hashCode: Int, event: Event) {
+        if (spamMessages.get(hashCode) == null) {
+            spamMessages.put(hashCode, Spammer(event.pubKey, setOf(recentMessages[hashCode], event.id)))
+        } else {
+            val spammer = spamMessages.get(hashCode)
+            spammer.duplicatedMessages = spammer.duplicatedMessages + event.id
+        }
+    }
+
     val liveSpam: AntiSpamLiveData = AntiSpamLiveData(this)
 }
 
+@Stable
 class AntiSpamLiveData(val cache: AntiSpamFilter) : LiveData<AntiSpamState>(AntiSpamState(cache)) {
 
     // Refreshes observers in batches.

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

@@ -3,7 +3,9 @@ package com.vitorpamplona.amethyst.model
 import androidx.compose.runtime.Stable
 import androidx.lifecycle.LiveData
 import com.vitorpamplona.amethyst.service.NostrSingleChannelDataSource
+import com.vitorpamplona.amethyst.service.model.ATag
 import com.vitorpamplona.amethyst.service.model.ChannelCreateEvent
+import com.vitorpamplona.amethyst.service.model.LiveActivitiesEvent
 import com.vitorpamplona.amethyst.ui.components.BundledUpdate
 import com.vitorpamplona.amethyst.ui.note.toShortenHex
 import fr.acinq.secp256k1.Hex
@@ -11,20 +13,96 @@ import kotlinx.coroutines.Dispatchers
 import java.util.concurrent.ConcurrentHashMap
 
 @Stable
-class Channel(val idHex: String) {
-    var creator: User? = null
+class PublicChatChannel(idHex: String) : Channel(idHex) {
     var info = ChannelCreateEvent.ChannelData(null, null, null)
 
+    fun updateChannelInfo(creator: User, channelInfo: ChannelCreateEvent.ChannelData, updatedAt: Long) {
+        this.creator = creator
+        this.info = channelInfo
+        this.updatedMetadataAt = updatedAt
+
+        live.invalidateData()
+    }
+
+    override fun toBestDisplayName(): String {
+        return info.name ?: super.toBestDisplayName()
+    }
+
+    override fun summary(): String? {
+        return info.about
+    }
+
+    override fun profilePicture(): String? {
+        if (info.picture.isNullOrBlank()) return super.profilePicture()
+        return info.picture ?: super.profilePicture()
+    }
+
+    override fun anyNameStartsWith(prefix: String): Boolean {
+        return listOfNotNull(info.name, info.about)
+            .filter { it.contains(prefix, true) }.isNotEmpty()
+    }
+}
+
+@Stable
+class LiveActivitiesChannel(val address: ATag) : Channel(address.toTag()) {
+    var info: LiveActivitiesEvent? = null
+
+    override fun idNote() = address.toNAddr()
+    override fun idDisplayNote() = idNote().toShortenHex()
+    fun address() = address
+
+    fun updateChannelInfo(creator: User, channelInfo: LiveActivitiesEvent, updatedAt: Long) {
+        this.info = channelInfo
+        super.updateChannelInfo(creator, updatedAt)
+    }
+
+    override fun toBestDisplayName(): String {
+        return info?.title() ?: super.toBestDisplayName()
+    }
+
+    override fun summary(): String? {
+        return info?.summary()
+    }
+
+    override fun profilePicture(): String? {
+        return info?.image()?.ifBlank { null }
+    }
+
+    override fun anyNameStartsWith(prefix: String): Boolean {
+        return listOfNotNull(info?.title(), info?.summary())
+            .filter { it.contains(prefix, true) }.isNotEmpty()
+    }
+}
+
+@Stable
+abstract class Channel(val idHex: String) {
+    var creator: User? = null
+
     var updatedMetadataAt: Long = 0
 
     val notes = ConcurrentHashMap<HexKey, Note>()
 
-    fun id() = Hex.decode(idHex)
-    fun idNote() = id().toNote()
-    fun idDisplayNote() = idNote().toShortenHex()
+    open fun id() = Hex.decode(idHex)
+    open fun idNote() = id().toNote()
+    open fun idDisplayNote() = idNote().toShortenHex()
 
-    fun toBestDisplayName(): String {
-        return info.name ?: idDisplayNote()
+    open fun toBestDisplayName(): String {
+        return idDisplayNote()
+    }
+
+    open fun summary(): String? {
+        return null
+    }
+
+    open fun profilePicture(): String? {
+        return creator?.profilePicture()
+    }
+
+    open fun updateChannelInfo(creator: User, updatedAt: Long) {
+        this.creator = creator
+        this.updatedMetadataAt = updatedAt
+
+        live.invalidateData()
     }
 
     fun addNote(note: Note) {
@@ -39,23 +117,7 @@ class Channel(val idHex: String) {
         notes.remove(noteHex)
     }
 
-    fun updateChannelInfo(creator: User, channelInfo: ChannelCreateEvent.ChannelData, updatedAt: Long) {
-        this.creator = creator
-        this.info = channelInfo
-        this.updatedMetadataAt = updatedAt
-
-        live.invalidateData()
-    }
-
-    fun profilePicture(): String? {
-        if (info.picture.isNullOrBlank()) info.picture = null
-        return info.picture
-    }
-
-    fun anyNameStartsWith(prefix: String): Boolean {
-        return listOfNotNull(info.name, info.about)
-            .filter { it.startsWith(prefix, true) }.isNotEmpty()
-    }
+    abstract fun anyNameStartsWith(prefix: String): Boolean
 
     // Observers line up here.
     val live: ChannelLiveData = ChannelLiveData(this)
@@ -92,12 +154,20 @@ class ChannelLiveData(val channel: Channel) : LiveData<ChannelState>(ChannelStat
 
     override fun onActive() {
         super.onActive()
-        NostrSingleChannelDataSource.add(channel.idHex)
+        if (channel is PublicChatChannel) {
+            NostrSingleChannelDataSource.add(channel.idHex)
+        } else {
+            NostrSingleChannelDataSource.add(channel.idHex)
+        }
     }
 
     override fun onInactive() {
         super.onInactive()
-        NostrSingleChannelDataSource.remove(channel.idHex)
+        if (channel is PublicChatChannel) {
+            NostrSingleChannelDataSource.remove(channel.idHex)
+        } else {
+            NostrSingleChannelDataSource.remove(channel.idHex)
+        }
     }
 }
 

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

@@ -1,26 +1,31 @@
 package com.vitorpamplona.amethyst.model
 import androidx.compose.foundation.layout.padding
+import androidx.compose.runtime.Immutable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
 import com.vitorpamplona.amethyst.R
-fun checkForHashtagWithIcon(tag: String): HashtagIcon? {
+fun checkForHashtagWithIcon(tag: String, primary: Color): HashtagIcon? {
     return when (tag.lowercase()) {
-        "bitcoin", "btc", "timechain" -> HashtagIcon(R.drawable.ht_btc, "Bitcoin", Color.Unspecified, Modifier.padding(2.dp, 2.dp, 0.dp, 0.dp))
+        "bitcoin", "btc", "timechain", "bitcoiner", "bitcoiners" -> HashtagIcon(R.drawable.ht_btc, "Bitcoin", Color.Unspecified, Modifier.padding(2.dp, 2.dp, 0.dp, 0.dp))
         "nostr", "nostrich", "nostriches" -> HashtagIcon(R.drawable.ht_nostr, "Nostr", Color.Unspecified, Modifier.padding(1.dp, 2.dp, 0.dp, 0.dp))
         "lightning", "lightningnetwork" -> HashtagIcon(R.drawable.ht_lightning, "Lightning", Color.Unspecified, Modifier.padding(1.dp, 3.dp, 0.dp, 0.dp))
         "zap", "zaps", "zapper", "zappers", "zapping", "zapped", "zapathon", "zapraiser", "zaplife", "zapchain" -> HashtagIcon(R.drawable.zap, "Zap", Color.Unspecified, Modifier.padding(1.dp, 3.dp, 0.dp, 0.dp))
         "amethyst" -> HashtagIcon(R.drawable.amethyst, "Amethyst", Color.Unspecified, Modifier.padding(3.dp, 2.dp, 0.dp, 0.dp))
         "onyx" -> HashtagIcon(R.drawable.black_heart, "Onyx", Color.Unspecified, Modifier.padding(1.dp, 3.dp, 0.dp, 0.dp))
+        "cashu", "ecash", "nut", "nuts", "deeznuts" -> HashtagIcon(R.drawable.cashu, "Cashu", Color.Unspecified, Modifier.padding(1.dp, 3.dp, 0.dp, 0.dp))
         "plebs", "pleb", "plebchain" -> HashtagIcon(R.drawable.plebs, "Pleb", Color.Unspecified, Modifier.padding(2.dp, 2.dp, 0.dp, 1.dp))
         "coffee", "coffeechain", "cafe" -> HashtagIcon(R.drawable.coffee, "Coffee", Color.Unspecified, Modifier.padding(2.dp, 2.dp, 0.dp, 0.dp))
         "skullofsatoshi" -> HashtagIcon(R.drawable.skull, "SkullofSatoshi", Color.Unspecified, Modifier.padding(2.dp, 1.dp, 0.dp, 0.dp))
         "grownostr", "gardening", "garden" -> HashtagIcon(R.drawable.grownostr, "GrowNostr", Color.Unspecified, Modifier.padding(0.dp, 1.dp, 0.dp, 1.dp))
         "footstr" -> HashtagIcon(R.drawable.footstr, "Footstr", Color.Unspecified, Modifier.padding(1.dp, 1.dp, 0.dp, 0.dp))
+        "tunestr", "music", "nowplaying" -> HashtagIcon(R.drawable.tunestr, "Tunestr", primary, Modifier.padding(0.dp, 3.dp, 0.dp, 1.dp))
         "weed", "weedstr", "420", "cannabis", "marijuana" -> HashtagIcon(R.drawable.weed, "Weed", Color.Unspecified, Modifier.padding(0.dp, 0.dp, 0.dp, 0.dp))
         else -> null
     }
 }
+
+@Immutable
 class HashtagIcon(
     val icon: Int,
     val description: String,

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

@@ -1,7 +1,9 @@
 package com.vitorpamplona.amethyst.model
 
 import android.util.Log
+import androidx.compose.runtime.Stable
 import com.vitorpamplona.amethyst.Amethyst
+import com.vitorpamplona.amethyst.service.HexValidator
 import com.vitorpamplona.amethyst.service.checkNotInMainThread
 import com.vitorpamplona.amethyst.service.model.*
 import com.vitorpamplona.amethyst.service.nip19.Nip19
@@ -11,7 +13,6 @@ 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.File
 import java.io.FileOutputStream
 import java.io.IOException
@@ -40,19 +41,18 @@ object LocalCache {
         return null
     }
 
-    @Synchronized
     fun getOrCreateUser(key: HexKey): User {
         // checkNotInMainThread()
 
         return users[key] ?: run {
-            val answer = User(key)
-            users.put(key, answer)
-            answer
+            val newObject = User(key)
+            users.putIfAbsent(key, newObject) ?: newObject
         }
     }
 
     fun getUserIfExists(key: String): User? {
-        return users[key]
+        if (key.isEmpty()) return null
+        return users.get(key)
     }
 
     fun getNoteIfExists(key: String): Note? {
@@ -70,19 +70,24 @@ object LocalCache {
             return checkGetOrCreateAddressableNote(key)
         }
         if (isValidHexNpub(key)) {
-            return getOrCreateNote(key)
+            val note = getOrCreateNote(key)
+            val noteEvent = note.event
+            if (noteEvent is AddressableEvent) {
+                // upgrade to the latest
+                return checkGetOrCreateAddressableNote(noteEvent.address().toTag())
+            } else {
+                return note
+            }
         }
         return null
     }
 
-    @Synchronized
     fun getOrCreateNote(idHex: String): Note {
         checkNotInMainThread()
 
-        return notes[idHex] ?: run {
-            val answer = Note(idHex)
-            notes.put(idHex, answer)
-            answer
+        return notes.get(idHex) ?: run {
+            val newObject = Note(idHex)
+            notes.putIfAbsent(idHex, newObject) ?: newObject
         }
     }
 
@@ -90,29 +95,32 @@ object LocalCache {
         checkNotInMainThread()
 
         if (isValidHexNpub(key)) {
-            return getOrCreateChannel(key)
+            return getOrCreateChannel(key) {
+                PublicChatChannel(key)
+            }
+        }
+        val aTag = ATag.parse(key, null)
+        if (aTag != null) {
+            return getOrCreateChannel(aTag.toTag()) {
+                LiveActivitiesChannel(aTag)
+            }
         }
         return null
     }
 
     private fun isValidHexNpub(key: String): Boolean {
-        return try {
-            Hex.decode(key).toNpub()
-            true
-        } catch (e: IllegalArgumentException) {
-            Log.e("LocalCache", "Invalid Key to create user: $key", e)
-            false
-        }
+        if (key.isBlank()) return false
+        if (key.contains(":")) return false
+
+        return HexValidator.isHex(key)
     }
 
-    @Synchronized
-    fun getOrCreateChannel(key: String): Channel {
+    fun getOrCreateChannel(key: String, channelFactory: (String) -> Channel): Channel {
         checkNotInMainThread()
 
         return channels[key] ?: run {
-            val answer = Channel(key)
-            channels.put(key, answer)
-            answer
+            val newObject = channelFactory(key)
+            channels.putIfAbsent(key, newObject) ?: newObject
         }
     }
 
@@ -130,16 +138,14 @@ object LocalCache {
         }
     }
 
-    @Synchronized
     fun getOrCreateAddressableNoteInternal(key: ATag): AddressableNote {
         checkNotInMainThread()
 
         // we can't use naddr here because naddr might include relay info and
         // the preferred relay should not be part of the index.
         return addressables[key.toTag()] ?: run {
-            val answer = AddressableNote(key)
-            addressables.put(key.toTag(), answer)
-            answer
+            val newObject = AddressableNote(key)
+            addressables.putIfAbsent(key.toTag(), newObject) ?: newObject
         }
     }
 
@@ -179,9 +185,15 @@ object LocalCache {
     }
 
     fun consume(event: PeopleListEvent) {
+        val version = getOrCreateNote(event.id)
         val note = getOrCreateAddressableNote(event.address())
         val author = getOrCreateUser(event.pubKey)
 
+        if (version.event == null) {
+            version.loadEvent(event, author, emptyList())
+            version.moveAllReferencesTo(note)
+        }
+
         // Already processed this event.
         if (note.event?.id() == event.id()) return
 
@@ -220,7 +232,7 @@ object LocalCache {
 
         note.loadEvent(event, author, replyTo)
 
-        // Log.d("TN", "New Note (${notes.size},${users.size}) ${note.author?.toBestDisplayName()} ${note.event?.content()?.take(100)} ${formattedDateTime(event.createdAt)}")
+        // Log.d("TN", "New Note (${notes.size},${users.size}) ${note.author?.toBestDisplayName()} ${note.event?.content()?.split("\n")?.take(100)} ${formattedDateTime(event.createdAt)}")
 
         // Prepares user's profile view.
         author.addNote(note)
@@ -234,9 +246,15 @@ object LocalCache {
     }
 
     fun consume(event: LongTextNoteEvent, relay: Relay?) {
+        val version = getOrCreateNote(event.id)
         val note = getOrCreateAddressableNote(event.address())
         val author = getOrCreateUser(event.pubKey)
 
+        if (version.event == null) {
+            version.loadEvent(event, author, emptyList())
+            version.moveAllReferencesTo(note)
+        }
+
         if (relay != null) {
             author.addRelayBeingUsed(relay, event.createdAt)
             note.addRelay(relay)
@@ -286,7 +304,7 @@ object LocalCache {
 
         note.loadEvent(event, author, replyTo)
 
-        // Log.d("TN", "New Note (${notes.size},${users.size}) ${note.author?.toBestDisplayName()} ${note.event?.content()?.take(100)} ${formattedDateTime(event.createdAt)}")
+        // Log.d("TN", "New Note (${notes.size},${users.size}) ${note.author?.toBestDisplayName()} ${note.event?.content()?.split("\n")?.take(100)} ${formattedDateTime(event.createdAt)}")
 
         // Prepares user's profile view.
         author.addNote(note)
@@ -299,10 +317,40 @@ object LocalCache {
         refreshObservers(note)
     }
 
-    private fun consume(event: PinListEvent) {
+    private fun consume(event: LiveActivitiesEvent, relay: Relay?) {
+        val version = getOrCreateNote(event.id)
         val note = getOrCreateAddressableNote(event.address())
         val author = getOrCreateUser(event.pubKey)
 
+        if (version.event == null) {
+            version.loadEvent(event, author, emptyList())
+            version.moveAllReferencesTo(note)
+        }
+
+        if (note.event?.id() == event.id()) return
+
+        if (event.createdAt > (note.createdAt() ?: 0)) {
+            note.loadEvent(event, author, emptyList())
+
+            val channel = getOrCreateChannel(note.idHex) {
+                LiveActivitiesChannel(note.address)
+            } as? LiveActivitiesChannel
+            channel?.updateChannelInfo(author, event, event.createdAt)
+
+            refreshObservers(note)
+        }
+    }
+
+    private fun consume(event: PinListEvent) {
+        val version = getOrCreateNote(event.id)
+        val note = getOrCreateAddressableNote(event.address())
+        val author = getOrCreateUser(event.pubKey)
+
+        if (version.event == null) {
+            version.loadEvent(event, author, emptyList())
+            version.moveAllReferencesTo(note)
+        }
+
         if (note.event?.id() == event.id()) return
 
         if (event.createdAt > (note.createdAt() ?: 0)) {
@@ -313,9 +361,15 @@ object LocalCache {
     }
 
     private fun consume(event: RelaySetEvent) {
+        val version = getOrCreateNote(event.id)
         val note = getOrCreateAddressableNote(event.address())
         val author = getOrCreateUser(event.pubKey)
 
+        if (version.event == null) {
+            version.loadEvent(event, author, emptyList())
+            version.moveAllReferencesTo(note)
+        }
+
         if (note.event?.id() == event.id()) return
 
         if (event.createdAt > (note.createdAt() ?: 0)) {
@@ -326,9 +380,15 @@ object LocalCache {
     }
 
     private fun consume(event: AudioTrackEvent) {
+        val version = getOrCreateNote(event.id)
         val note = getOrCreateAddressableNote(event.address())
         val author = getOrCreateUser(event.pubKey)
 
+        if (version.event == null) {
+            version.loadEvent(event, author, emptyList())
+            version.moveAllReferencesTo(note)
+        }
+
         // Already processed this event.
         if (note.event?.id() == event.id()) return
 
@@ -340,9 +400,15 @@ object LocalCache {
     }
 
     fun consume(event: BadgeDefinitionEvent) {
+        val version = getOrCreateNote(event.id)
         val note = getOrCreateAddressableNote(event.address())
         val author = getOrCreateUser(event.pubKey)
 
+        if (version.event == null) {
+            version.loadEvent(event, author, emptyList())
+            version.moveAllReferencesTo(note)
+        }
+
         // Already processed this event.
         if (note.event?.id() == event.id()) return
 
@@ -354,9 +420,15 @@ object LocalCache {
     }
 
     fun consume(event: BadgeProfilesEvent) {
+        val version = getOrCreateNote(event.id)
         val note = getOrCreateAddressableNote(event.address())
         val author = getOrCreateUser(event.pubKey)
 
+        if (version.event == null) {
+            version.loadEvent(event, author, emptyList())
+            version.moveAllReferencesTo(note)
+        }
+
         // Already processed this event.
         if (note.event?.id() == event.id()) return
 
@@ -392,21 +464,35 @@ object LocalCache {
     }
 
     fun consume(event: AppDefinitionEvent) {
+        val version = getOrCreateNote(event.id)
         val note = getOrCreateAddressableNote(event.address())
         val author = getOrCreateUser(event.pubKey)
 
+        if (version.event == null) {
+            version.loadEvent(event, author, emptyList())
+            version.moveAllReferencesTo(note)
+        }
+
         // Already processed this event.
         if (note.event != null) return
 
-        note.loadEvent(event, author, emptyList())
+        if (event.createdAt > (note.createdAt() ?: 0)) {
+            note.loadEvent(event, author, emptyList())
 
-        refreshObservers(note)
+            refreshObservers(note)
+        }
     }
 
     fun consume(event: AppRecommendationEvent) {
+        val version = getOrCreateNote(event.id)
         val note = getOrCreateAddressableNote(event.address())
         val author = getOrCreateUser(event.pubKey)
 
+        if (version.event == null) {
+            version.loadEvent(event, author, emptyList())
+            version.moveAllReferencesTo(note)
+        }
+
         // Already processed this event.
         if (note.event?.id() == event.id()) return
 
@@ -448,8 +534,7 @@ object LocalCache {
 
         // Log.d("PM", "${author.toBestDisplayName()} to ${recipient?.toBestDisplayName()}")
 
-        val repliesTo = event.tags.filter { it.firstOrNull() == "e" }.mapNotNull { it.getOrNull(1) }
-            .mapNotNull { checkGetOrCreateNote(it) }
+        val repliesTo = event.taggedEvents().mapNotNull { checkGetOrCreateNote(it) }
 
         note.loadEvent(event, author, repliesTo)
 
@@ -490,8 +575,11 @@ object LocalCache {
                 }
 
                 deleteNote.channelHex()?.let {
-                    val channel = checkGetOrCreateChannel(it)
-                    channel?.removeNote(deleteNote)
+                    channels[it]?.removeNote(deleteNote)
+                }
+
+                (deleteNote.event as? LiveActivitiesChatMessageEvent)?.activity()?.let {
+                    channels[it.toTag()]?.removeNote(deleteNote)
                 }
 
                 if (deleteNote.event is PrivateDmEvent) {
@@ -540,6 +628,31 @@ object LocalCache {
         refreshObservers(note)
     }
 
+    fun consume(event: GenericRepostEvent) {
+        val note = getOrCreateNote(event.id)
+
+        // Already processed this event.
+        if (note.event != null) return
+
+        // Log.d("TN", "New Boost (${notes.size},${users.size}) ${note.author?.toBestDisplayName()} ${formattedDateTime(event.createdAt)}")
+
+        val author = getOrCreateUser(event.pubKey)
+        val repliesTo = event.boostedPost().mapNotNull { checkGetOrCreateNote(it) } +
+            event.taggedAddresses().mapNotNull { getOrCreateAddressableNote(it) }
+
+        note.loadEvent(event, author, repliesTo)
+
+        // Prepares user's profile view.
+        author.addNote(note)
+
+        // Counts the replies
+        repliesTo.forEach {
+            it.addBoost(note)
+        }
+
+        refreshObservers(note)
+    }
+
     fun consume(event: ReactionEvent) {
         val note = getOrCreateNote(event.id)
 
@@ -601,7 +714,9 @@ object LocalCache {
 
     fun consume(event: ChannelCreateEvent) {
         // Log.d("MT", "New Event ${event.content} ${event.id.toHex()}")
-        val oldChannel = getOrCreateChannel(event.id)
+        val oldChannel = getOrCreateChannel(event.id) {
+            PublicChatChannel(it)
+        }
         val author = getOrCreateUser(event.pubKey)
 
         val note = getOrCreateNote(event.id)
@@ -616,7 +731,9 @@ object LocalCache {
             return // older data, does nothing
         }
         if (oldChannel.creator == null || oldChannel.creator == author) {
-            oldChannel.updateChannelInfo(author, event.channelInfo(), event.createdAt)
+            if (oldChannel is PublicChatChannel) {
+                oldChannel.updateChannelInfo(author, event.channelInfo(), event.createdAt)
+            }
         }
     }
 
@@ -627,10 +744,13 @@ object LocalCache {
 
         // new event
         val oldChannel = checkGetOrCreateChannel(channelId) ?: return
+
         val author = getOrCreateUser(event.pubKey)
         if (event.createdAt > oldChannel.updatedMetadataAt) {
             if (oldChannel.creator == null || oldChannel.creator == author) {
-                oldChannel.updateChannelInfo(author, event.channelInfo(), event.createdAt)
+                if (oldChannel is PublicChatChannel) {
+                    oldChannel.updateChannelInfo(author, event.channelInfo(), event.createdAt)
+                }
             }
         } else {
             // Log.d("MT","Relay sent a previous Metadata Event ${oldUser.toBestDisplayName()} ${formattedDateTime(event.createdAt)} > ${formattedDateTime(oldUser.updatedAt)}")
@@ -688,6 +808,47 @@ object LocalCache {
         refreshObservers(note)
     }
 
+    fun consume(event: LiveActivitiesChatMessageEvent, relay: Relay?) {
+        val activityId = event.activity() ?: return
+
+        val channel = getOrCreateChannel(activityId.toTag()) {
+            LiveActivitiesChannel(activityId)
+        }
+
+        val note = getOrCreateNote(event.id)
+        channel.addNote(note)
+
+        val author = getOrCreateUser(event.pubKey)
+
+        if (relay != null) {
+            author.addRelayBeingUsed(relay, event.createdAt)
+            note.addRelay(relay)
+        }
+
+        // Already processed this event.
+        if (note.event != null) return
+
+        if (antiSpam.isSpam(event, relay)) {
+            relay?.let {
+                it.spamCounter++
+            }
+            return
+        }
+
+        val replyTo = event.tagsWithoutCitations()
+            .filter { it != event.activity()?.toTag() }
+            .mapNotNull { checkGetOrCreateNote(it) }
+
+        note.loadEvent(event, author, replyTo)
+
+        // Counts the replies
+        replyTo.forEach {
+            it.addReply(note)
+        }
+
+        refreshObservers(note)
+    }
+
     @Suppress("UNUSED_PARAMETER")
     fun consume(event: ChannelHideMessageEvent) {
     }
@@ -977,7 +1138,7 @@ object LocalCache {
                 }
             }
 
-            println("PRUNE: ${toBeRemoved.size} messages removed from ${it.value.info.name}")
+            println("PRUNE: ${toBeRemoved.size} messages removed from ${it.value.toBestDisplayName()}")
         }
     }
 
@@ -1064,6 +1225,8 @@ object LocalCache {
                 is FileStorageEvent -> consume(event, relay)
                 is FileStorageHeaderEvent -> consume(event, relay)
                 is HighlightEvent -> consume(event, relay)
+                is LiveActivitiesEvent -> consume(event, relay)
+                is LiveActivitiesChatMessageEvent -> consume(event, relay)
                 is LnZapEvent -> {
                     event.zapRequest?.let {
                         verifyAndConsume(it, relay)
@@ -1088,6 +1251,12 @@ object LocalCache {
                     }
                     consume(event)
                 }
+                is GenericRepostEvent -> {
+                    event.containedPost()?.let {
+                        verifyAndConsume(it, relay)
+                    }
+                    consume(event)
+                }
                 is TextNoteEvent -> consume(event, relay)
                 is PollNoteEvent -> consume(event, relay)
                 else -> {
@@ -1100,12 +1269,13 @@ object LocalCache {
     }
 }
 
+@Stable
 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)
+    private val bundler = BundledInsert<Note>(1000, Dispatchers.IO)
 
     fun invalidateData(newNote: Note) {
         bundler.invalidateList(newNote) { bundledNewNotes ->

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

@@ -10,6 +10,7 @@ import com.vitorpamplona.amethyst.service.model.*
 import com.vitorpamplona.amethyst.service.nip19.Nip19
 import com.vitorpamplona.amethyst.service.relays.EOSETime
 import com.vitorpamplona.amethyst.service.relays.Relay
+import com.vitorpamplona.amethyst.ui.actions.updated
 import com.vitorpamplona.amethyst.ui.components.BundledUpdate
 import com.vitorpamplona.amethyst.ui.note.toShortenHex
 import fr.acinq.secp256k1.Hex
@@ -29,7 +30,14 @@ class AddressableNote(val address: ATag) : Note(address.toTag()) {
     override fun toNEvent() = address.toNAddr()
     override fun idDisplayNote() = idNote().toShortenHex()
     override fun address() = address
-    override fun createdAt() = (event as? LongTextNoteEvent)?.publishedAt() ?: event?.createdAt()
+    override fun createdAt(): Long? {
+        if (event == null) return null
+
+        val publishedAt = (event as? LongTextNoteEvent)?.publishedAt() ?: Long.MAX_VALUE
+        val lastCreatedAt = event?.createdAt() ?: Long.MAX_VALUE
+
+        return minOf(publishedAt, lastCreatedAt)
+    }
 }
 
 @Stable
@@ -69,9 +77,20 @@ open class Note(val idHex: String) {
     open fun idDisplayNote() = idNote().toShortenHex()
 
     fun channelHex(): HexKey? {
-        return (event as? ChannelMessageEvent)?.channel()
-            ?: (event as? ChannelMetadataEvent)?.channel()
-            ?: (event as? ChannelCreateEvent)?.id
+        return if (event is ChannelMessageEvent ||
+            event is ChannelMetadataEvent ||
+            event is ChannelCreateEvent ||
+            event is LiveActivitiesChatMessageEvent ||
+            event is LiveActivitiesEvent
+        ) {
+            (event as? ChannelMessageEvent)?.channel()
+                ?: (event as? ChannelMetadataEvent)?.channel()
+                ?: (event as? ChannelCreateEvent)?.id
+                ?: (event as? LiveActivitiesChatMessageEvent)?.activity()?.toTag()
+                ?: (event as? LiveActivitiesEvent)?.address()?.toTag()
+        } else {
+            null
+        }
     }
 
     open fun address(): ATag? = null
@@ -96,7 +115,7 @@ open class Note(val idHex: String) {
      */
     fun replyLevelSignature(cachedSignatures: MutableMap<Note, String> = mutableMapOf()): String {
         val replyTo = replyTo
-        if (replyTo == null || replyTo.isEmpty()) {
+        if (event is RepostEvent || event is GenericRepostEvent || replyTo == null || replyTo.isEmpty()) {
             return "/" + formattedDateTime(createdAt() ?: 0) + ";"
         }
 
@@ -109,7 +128,7 @@ open class Note(val idHex: String) {
 
     fun replyLevel(cachedLevels: MutableMap<Note, Int> = mutableMapOf()): Int {
         val replyTo = replyTo
-        if (replyTo == null || replyTo.isEmpty()) {
+        if (event is RepostEvent || event is GenericRepostEvent || replyTo == null || replyTo.isEmpty()) {
             return 0
         }
 
@@ -372,7 +391,14 @@ open class Note(val idHex: String) {
     }
 
     fun isNewThread(): Boolean {
-        return event is RepostEvent || replyTo == null || replyTo?.size == 0
+        return (
+            event is RepostEvent ||
+                event is GenericRepostEvent ||
+                replyTo == null ||
+                replyTo?.size == 0
+            ) &&
+            event !is ChannelMessageEvent &&
+            event !is LiveActivitiesChatMessageEvent
     }
 
     fun hasZapped(loggedIn: User): Boolean {
@@ -400,6 +426,42 @@ open class Note(val idHex: String) {
         return boosts.filter { it.author == loggedIn }
     }
 
+    fun moveAllReferencesTo(note: AddressableNote) {
+        // migrates these comments to a new version
+        replies.forEach {
+            note.addReply(it)
+            it.replyTo = it.replyTo?.updated(this, note)
+        }
+        reactions.forEach {
+            it.value.forEach {
+                note.addReaction(it)
+                it.replyTo = it.replyTo?.updated(this, note)
+            }
+        }
+        boosts.forEach {
+            note.addBoost(it)
+            it.replyTo = it.replyTo?.updated(this, note)
+        }
+        reports.forEach {
+            it.value.forEach {
+                note.addReport(it)
+                it.replyTo = it.replyTo?.updated(this, note)
+            }
+        }
+        zaps.forEach {
+            note.addZap(it.key, it.value)
+            it.key.replyTo = it.key.replyTo?.updated(this, note)
+            it.value?.replyTo = it.value?.replyTo?.updated(this, note)
+        }
+
+        replyTo = null
+        replies = emptySet()
+        reactions = emptyMap()
+        boosts = emptySet()
+        reports = emptyMap()
+        zaps = emptyMap()
+    }
+
     var liveSet: NoteLiveSet? = null
 
     fun live(): NoteLiveSet {
@@ -440,13 +502,13 @@ class NoteLiveSet(u: Note) {
 
 class NoteLiveData(val note: Note) : LiveData<NoteState>(NoteState(note)) {
     // Refreshes observers in batches.
-    private val bundler = BundledUpdate(300, Dispatchers.IO)
+    private val bundler = BundledUpdate(500, Dispatchers.IO)
 
     fun invalidateData() {
         bundler.invalidate() {
-            // if (hasObservers()) {
-            postValue(NoteState(note))
-            // }
+            if (hasActiveObservers()) {
+                postValue(NoteState(note))
+            }
         }
     }
 

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

@@ -0,0 +1,250 @@
+package com.vitorpamplona.amethyst.model
+
+import com.google.gson.Gson
+import com.google.gson.GsonBuilder
+import com.google.gson.JsonArray
+import com.google.gson.JsonElement
+import com.google.gson.JsonObject
+import com.google.gson.JsonSerializationContext
+import com.google.gson.JsonSerializer
+import java.lang.reflect.Type
+
+class RelayInformation(
+    val name: String?,
+    val description: String?,
+    val pubkey: String?,
+    val contact: String?,
+    val supported_nips: List<Int>?,
+    val supported_nip_extensions: List<String>?,
+    val software: String?,
+    val version: String?,
+    val limitation: RelayInformationLimitation?,
+    val relay_countries: List<String>?,
+    val language_tags: List<String>?,
+    val tags: List<String>?,
+    val posting_policy: String?,
+    val payments_url: String?,
+    val fees: RelayInformationFees?
+) {
+    companion object {
+        val gson: Gson = GsonBuilder()
+            .disableHtmlEscaping()
+            .registerTypeAdapter(RelayInformation::class.java, RelayInformationSerializer())
+            .registerTypeAdapter(RelayInformationLimitation::class.java, RelayInformationLimitationSerializer())
+            .registerTypeAdapter(RelayInformationFees::class.java, RelayInformationFeesSerializer())
+            .registerTypeAdapter(RelayInformationFee::class.java, RelayInformationFeeSerializer())
+            .create()
+
+        fun fromJson(json: String): RelayInformation = gson.fromJson(json, RelayInformation::class.java)
+    }
+}
+
+class RelayInformationFee(
+    val amount: Int?,
+    val unit: String?,
+    val period: Int?,
+    val kinds: List<Int>?
+) {
+    companion object {
+        val gson: Gson = GsonBuilder()
+            .disableHtmlEscaping()
+            .registerTypeAdapter(RelayInformationFee::class.java, RelayInformationFeeSerializer())
+            .create()
+
+        fun fromJson(json: String): RelayInformationFee = gson.fromJson(json, RelayInformationFee::class.java)
+    }
+}
+
+private class RelayInformationFeeSerializer : JsonSerializer<RelayInformationFee> {
+    override fun serialize(
+        src: RelayInformationFee,
+        typeOfSrc: Type?,
+        context: JsonSerializationContext?
+    ): JsonElement {
+        return JsonObject().apply {
+            addProperty("amount", src.amount)
+            addProperty("unit", src.unit)
+            addProperty("period", src.period)
+            add(
+                "kinds",
+                JsonArray().also { kinds ->
+                    src.kinds?.forEach { kind ->
+                        kinds.add(
+                            kind
+                        )
+                    }
+                }
+            )
+        }
+    }
+}
+
+class RelayInformationFees(
+    val admission: List<RelayInformationFee>?,
+    val subscription: List<RelayInformationFee>?,
+    val publication: List<RelayInformationFee>?
+) {
+    companion object {
+        val gson: Gson = GsonBuilder()
+            .disableHtmlEscaping()
+            .registerTypeAdapter(RelayInformationFees::class.java, RelayInformationFeesSerializer())
+            .create()
+
+        fun fromJson(json: String): RelayInformationFees = gson.fromJson(json, RelayInformationFees::class.java)
+    }
+}
+
+private class RelayInformationFeesSerializer : JsonSerializer<RelayInformationFees> {
+    override fun serialize(
+        src: RelayInformationFees,
+        typeOfSrc: Type?,
+        context: JsonSerializationContext?
+    ): JsonElement {
+        return JsonObject().apply {
+            add(
+                "admission",
+                JsonArray().also { admissions ->
+                    src.admission?.forEach { admission ->
+                        admissions.add(
+                            admission.toString()
+                        )
+                    }
+                }
+            )
+            add(
+                "publication",
+                JsonArray().also { publications ->
+                    src.publication?.forEach { publication ->
+                        publications.add(
+                            publication.toString()
+                        )
+                    }
+                }
+            )
+            add(
+                "subscription",
+                JsonArray().also { subscriptions ->
+                    src.subscription?.forEach { subscription ->
+                        subscriptions.add(
+                            subscription.toString()
+                        )
+                    }
+                }
+            )
+        }
+    }
+}
+
+class RelayInformationLimitation(
+    val max_message_length: Int?,
+    val max_subscriptions: Int?,
+    val max_filters: Int?,
+    val max_limit: Int?,
+    val max_subid_length: Int?,
+    val min_prefix: Int?,
+    val max_event_tags: Int?,
+    val max_content_length: Int?,
+    val min_pow_difficulty: Int?,
+    val auth_required: Boolean?,
+    val payment_required: Boolean?
+) {
+    companion object {
+        val gson: Gson = GsonBuilder()
+            .disableHtmlEscaping()
+            .registerTypeAdapter(RelayInformationLimitation::class.java, RelayInformationLimitationSerializer())
+            .create()
+
+        fun fromJson(json: String): RelayInformationLimitation = gson.fromJson(json, RelayInformationLimitation::class.java)
+    }
+}
+
+private class RelayInformationLimitationSerializer : JsonSerializer<RelayInformationLimitation> {
+    override fun serialize(
+        src: RelayInformationLimitation,
+        typeOfSrc: Type?,
+        context: JsonSerializationContext?
+    ): JsonElement {
+        return JsonObject().apply {
+            addProperty("max_message_length", src.max_message_length)
+            addProperty("max_subscriptions", src.max_subscriptions)
+            addProperty("max_filters", src.max_filters)
+            addProperty("max_limit", src.max_limit)
+            addProperty("max_subid_length", src.max_subid_length)
+            addProperty("min_prefix", src.min_prefix)
+            addProperty("max_event_tags", src.max_event_tags)
+            addProperty("max_content_length", src.max_content_length)
+            addProperty("min_pow_difficulty", src.min_pow_difficulty)
+            addProperty("auth_required", src.auth_required)
+            addProperty("payment_required", src.payment_required)
+        }
+    }
+}
+
+private class RelayInformationSerializer : JsonSerializer<RelayInformation> {
+    override fun serialize(
+        src: RelayInformation,
+        typeOfSrc: Type?,
+        context: JsonSerializationContext?
+    ): JsonElement {
+        return JsonObject().apply {
+            addProperty("name", src.name)
+            addProperty("description", src.description)
+            addProperty("pubkey", src.pubkey)
+            addProperty("contact", src.contact)
+            add(
+                "supported_nip_extensions",
+                JsonArray().also { supported_nip_extensions ->
+                    src.supported_nip_extensions?.forEach { nip ->
+                        supported_nip_extensions.add(
+                            nip
+                        )
+                    }
+                }
+            )
+            add(
+                "supported_nips",
+                JsonArray().also { supported_nips ->
+                    src.supported_nips?.forEach { nip ->
+                        supported_nips.add(
+                            nip
+                        )
+                    }
+                }
+            )
+            addProperty("software", src.software)
+            addProperty("version", src.version)
+            add(
+                "relay_countries",
+                JsonArray().also { relay_countries ->
+                    src.relay_countries?.forEach { country ->
+                        relay_countries.add(
+                            country
+                        )
+                    }
+                }
+            )
+            add(
+                "language_tags",
+                JsonArray().also { language_tags ->
+                    src.language_tags?.forEach { language_tag ->
+                        language_tags.add(
+                            language_tag
+                        )
+                    }
+                }
+            )
+            add(
+                "tags",
+                JsonArray().also { tags ->
+                    src.tags?.forEach { tag ->
+                        tags.add(
+                            tag
+                        )
+                    }
+                }
+            )
+            addProperty("posting_policy", src.posting_policy)
+            addProperty("payments_url", src.payments_url)
+        }
+    }
+}

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

@@ -12,5 +12,6 @@ data class RelaySetupInfo(
     val downloadCountInBytes: Int = 0,
     val uploadCountInBytes: Int = 0,
     val spamCount: Int = 0,
-    val feedTypes: Set<FeedType>
+    val feedTypes: Set<FeedType>,
+    val paidRelay: Boolean = false
 )

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

@@ -2,6 +2,8 @@ package com.vitorpamplona.amethyst.model
 
 import com.vitorpamplona.amethyst.service.checkNotInMainThread
 import com.vitorpamplona.amethyst.service.model.ATag
+import com.vitorpamplona.amethyst.service.model.GenericRepostEvent
+import com.vitorpamplona.amethyst.service.model.RepostEvent
 import kotlin.time.ExperimentalTime
 import kotlin.time.measureTimedValue
 
@@ -10,6 +12,8 @@ class ThreadAssembler {
     private fun searchRoot(note: Note, testedNotes: MutableSet<Note> = mutableSetOf()): Note? {
         if (note.replyTo == null || note.replyTo?.isEmpty() == true) return note
 
+        if (note.event is RepostEvent || note.event is GenericRepostEvent) return note
+
         testedNotes.add(note)
 
         val markedAsRoot = note.event?.tags()?.firstOrNull { it[0] == "e" && it.size > 3 && it[3] == "root" }?.getOrNull(1)

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

@@ -1,12 +1,14 @@
 package com.vitorpamplona.amethyst.model
 
 import android.util.LruCache
+import androidx.compose.runtime.Stable
 import com.vitorpamplona.amethyst.service.checkNotInMainThread
 import com.vitorpamplona.amethyst.service.previews.BahaUrlPreview
 import com.vitorpamplona.amethyst.service.previews.IUrlPreviewCallback
 import com.vitorpamplona.amethyst.service.previews.UrlInfoItem
 import com.vitorpamplona.amethyst.ui.components.UrlPreviewState
 
+@Stable
 object UrlCachedPreviewer {
     var cache = LruCache<String, UrlPreviewState>(100)
         private set

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

@@ -12,6 +12,8 @@ import com.vitorpamplona.amethyst.service.model.MetadataEvent
 import com.vitorpamplona.amethyst.service.model.ReportEvent
 import com.vitorpamplona.amethyst.service.relays.EOSETime
 import com.vitorpamplona.amethyst.service.relays.Relay
+import com.vitorpamplona.amethyst.ui.actions.ImmutableListOfLists
+import com.vitorpamplona.amethyst.ui.actions.toImmutableListOfLists
 import com.vitorpamplona.amethyst.ui.components.BundledUpdate
 import com.vitorpamplona.amethyst.ui.note.toShortenHex
 import fr.acinq.secp256k1.Hex
@@ -96,10 +98,10 @@ class User(val pubkeyHex: String) {
         // Update Followers of the past user list
         // Update Followers of the new contact list
         (oldContactListEvent)?.unverifiedFollowKeySet()?.forEach {
-            LocalCache.users[it]?.liveSet?.follows?.invalidateData()
+            LocalCache.users[it]?.liveSet?.followers?.invalidateData()
         }
         (latestContactList)?.unverifiedFollowKeySet()?.forEach {
-            LocalCache.users[it]?.liveSet?.follows?.invalidateData()
+            LocalCache.users[it]?.liveSet?.followers?.invalidateData()
         }
 
         liveSet?.relays?.invalidateData()
@@ -144,8 +146,10 @@ class User(val pubkeyHex: String) {
     }
 
     fun updateAcceptedBadges(note: AddressableNote) {
-        acceptedBadges = note
-        liveSet?.badges?.invalidateData()
+        if (acceptedBadges?.idHex != note.idHex) {
+            acceptedBadges = note
+            liveSet?.badges?.invalidateData()
+        }
     }
 
     fun addZap(zapRequest: Note, zap: Note?) {
@@ -185,34 +189,34 @@ class User(val pubkeyHex: String) {
     }
 
     @Synchronized
-    private fun getOrCreatePrivateChatroom(user: User): Chatroom {
+    private fun getOrCreatePrivateChatroomSync(user: User): Chatroom {
         checkNotInMainThread()
 
         return privateChatrooms[user] ?: run {
-            val privateChatroom = Chatroom(setOf<Note>())
+            val privateChatroom = Chatroom()
             privateChatrooms = privateChatrooms + Pair(user, privateChatroom)
             privateChatroom
         }
     }
 
-    @Synchronized
-    fun addMessage(user: User, msg: Note) {
-        checkNotInMainThread()
+    private fun getOrCreatePrivateChatroom(user: User): Chatroom {
+        return privateChatrooms[user] ?: getOrCreatePrivateChatroomSync(user)
+    }
 
+    fun addMessage(user: User, msg: Note) {
         val privateChatroom = getOrCreatePrivateChatroom(user)
         if (msg !in privateChatroom.roomMessages) {
-            privateChatroom.roomMessages = privateChatroom.roomMessages + msg
+            privateChatroom.addMessageSync(msg)
             liveSet?.messages?.invalidateData()
         }
     }
 
-    @Synchronized
     fun removeMessage(user: User, msg: Note) {
         checkNotInMainThread()
 
         val privateChatroom = getOrCreatePrivateChatroom(user)
         if (msg in privateChatroom.roomMessages) {
-            privateChatroom.roomMessages = privateChatroom.roomMessages - msg
+            privateChatroom.removeMessageSync(msg)
             liveSet?.messages?.invalidateData()
         }
     }
@@ -235,6 +239,7 @@ class User(val pubkeyHex: String) {
         info = newUserInfo
         info?.latestMetadata = latestMetadata
         info?.updatedMetadataAt = latestMetadata.createdAt
+        info?.tags = latestMetadata.tags.toImmutableListOfLists()
 
         if (newUserInfo.lud16.isNullOrBlank() && newUserInfo.lud06?.lowercase()?.startsWith("lnurl") == true) {
             try {
@@ -340,6 +345,7 @@ class User(val pubkeyHex: String) {
 class UserLiveSet(u: User) {
     // UI Observers line up here.
     val follows: UserLiveData = UserLiveData(u)
+    val followers: UserLiveData = UserLiveData(u)
     val reports: UserLiveData = UserLiveData(u)
     val messages: UserLiveData = UserLiveData(u)
     val relays: UserLiveData = UserLiveData(u)
@@ -351,6 +357,7 @@ class UserLiveSet(u: User) {
 
     fun isInUse(): Boolean {
         return follows.hasObservers() ||
+            followers.hasObservers() ||
             reports.hasObservers() ||
             messages.hasObservers() ||
             relays.hasObservers() ||
@@ -369,7 +376,27 @@ data class RelayInfo(
     var counter: Long
 )
 
-data class Chatroom(var roomMessages: Set<Note>)
+class Chatroom() {
+    var roomMessages: Set<Note> = setOf()
+
+    @Synchronized
+    fun addMessageSync(msg: Note) {
+        checkNotInMainThread()
+
+        if (msg !in roomMessages) {
+            roomMessages = roomMessages + msg
+        }
+    }
+
+    @Synchronized
+    fun removeMessageSync(msg: Note) {
+        checkNotInMainThread()
+
+        if (msg !in roomMessages) {
+            roomMessages = roomMessages + msg
+        }
+    }
+}
 
 @Stable
 class UserMetadata {
@@ -397,6 +424,7 @@ class UserMetadata {
 
     var updatedMetadataAt: Long = 0
     var latestMetadata: MetadataEvent? = null
+    var tags: ImmutableListOfLists<String>? = null
 
     fun anyName(): String? {
         return display_name ?: displayName ?: name ?: username
@@ -410,11 +438,28 @@ class UserMetadata {
     fun lnAddress(): String? {
         return (lud16?.trim() ?: lud06?.trim())?.ifBlank { null }
     }
+
+    fun bestUsername(): String? {
+        return name?.ifBlank { null } ?: username?.ifBlank { null }
+    }
+
+    fun bestDisplayName(): String? {
+        return displayName?.ifBlank { null } ?: display_name?.ifBlank { null }
+    }
+
+    fun nip05(): String? {
+        return nip05?.ifBlank { null }
+    }
+
+    fun profilePicture(): String? {
+        if (picture.isNullOrBlank()) picture = null
+        return picture
+    }
 }
 
 class UserLiveData(val user: User) : LiveData<UserState>(UserState(user)) {
     // Refreshes observers in batches.
-    private val bundler = BundledUpdate(300, Dispatchers.IO)
+    private val bundler = BundledUpdate(500, Dispatchers.IO)
 
     fun invalidateData() {
         bundler.invalidate() {

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

@@ -49,6 +49,8 @@ object BlurHashDecoder {
      *                 By default it is true.
      */
     fun decode(blurHash: String?, width: Int, height: Int, punch: Float = 1f, useCache: Boolean = true): Bitmap? {
+        checkNotInMainThread()
+
         if (blurHash == null || blurHash.length < 6) {
             return null
         }

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

@@ -2,6 +2,7 @@ package com.vitorpamplona.amethyst.service
 
 import android.content.Context
 import android.net.Uri
+import androidx.compose.runtime.Stable
 import androidx.core.graphics.drawable.toDrawable
 import coil.ImageLoader
 import coil.decode.DataSource
@@ -14,6 +15,7 @@ import java.net.URLDecoder
 import java.net.URLEncoder
 import kotlin.math.roundToInt
 
+@Stable
 class BlurHashFetcher(
     private val options: Options,
     private val data: Uri

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

@@ -0,0 +1,274 @@
+package com.vitorpamplona.amethyst.service
+
+import android.util.Log
+import android.util.LruCache
+import android.util.Patterns
+import androidx.compose.runtime.Immutable
+import com.linkedin.urls.detection.UrlDetector
+import com.linkedin.urls.detection.UrlDetectorOptions
+import com.vitorpamplona.amethyst.ui.actions.ImmutableListOfLists
+import com.vitorpamplona.amethyst.ui.components.ZoomableUrlContent
+import com.vitorpamplona.amethyst.ui.components.ZoomableUrlImage
+import com.vitorpamplona.amethyst.ui.components.ZoomableUrlVideo
+import com.vitorpamplona.amethyst.ui.components.hashTagsPattern
+import com.vitorpamplona.amethyst.ui.components.imageExtensions
+import com.vitorpamplona.amethyst.ui.components.startsWithNIP19Scheme
+import com.vitorpamplona.amethyst.ui.components.tagIndex
+import com.vitorpamplona.amethyst.ui.components.videoExtensions
+import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.ImmutableMap
+import kotlinx.collections.immutable.ImmutableSet
+import kotlinx.collections.immutable.persistentListOf
+import kotlinx.collections.immutable.toImmutableList
+import kotlinx.collections.immutable.toImmutableMap
+import kotlinx.collections.immutable.toImmutableSet
+import java.util.regex.Pattern
+
+@Immutable
+data class RichTextViewerState(
+    val urlSet: ImmutableSet<String>,
+    val imagesForPager: ImmutableMap<String, ZoomableUrlContent>,
+    val imageList: ImmutableList<ZoomableUrlContent>,
+    val customEmoji: ImmutableMap<String, String>,
+    val paragraphs: ImmutableList<ImmutableList<Segment>>
+)
+
+object CachedRichTextParser {
+    val richTextCache = LruCache<String, RichTextViewerState>(200)
+
+    fun parseText(content: String, tags: ImmutableListOfLists<String>): RichTextViewerState {
+        return if (richTextCache[content] != null) {
+            richTextCache[content]
+        } else {
+            val newUrls = RichTextParser().parseText(content, tags)
+            richTextCache.put(content, newUrls)
+            newUrls
+        }
+    }
+}
+
+val longDatePattern: Pattern = Pattern.compile("^\\d{4}-\\d{2}-\\d{2}$")
+val shortDatePattern: Pattern = Pattern.compile("^\\d{2}-\\d{2}-\\d{2}$")
+val numberPattern: Pattern = Pattern.compile("^(-?[\\d.]+)([a-zA-Z%]*)$")
+
+// Group 1 = url, group 4 additional chars
+val noProtocolUrlValidator = Pattern.compile("(([\\w\\d-]+\\.)*[a-zA-Z][\\w-]+[\\.\\:]\\w+([\\/\\?\\=\\&\\#\\.]?[\\w-]+)*\\/?)(.*)")
+
+class RichTextParser() {
+    fun parseText(
+        content: String,
+        tags: ImmutableListOfLists<String>
+    ): RichTextViewerState {
+        val urls = UrlDetector(content, UrlDetectorOptions.Default).detect()
+
+        val urlSet = urls.mapNotNullTo(LinkedHashSet(urls.size)) {
+            // removes e-mails
+            if (Patterns.EMAIL_ADDRESS.matcher(it.originalUrl).matches()) {
+                null
+            } else if (isNumber(it.originalUrl)) {
+                null
+            } else {
+                it.originalUrl
+            }
+        }
+
+        val imagesForPager = urlSet.mapNotNull { fullUrl ->
+            val removedParamsFromUrl = fullUrl.split("?")[0].lowercase()
+            if (imageExtensions.any { removedParamsFromUrl.endsWith(it) }) {
+                ZoomableUrlImage(fullUrl)
+            } else if (videoExtensions.any { removedParamsFromUrl.endsWith(it) }) {
+                ZoomableUrlVideo(fullUrl)
+            } else {
+                null
+            }
+        }.associateBy { it.url }
+        val imageList = imagesForPager.values.toList()
+
+        val emojiMap =
+            tags.lists.filter { it.size > 2 && it[0] == "emoji" }.associate { ":${it[1]}:" to it[2] }
+
+        val segments = findTextSegments(content, imagesForPager.keys, urlSet, emojiMap, tags)
+
+        return RichTextViewerState(
+            urlSet.toImmutableSet(),
+            imagesForPager.toImmutableMap(),
+            imageList.toImmutableList(),
+            emojiMap.toImmutableMap(),
+            segments
+        )
+    }
+
+    private fun findTextSegments(content: String, images: Set<String>, urls: Set<String>, emojis: Map<String, String>, tags: ImmutableListOfLists<String>): ImmutableList<ImmutableList<Segment>> {
+        var paragraphSegments = persistentListOf<ImmutableList<Segment>>()
+
+        content.split('\n').forEach { paragraph ->
+            var segments = persistentListOf<Segment>()
+            var isDirty = false
+
+            val wordList = paragraph.split(' ')
+            wordList.forEach { word ->
+                val wordSegment = wordIdentifier(word, images, urls, emojis, tags)
+                if (wordSegment !is RegularTextSegment) {
+                    isDirty = true
+                }
+                segments = segments.add(wordSegment)
+            }
+
+            val newSegments = if (isDirty) {
+                if (isArabic(paragraph)) {
+                    segments.asReversed().toImmutableList()
+                } else {
+                    segments
+                }
+            } else {
+                persistentListOf<Segment>(RegularTextSegment(paragraph))
+            }
+
+            paragraphSegments = paragraphSegments.add(newSegments)
+        }
+
+        return paragraphSegments
+    }
+
+    fun isNumber(word: String): Boolean {
+        return numberPattern.matcher(word).matches()
+    }
+
+    fun isDate(word: String): Boolean {
+        return shortDatePattern.matcher(word).matches() || longDatePattern.matcher(word).matches()
+    }
+
+    private fun isArabic(text: String): Boolean {
+        return text.any { it in '\u0600'..'\u06FF' || it in '\u0750'..'\u077F' }
+    }
+
+    private fun wordIdentifier(word: String, images: Set<String>, urls: Set<String>, emojis: Map<String, String>, tags: ImmutableListOfLists<String>): Segment {
+        val emailMatcher = Patterns.EMAIL_ADDRESS.matcher(word)
+        val phoneMatcher = Patterns.PHONE.matcher(word)
+        val schemelessMatcher = noProtocolUrlValidator.matcher(word)
+
+        return if (word.isEmpty()) {
+            RegularTextSegment(word)
+        } else if (images.contains(word)) {
+            ImageSegment(word)
+        } else if (urls.contains(word)) {
+            LinkSegment(word)
+        } else if (emojis.any { word.contains(it.key) }) {
+            EmojiSegment(word)
+        } else if (word.startsWith("lnbc", true)) {
+            InvoiceSegment(word)
+        } else if (word.startsWith("lnurl", true)) {
+            WithdrawSegment(word)
+        } else if (word.startsWith("cashuA", true)) {
+            CashuSegment(word)
+        } else if (emailMatcher.matches()) {
+            EmailSegment(word)
+        } else if (word.length in 7..14 && !isDate(word) && phoneMatcher.matches()) {
+            PhoneSegment(word)
+        } else if (startsWithNIP19Scheme(word)) {
+            BechSegment(word)
+        } else if (word.startsWith("#")) {
+            parseHash(word, tags)
+        } else if (schemelessMatcher.find()) {
+            val url = schemelessMatcher.group(1) // url
+            val additionalChars = schemelessMatcher.group(4) // additional chars
+            if (url != null) {
+                SchemelessUrlSegment(word, url, additionalChars)
+            } else {
+                RegularTextSegment(word)
+            }
+        } else {
+            RegularTextSegment(word)
+        }
+    }
+
+    private fun parseHash(word: String, tags: ImmutableListOfLists<String>): Segment {
+        // First #[n]
+
+        val matcher = tagIndex.matcher(word)
+        try {
+            if (matcher.find()) {
+                val index = matcher.group(1)?.toInt()
+                val suffix = matcher.group(2)
+
+                if (index != null && index >= 0 && index < tags.lists.size) {
+                    val tag = tags.lists[index]
+
+                    if (tag.size > 1) {
+                        if (tag[0] == "p") {
+                            return HashIndexUserSegment(word, tag[1], suffix)
+                        } else if (tag[0] == "e" || tag[0] == "a") {
+                            return HashIndexEventSegment(word, tag[1], suffix)
+                        }
+                    }
+                }
+            }
+        } catch (e: Exception) {
+            Log.w("Tag Parser", "Couldn't link tag $word", e)
+        }
+
+        // Second #Amethyst
+        val hashtagMatcher = hashTagsPattern.matcher(word)
+
+        try {
+            if (hashtagMatcher.find()) {
+                val hashtag = hashtagMatcher.group(1)
+                if (hashtag != null) {
+                    return HashTagSegment(word, hashtag, hashtagMatcher.group(2))
+                }
+            }
+        } catch (e: Exception) {
+            Log.e("Hashtag Parser", "Couldn't link hashtag $word", e)
+        }
+
+        return RegularTextSegment(word)
+    }
+}
+
+@Immutable
+open class Segment(val segmentText: String)
+
+@Immutable
+class ImageSegment(segment: String) : Segment(segment)
+
+@Immutable
+class LinkSegment(segment: String) : Segment(segment)
+
+@Immutable
+class EmojiSegment(segment: String) : Segment(segment)
+
+@Immutable
+class InvoiceSegment(segment: String) : Segment(segment)
+
+@Immutable
+class WithdrawSegment(segment: String) : Segment(segment)
+
+@Immutable
+class CashuSegment(segment: String) : Segment(segment)
+
+@Immutable
+class EmailSegment(segment: String) : Segment(segment)
+
+@Immutable
+class PhoneSegment(segment: String) : Segment(segment)
+
+@Immutable
+class BechSegment(segment: String) : Segment(segment)
+
+@Immutable
+open class HashIndexSegment(segment: String, val hex: String, val extras: String?) : Segment(segment)
+
+@Immutable
+class HashIndexUserSegment(segment: String, hex: String, extras: String?) : HashIndexSegment(segment, hex, extras)
+
+@Immutable
+class HashIndexEventSegment(segment: String, hex: String, extras: String?) : HashIndexSegment(segment, hex, extras)
+
+@Immutable
+class HashTagSegment(segment: String, val hashtag: String, val extras: String?) : Segment(segment)
+
+@Immutable
+class SchemelessUrlSegment(segment: String, val url: String, val extras: String?) : Segment(segment)
+
+@Immutable
+class RegularTextSegment(segment: String) : Segment(segment)

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

@@ -0,0 +1,98 @@
+package com.vitorpamplona.amethyst.service
+
+import androidx.compose.runtime.Immutable
+import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
+import com.google.gson.JsonArray
+import com.google.gson.JsonObject
+import com.google.gson.JsonParser
+import com.vitorpamplona.amethyst.service.lnurl.LightningAddressResolver
+import com.vitorpamplona.amethyst.ui.components.GenericLoadable
+import okhttp3.MediaType.Companion.toMediaType
+import okhttp3.Request
+import okhttp3.RequestBody.Companion.toRequestBody
+import java.util.Base64
+
+@Immutable
+data class CashuToken(
+    val token: String,
+    val mint: String,
+    val totalAmount: Long,
+    val fees: Int,
+    val redeemInvoiceAmount: Long,
+    val proofs: JsonArray
+)
+
+class CashuProcessor {
+    fun parse(cashuToken: String): GenericLoadable<CashuToken> {
+        checkNotInMainThread()
+
+        try {
+            val base64token = cashuToken.replace("cashuA", "")
+            val cashu = JsonParser.parseString(String(Base64.getDecoder().decode(base64token)))
+            val token = cashu.asJsonObject.get("token").asJsonArray[0].asJsonObject
+            val proofs = token["proofs"].asJsonArray
+            val mint = token["mint"].asString
+
+            var totalAmount = 0L
+            for (proof in proofs) {
+                totalAmount += proof.asJsonObject["amount"].asLong
+            }
+            val fees = Math.max(((totalAmount * 0.02).toInt()), 2)
+            val redeemInvoiceAmount = totalAmount - fees
+
+            return GenericLoadable.Loaded(CashuToken(cashuToken, mint, totalAmount, fees, redeemInvoiceAmount, proofs))
+        } catch (e: Exception) {
+            return GenericLoadable.Error<CashuToken>("Could not parse this cashu token")
+        }
+    }
+
+    fun melt(token: CashuToken, lud16: String, onSuccess: (String) -> Unit, onError: (String) -> Unit) {
+        checkNotInMainThread()
+
+        runCatching {
+            LightningAddressResolver().lnAddressInvoice(
+                lnaddress = lud16,
+                milliSats = token.redeemInvoiceAmount * 1000, // Make invoice and leave room for fees
+                message = "Reedem Cashu",
+                onSuccess = { invoice ->
+                    meltInvoice(token, invoice, onSuccess, onError)
+                },
+                onProgress = {
+                },
+                onError = onError
+            )
+        }
+    }
+
+    private fun meltInvoice(token: CashuToken, invoice: String, onSuccess: (String) -> Unit, onError: (String) -> Unit) {
+        try {
+            val client = HttpClient.getHttpClient()
+            val url = token.mint + "/melt" // Melt cashu tokens at Mint
+
+            val jsonObject = JsonObject()
+            jsonObject.add("proofs", token.proofs)
+            jsonObject.addProperty("pr", invoice)
+
+            val mediaType = "application/json; charset=utf-8".toMediaType()
+            val requestBody = jsonObject.toString().toRequestBody(mediaType)
+            val request = Request.Builder()
+                .url(url)
+                .post(requestBody)
+                .build()
+
+            val response = client.newCall(request).execute()
+            val body = response.body.string()
+            val tree = jacksonObjectMapper().readTree(body)
+
+            val successful = tree?.get("paid")?.asText() == "true"
+
+            if (successful) {
+                onSuccess("Redeemed ${token.totalAmount} Sats" + " (Fees: ${token.fees} Sats)")
+            } else {
+                onError(tree?.get("detail")?.asText()?.split('.')?.getOrNull(0) ?: "Cashu: Tokens already spent.")
+            }
+        } catch (e: Exception) {
+            onError("Token melt failure: " + e.message)
+        }
+    }
+}

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

@@ -0,0 +1,23 @@
+package com.vitorpamplona.amethyst.service
+
+object HexValidator {
+
+    private fun isHex2(c: Char): Boolean {
+        return when (c) {
+            '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f', 'A', 'B', 'C', 'D', 'E', 'F', ' ' -> true
+            else -> false
+        }
+    }
+
+    fun isHex(hex: String?): Boolean {
+        if (hex == null) return false
+        var isHex = true
+        for (c in hex.toCharArray()) {
+            if (!isHex2(c)) {
+                isHex = false
+                break
+            }
+        }
+        return isHex
+    }
+}

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

@@ -1,7 +1,9 @@
 package com.vitorpamplona.amethyst.service
 
+import androidx.compose.runtime.Immutable
 import java.util.regex.Pattern
 
+@Immutable
 class NIP30Parser {
     val customEmojiPattern: Pattern = Pattern.compile("\\:([A-Za-z0-9_\\-]+)\\:", Pattern.CASE_INSENSITIVE)
 
@@ -18,7 +20,7 @@ class NIP30Parser {
 
         val regularChars = input.split(customEmojiPattern.toRegex())
 
-        var finalList = mutableListOf<String>()
+        val finalList = mutableListOf<String>()
         var index = 0
         for (e in regularChars) {
             finalList.add(e)

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

@@ -13,14 +13,15 @@ import okhttp3.Request
 import okhttp3.Response
 
 class Nip05Verifier() {
-    val client = HttpClient.getHttpClient()
-
     fun assembleUrl(nip05address: String): String? {
         val parts = nip05address.trim().split("@")
 
         if (parts.size == 2) {
             return "https://${parts[1]}/.well-known/nostr.json?name=${parts[0]}"
         }
+        if (parts.size == 1) {
+            return "https://${parts[0]}/.well-known/nostr.json?name=_"
+        }
 
         return null
     }
@@ -33,7 +34,7 @@ class Nip05Verifier() {
     }
 
     private suspend fun fetchNip05JsonSuspend(nip05: String, onSuccess: (String) -> Unit, onError: (String) -> Unit) {
-        // checkNotInMainThread()
+        checkNotInMainThread()
 
         val url = assembleUrl(nip05)
 
@@ -49,8 +50,10 @@ class Nip05Verifier() {
                     .url(url)
                     .build()
 
-                client.newCall(request).enqueue(object : Callback {
+                HttpClient.getHttpClient().newCall(request).enqueue(object : Callback {
                     override fun onResponse(call: Call, response: Response) {
+                        checkNotInMainThread()
+
                         response.use {
                             if (it.isSuccessful) {
                                 onSuccess(it.body.string())
@@ -73,13 +76,15 @@ class Nip05Verifier() {
 
     fun verifyNip05(nip05: String, onSuccess: (String) -> Unit, onError: (String) -> Unit) {
         // check fails on tests
-        // checkNotInMainThread()
+        checkNotInMainThread()
 
         val mapper = jacksonObjectMapper()
 
         fetchNip05Json(
             nip05,
             onSuccess = {
+                checkNotInMainThread()
+
                 // NIP05 usernames are case insensitive, but JSON properties are not
                 // converts the json to lowercase and then tries to access the username via a
                 // lowercase version of the username.
@@ -90,7 +95,12 @@ class Nip05Verifier() {
                     null
                 }
 
-                val user = nip05.split("@")[0].lowercase()
+                val parts = nip05.split("@")
+                val user = if (parts.size == 2) {
+                    parts[0].lowercase()
+                } else {
+                    "_"
+                }
 
                 val hexKey = nip05url?.get("names")?.get(user)?.asText()
 

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

@@ -80,6 +80,16 @@ object NostrAccountDataSource : NostrDataSource("AccountData") {
         )
     }
 
+    fun createAccountLastPostsListFilter(): TypedFilter {
+        return TypedFilter(
+            types = COMMON_FEED_TYPES,
+            filter = JsonFilter(
+                authors = listOf(account.userProfile().pubkeyHex),
+                limit = 400
+            )
+        )
+    }
+
     fun createNotificationFilter() = TypedFilter(
         types = COMMON_FEED_TYPES,
         filter = JsonFilter(
@@ -88,6 +98,7 @@ object NostrAccountDataSource : NostrDataSource("AccountData") {
                 PollNoteEvent.kind,
                 ReactionEvent.kind,
                 RepostEvent.kind,
+                GenericRepostEvent.kind,
                 ReportEvent.kind,
                 LnZapEvent.kind,
                 LnZapPaymentResponseEvent.kind,
@@ -112,7 +123,8 @@ object NostrAccountDataSource : NostrDataSource("AccountData") {
             createNotificationFilter(),
             createAccountReportsFilter(),
             createAccountAcceptedAwardsFilter(),
-            createAccountBookmarkListFilter()
+            createAccountBookmarkListFilter(),
+            createAccountLastPostsListFilter()
         ).ifEmpty { null }
     }
 

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

@@ -2,7 +2,10 @@ package com.vitorpamplona.amethyst.service
 
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.Channel
+import com.vitorpamplona.amethyst.model.LiveActivitiesChannel
+import com.vitorpamplona.amethyst.model.PublicChatChannel
 import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
+import com.vitorpamplona.amethyst.service.model.LiveActivitiesChatMessageEvent
 import com.vitorpamplona.amethyst.service.relays.FeedType
 import com.vitorpamplona.amethyst.service.relays.JsonFilter
 import com.vitorpamplona.amethyst.service.relays.TypedFilter
@@ -25,7 +28,7 @@ object NostrChannelDataSource : NostrDataSource("ChatroomFeed") {
     fun createMessagesByMeToChannelFilter(): TypedFilter? {
         val myAccount = account ?: return null
 
-        if (channel != null) {
+        if (channel is PublicChatChannel) {
             // Brings on messages by the user from all other relays.
             // Since we ship with write to public, read from private only
             // this guarantees that messages from the author do not disappear.
@@ -37,12 +40,24 @@ object NostrChannelDataSource : NostrDataSource("ChatroomFeed") {
                     limit = 50
                 )
             )
+        } else if (channel is LiveActivitiesChannel) {
+            // Brings on messages by the user from all other relays.
+            // Since we ship with write to public, read from private only
+            // this guarantees that messages from the author do not disappear.
+            return TypedFilter(
+                types = setOf(FeedType.FOLLOWS, FeedType.PRIVATE_DMS, FeedType.GLOBAL, FeedType.SEARCH),
+                filter = JsonFilter(
+                    kinds = listOf(LiveActivitiesChatMessageEvent.kind),
+                    authors = listOf(myAccount.userProfile().pubkeyHex),
+                    limit = 50
+                )
+            )
         }
         return null
     }
 
     fun createMessagesToChannelFilter(): TypedFilter? {
-        if (channel != null) {
+        if (channel is PublicChatChannel) {
             return TypedFilter(
                 types = setOf(FeedType.PUBLIC_CHATS),
                 filter = JsonFilter(
@@ -51,6 +66,15 @@ object NostrChannelDataSource : NostrDataSource("ChatroomFeed") {
                     limit = 200
                 )
             )
+        } else if (channel is LiveActivitiesChannel) {
+            return TypedFilter(
+                types = setOf(FeedType.PUBLIC_CHATS),
+                filter = JsonFilter(
+                    kinds = listOf(LiveActivitiesChatMessageEvent.kind),
+                    tags = mapOf("a" to listOfNotNull(channel?.idHex)),
+                    limit = 200
+                )
+            )
         }
         return null
     }

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

@@ -70,6 +70,7 @@ abstract class NostrDataSource(val debugName: String) {
     }
 
     init {
+        Log.d("Init", "${this.javaClass.simpleName} Subscribe")
         Client.subscribe(clientListener)
     }
 

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

@@ -1,28 +0,0 @@
-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
-import com.vitorpamplona.amethyst.service.relays.JsonFilter
-import com.vitorpamplona.amethyst.service.relays.TypedFilter
-
-object NostrGlobalDataSource : NostrDataSource("GlobalFeed") {
-    fun createGlobalFilter() = TypedFilter(
-        types = setOf(FeedType.GLOBAL),
-        filter = JsonFilter(
-            kinds = listOf(TextNoteEvent.kind, PollNoteEvent.kind, ChannelMessageEvent.kind, AudioTrackEvent.kind, PinListEvent.kind, LongTextNoteEvent.kind, HighlightEvent.kind),
-            limit = 200
-        )
-    )
-
-    val globalFeedChannel = requestNewChannel()
-
-    override fun updateChannelFilters() {
-        globalFeedChannel.typedFilters = listOf(createGlobalFilter()).ifEmpty { null }
-    }
-}

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

@@ -3,10 +3,14 @@ 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.GenericRepostEvent
 import com.vitorpamplona.amethyst.service.model.HighlightEvent
+import com.vitorpamplona.amethyst.service.model.LiveActivitiesChatMessageEvent
+import com.vitorpamplona.amethyst.service.model.LiveActivitiesEvent
 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.RepostEvent
 import com.vitorpamplona.amethyst.service.model.TextNoteEvent
 import com.vitorpamplona.amethyst.service.relays.EOSEAccount
 import com.vitorpamplona.amethyst.service.relays.FeedType
@@ -47,18 +51,29 @@ object NostrHomeDataSource : NostrDataSource("HomeFeed") {
     }
 
     fun createFollowAccountsFilter(): TypedFilter {
-        val follows = account.selectedUsersFollowList(account.defaultHomeFollowList) ?: emptySet()
+        val follows = account.selectedUsersFollowList(account.defaultHomeFollowList)
 
-        val followKeys = follows.map {
+        val followKeys = follows?.map {
             it.substring(0, 6)
         }
 
-        val followSet = followKeys.plus(account.userProfile().pubkeyHex.substring(0, 6))
+        val followSet = followKeys?.plus(account.userProfile().pubkeyHex.substring(0, 6))
 
         return TypedFilter(
             types = setOf(FeedType.FOLLOWS),
             filter = JsonFilter(
-                kinds = listOf(TextNoteEvent.kind, LongTextNoteEvent.kind, PollNoteEvent.kind, HighlightEvent.kind, AudioTrackEvent.kind, PinListEvent.kind),
+                kinds = listOf(
+                    TextNoteEvent.kind,
+                    RepostEvent.kind,
+                    GenericRepostEvent.kind,
+                    LongTextNoteEvent.kind,
+                    PollNoteEvent.kind,
+                    HighlightEvent.kind,
+                    AudioTrackEvent.kind,
+                    PinListEvent.kind,
+                    LiveActivitiesChatMessageEvent.kind,
+                    LiveActivitiesEvent.kind
+                ),
                 authors = followSet,
                 limit = 400,
                 since = latestEOSEs.users[account.userProfile()]?.followList?.get(account.defaultHomeFollowList)?.relayList

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

@@ -1,6 +1,8 @@
 package com.vitorpamplona.amethyst.service
 
+import com.vitorpamplona.amethyst.model.LiveActivitiesChannel
 import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.model.PublicChatChannel
 import com.vitorpamplona.amethyst.service.model.ChannelCreateEvent
 import com.vitorpamplona.amethyst.service.model.ChannelMetadataEvent
 import com.vitorpamplona.amethyst.service.relays.COMMON_FEED_TYPES
@@ -30,8 +32,8 @@ object NostrSingleChannelDataSource : NostrDataSource("SingleChannelFeed") {
 
     fun createLoadEventsIfNotLoadedFilter(): TypedFilter? {
         val directEventsToLoad = channelsToWatch
-            .map { LocalCache.getOrCreateChannel(it) }
-            .filter { it.notes.isEmpty() }
+            .mapNotNull { LocalCache.checkGetOrCreateChannel(it) }
+            .filter { it.notes.isEmpty() && it is PublicChatChannel }
 
         val interestedEvents = (directEventsToLoad).map { it.idHex }.toSet()
 
@@ -49,13 +51,43 @@ object NostrSingleChannelDataSource : NostrDataSource("SingleChannelFeed") {
         )
     }
 
+    fun createLoadStreamingIfNotLoadedFilter(): List<TypedFilter>? {
+        val directEventsToLoad = channelsToWatch
+            .mapNotNull { LocalCache.checkGetOrCreateChannel(it) }
+            .filterIsInstance<LiveActivitiesChannel>()
+            .filter { it.info == null }
+
+        val interestedEvents = (directEventsToLoad).map { it.idHex }.toSet()
+
+        if (interestedEvents.isEmpty()) {
+            return null
+        }
+
+        // downloads linked events to this event.
+        return directEventsToLoad.map {
+            it.address().let { aTag ->
+                TypedFilter(
+                    types = COMMON_FEED_TYPES,
+                    filter = JsonFilter(
+                        kinds = listOf(aTag.kind),
+                        tags = mapOf("d" to listOf(aTag.dTag)),
+                        authors = listOf(aTag.pubKeyHex.substring(0, 8))
+                    )
+                )
+            }
+        }
+    }
+
     val singleChannelChannel = requestNewChannel()
 
     override fun updateChannelFilters() {
         val reactions = createRepliesAndReactionsFilter()
         val missing = createLoadEventsIfNotLoadedFilter()
+        val missingStreaming = createLoadStreamingIfNotLoadedFilter()
 
-        singleChannelChannel.typedFilters = listOfNotNull(reactions, missing).ifEmpty { null }
+        singleChannelChannel.typedFilters = (
+            (listOfNotNull(reactions, missing)) + (missingStreaming ?: emptyList())
+            ).ifEmpty { null }
     }
 
     fun add(eventId: String) {

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

@@ -26,7 +26,7 @@ object NostrSingleEventDataSource : NostrDataSource("SingleEventFeed") {
                     filter = JsonFilter(
                         kinds = listOf(
                             TextNoteEvent.kind, LongTextNoteEvent.kind,
-                            ReactionEvent.kind, RepostEvent.kind, ReportEvent.kind,
+                            ReactionEvent.kind, RepostEvent.kind, GenericRepostEvent.kind, ReportEvent.kind,
                             LnZapEvent.kind, LnZapRequestEvent.kind,
                             BadgeAwardEvent.kind, BadgeDefinitionEvent.kind, BadgeProfilesEvent.kind,
                             PollNoteEvent.kind, AudioTrackEvent.kind, PinListEvent.kind,
@@ -77,6 +77,7 @@ object NostrSingleEventDataSource : NostrDataSource("SingleEventFeed") {
                         LongTextNoteEvent.kind,
                         ReactionEvent.kind,
                         RepostEvent.kind,
+                        GenericRepostEvent.kind,
                         ReportEvent.kind,
                         LnZapEvent.kind,
                         LnZapRequestEvent.kind,

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

@@ -28,7 +28,16 @@ object NostrUserProfileDataSource : NostrDataSource("UserProfileFeed") {
         TypedFilter(
             types = COMMON_FEED_TYPES,
             filter = JsonFilter(
-                kinds = listOf(TextNoteEvent.kind, RepostEvent.kind, LongTextNoteEvent.kind, AudioTrackEvent.kind, PinListEvent.kind, PollNoteEvent.kind, HighlightEvent.kind),
+                kinds = listOf(
+                    TextNoteEvent.kind,
+                    GenericRepostEvent.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/OnlineCheck.kt

@@ -0,0 +1,40 @@
+package com.vitorpamplona.amethyst.service
+
+import android.util.Log
+import android.util.LruCache
+import androidx.compose.runtime.Immutable
+import com.vitorpamplona.amethyst.BuildConfig
+import okhttp3.Request
+
+@Immutable
+data class OnlineCheckResult(val timeInMs: Long, val online: Boolean)
+
+object OnlineChecker {
+    val checkOnlineCache = LruCache<String, OnlineCheckResult>(10)
+    val fiveMinutes = 1000 * 60 * 5
+
+    fun isOnline(url: String?): Boolean {
+        checkNotInMainThread()
+
+        if (url.isNullOrBlank()) return false
+        if ((checkOnlineCache.get(url)?.timeInMs ?: 0) > System.currentTimeMillis() - fiveMinutes) {
+            return checkOnlineCache.get(url).online
+        }
+
+        val request = Request.Builder()
+            .header("User-Agent", "Amethyst/${BuildConfig.VERSION_NAME}")
+            .url(url)
+            .get()
+            .build()
+
+        return try {
+            val result = HttpClient.getHttpClient().newCall(request).execute().code == 200
+            checkOnlineCache.put(url, OnlineCheckResult(System.currentTimeMillis(), result))
+            result
+        } catch (e: Exception) {
+            checkOnlineCache.put(url, OnlineCheckResult(System.currentTimeMillis(), false))
+            Log.e("LiveActivities", "Failed to check streaming url $url", e)
+            false
+        }
+    }
+}

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

@@ -0,0 +1,23 @@
+package com.vitorpamplona.amethyst.service
+
+fun String.isUTF16Char(pos: Int): Boolean {
+    return Character.charCount(this.codePointAt(pos)) == 2
+}
+
+fun String.firstFullChar(): String {
+    return when (this.length) {
+        0, 1 -> return this
+        2, 3 -> return if (isUTF16Char(0)) this.take(2) else this.take(1)
+        else -> {
+            val first = isUTF16Char(0)
+            val second = isUTF16Char(2)
+            if (first && second) {
+                this.take(4)
+            } else if (first) {
+                this.take(2)
+            } else {
+                this.take(1)
+            }
+        }
+    }
+}

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

@@ -55,28 +55,32 @@ class LightningAddressResolver() {
             return
         }
 
-        withContext(Dispatchers.IO) {
-            val request: Request = Request.Builder()
-                .header("User-Agent", "Amethyst/${BuildConfig.VERSION_NAME}")
-                .url(url)
-                .build()
+        try {
+            withContext(Dispatchers.IO) {
+                val request: Request = Request.Builder()
+                    .header("User-Agent", "Amethyst/${BuildConfig.VERSION_NAME}")
+                    .url(url)
+                    .build()
 
-            client.newCall(request).enqueue(object : Callback {
-                override fun onResponse(call: Call, response: Response) {
-                    response.use {
-                        if (it.isSuccessful) {
-                            onSuccess(it.body.string())
-                        } else {
-                            onError("Could not resolve $lnaddress. Error: ${it.code}. Check if the server up and if the lightning address $lnaddress is correct")
+                client.newCall(request).enqueue(object : Callback {
+                    override fun onResponse(call: Call, response: Response) {
+                        response.use {
+                            if (it.isSuccessful) {
+                                onSuccess(it.body.string())
+                            } else {
+                                onError("Could not resolve $lnaddress. Error: ${it.code}. Check if the server up and if the lightning address $lnaddress is correct")
+                            }
                         }
                     }
-                }
 
-                override fun onFailure(call: Call, e: java.io.IOException) {
-                    onError("Could not resolve $url. Check if the server up and if the lightning address $lnaddress is correct")
-                    e.printStackTrace()
-                }
-            })
+                    override fun onFailure(call: Call, e: java.io.IOException) {
+                        onError("Could not resolve $url. Check if the server up and if the lightning address $lnaddress is correct")
+                        e.printStackTrace()
+                    }
+                })
+            }
+        } catch (e: Exception) {
+            onError("Could not resolve $url. Check if the server up and if the lightning address $lnaddress is correct")
         }
     }
 

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

@@ -18,7 +18,7 @@ open class BaseTextNoteEvent(
     sig: HexKey
 ) : Event(id, pubKey, createdAt, kind, tags, content, sig) {
     fun mentions() = taggedUsers()
-    open fun replyTos() = tags.filter { it.firstOrNull() == "e" }.mapNotNull { it.getOrNull(1) }
+    open fun replyTos() = taggedEvents()
 
     private var citedUsersCache: Set<HexKey>? = null
     private var citedNotesCache: Set<HexKey>? = null

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

@@ -46,5 +46,6 @@ class ChannelCreateEvent(
         }
     }
 
-    data class ChannelData(var name: String?, var about: String?, var picture: String?)
+    @Immutable
+    data class ChannelData(val name: String?, val about: String?, val picture: String?)
 }

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

@@ -35,7 +35,8 @@ class ChannelMessageEvent(
             zapReceiver: String?,
             privateKey: ByteArray,
             createdAt: Long = Date().time / 1000,
-            markAsSensitive: Boolean
+            markAsSensitive: Boolean,
+            zapRaiserAmount: Long?
         ): ChannelMessageEvent {
             val content = message
             val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
@@ -54,6 +55,9 @@ class ChannelMessageEvent(
             if (markAsSensitive) {
                 tags.add(listOf("content-warning", ""))
             }
+            zapRaiserAmount?.let {
+                tags.add(listOf("zapraiser", "$it"))
+            }
 
             val id = generateId(pubKey, createdAt, kind, tags, content)
             val sig = Utils.sign(id, privateKey)

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

@@ -2,6 +2,7 @@ package com.vitorpamplona.amethyst.service.model
 
 import android.util.Log
 import androidx.compose.runtime.Immutable
+import androidx.compose.runtime.Stable
 import com.google.gson.reflect.TypeToken
 import com.vitorpamplona.amethyst.model.HexKey
 import com.vitorpamplona.amethyst.model.decodePublicKey
@@ -12,6 +13,7 @@ import java.util.Date
 @Immutable
 data class Contact(val pubKeyHex: String, val relayUri: String?)
 
+@Stable
 class ContactListEvent(
     id: HexKey,
     pubKey: HexKey,

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

@@ -54,6 +54,10 @@ open class Event(
             (it.size > 1 && it[0] == "t" && it[1].equals("nude", true))
     }
 
+    override fun zapraiserAmount() = tags.firstOrNull() {
+        (it.size > 1 && it[0] == "zapraiser")
+    }?.get(1)?.toLongOrNull()
+
     override fun zapAddress() = tags.firstOrNull { it.size > 1 && it[0] == "zap" }?.get(1)
 
     fun taggedAddresses() = tags.filter { it.size > 1 && it[0] == "a" }.mapNotNull {
@@ -245,7 +249,10 @@ open class Event(
             FileHeaderEvent.kind -> FileHeaderEvent(id, pubKey, createdAt, tags, content, sig)
             FileStorageEvent.kind -> FileStorageEvent(id, pubKey, createdAt, tags, content, sig)
             FileStorageHeaderEvent.kind -> FileStorageHeaderEvent(id, pubKey, createdAt, tags, content, sig)
+            GenericRepostEvent.kind -> GenericRepostEvent(id, pubKey, createdAt, tags, content, sig)
             HighlightEvent.kind -> HighlightEvent(id, pubKey, createdAt, tags, content, sig)
+            LiveActivitiesEvent.kind -> LiveActivitiesEvent(id, pubKey, createdAt, tags, content, sig)
+            LiveActivitiesChatMessageEvent.kind -> LiveActivitiesChatMessageEvent(id, pubKey, createdAt, tags, content, sig)
             LnZapEvent.kind -> LnZapEvent(id, pubKey, createdAt, tags, content, sig)
             LnZapPaymentRequestEvent.kind -> LnZapPaymentRequestEvent(id, pubKey, createdAt, tags, content, sig)
             LnZapPaymentResponseEvent.kind -> LnZapPaymentResponseEvent(id, pubKey, createdAt, tags, content, sig)

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

@@ -38,4 +38,5 @@ interface EventInterface {
 
     fun zapAddress(): String?
     fun isSensitive(): Boolean
+    fun zapraiserAmount(): Long?
 }

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

@@ -0,0 +1,52 @@
+package com.vitorpamplona.amethyst.service.model
+
+import androidx.compose.runtime.Immutable
+import com.vitorpamplona.amethyst.model.HexKey
+import com.vitorpamplona.amethyst.model.toHexKey
+import com.vitorpamplona.amethyst.service.relays.Client
+import nostr.postr.Utils
+import java.util.Date
+
+@Immutable
+class GenericRepostEvent(
+    id: HexKey,
+    pubKey: HexKey,
+    createdAt: Long,
+    tags: List<List<String>>,
+    content: String,
+    sig: HexKey
+) : Event(id, pubKey, createdAt, kind, tags, content, sig) {
+
+    fun boostedPost() = tags.filter { it.firstOrNull() == "e" }.mapNotNull { it.getOrNull(1) }
+    fun originalAuthor() = tags.filter { it.firstOrNull() == "p" }.mapNotNull { it.getOrNull(1) }
+
+    fun containedPost() = try {
+        fromJson(content, Client.lenient)
+    } catch (e: Exception) {
+        null
+    }
+
+    companion object {
+        const val kind = 16
+
+        fun create(boostedPost: EventInterface, privateKey: ByteArray, createdAt: Long = Date().time / 1000): GenericRepostEvent {
+            val content = boostedPost.toJson()
+
+            val replyToPost = listOf("e", boostedPost.id())
+            val replyToAuthor = listOf("p", boostedPost.pubKey())
+
+            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
+            var tags: List<List<String>> = listOf(replyToPost, replyToAuthor)
+
+            if (boostedPost is AddressableEvent) {
+                tags = tags + listOf(listOf("a", boostedPost.address().toTag()))
+            }
+
+            tags = tags + listOf(listOf("k", "${boostedPost.kind()}"))
+
+            val id = generateId(pubKey, createdAt, kind, tags, content)
+            val sig = Utils.sign(id, privateKey)
+            return GenericRepostEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())
+        }
+    }
+}

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

@@ -0,0 +1,49 @@
+package com.vitorpamplona.amethyst.service.model
+
+import androidx.compose.runtime.Immutable
+import com.vitorpamplona.amethyst.model.HexKey
+import com.vitorpamplona.amethyst.model.toHexKey
+import nostr.postr.Utils
+import java.security.MessageDigest
+import java.util.Date
+
+@Immutable
+class HTTPAuthorizationEvent(
+    id: HexKey,
+    pubKey: HexKey,
+    createdAt: Long,
+    tags: List<List<String>>,
+    content: String,
+    sig: HexKey
+) : Event(id, pubKey, createdAt, kind, tags, content, sig) {
+
+    companion object {
+        const val kind = 27235
+
+        fun create(
+            url: String,
+            method: String,
+            body: String? = null,
+            privateKey: ByteArray,
+            createdAt: Long = Date().time / 1000
+        ): HTTPAuthorizationEvent {
+            val sha256 = MessageDigest.getInstance("SHA-256")
+
+            var hash = ""
+            body?.let {
+                hash = sha256.digest(it.toByteArray()).toHexKey()
+            }
+
+            val tags = listOfNotNull(
+                listOf("u", url),
+                listOf("method", method),
+                listOf("payload", hash)
+            )
+
+            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
+            val id = generateId(pubKey, createdAt, kind, tags, "")
+            val sig = Utils.sign(id, privateKey)
+            return HTTPAuthorizationEvent(id.toHexKey(), pubKey, createdAt, tags, "", sig.toHexKey())
+        }
+    }
+}

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

@@ -0,0 +1,82 @@
+package com.vitorpamplona.amethyst.service.model
+
+import androidx.compose.runtime.Immutable
+import com.vitorpamplona.amethyst.model.HexKey
+import com.vitorpamplona.amethyst.model.toHexKey
+import nostr.postr.Utils
+import java.util.Date
+
+@Immutable
+class LiveActivitiesChatMessageEvent(
+    id: HexKey,
+    pubKey: HexKey,
+    createdAt: Long,
+    tags: List<List<String>>,
+    content: String,
+    sig: HexKey
+) : BaseTextNoteEvent(id, pubKey, createdAt, kind, tags, content, sig) {
+
+    private fun innerActivity() = tags.firstOrNull {
+        it.size > 3 && it[0] == "a" && it[3] == "root"
+    } ?: tags.firstOrNull {
+        it.size > 1 && it[0] == "a"
+    }
+
+    private fun activityHex() = innerActivity()?.let {
+        it.getOrNull(1)
+    }
+
+    fun activity() = innerActivity()?.let {
+        if (it.size > 1) {
+            val aTagValue = it[1]
+            val relay = it.getOrNull(2)
+
+            ATag.parse(aTagValue, relay)
+        } else {
+            null
+        }
+    }
+
+    override fun replyTos() = taggedEvents().minus(activityHex() ?: "")
+
+    companion object {
+        const val kind = 1311
+
+        fun create(
+            message: String,
+            activity: ATag,
+            replyTos: List<String>? = null,
+            mentions: List<String>? = null,
+            zapReceiver: String?,
+            privateKey: ByteArray,
+            createdAt: Long = Date().time / 1000,
+            markAsSensitive: Boolean,
+            zapRaiserAmount: Long?
+        ): LiveActivitiesChatMessageEvent {
+            val content = message
+            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
+            val tags = mutableListOf(
+                listOf("a", activity.toTag(), "", "root")
+            )
+            replyTos?.forEach {
+                tags.add(listOf("e", it))
+            }
+            mentions?.forEach {
+                tags.add(listOf("p", it))
+            }
+            zapReceiver?.let {
+                tags.add(listOf("zap", it))
+            }
+            if (markAsSensitive) {
+                tags.add(listOf("content-warning", ""))
+            }
+            zapRaiserAmount?.let {
+                tags.add(listOf("zapraiser", "$it"))
+            }
+
+            val id = generateId(pubKey, createdAt, kind, tags, content)
+            val sig = Utils.sign(id, privateKey)
+            return LiveActivitiesChatMessageEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())
+        }
+    }
+}

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

@@ -0,0 +1,48 @@
+package com.vitorpamplona.amethyst.service.model
+
+import androidx.compose.runtime.Immutable
+import com.vitorpamplona.amethyst.model.HexKey
+import com.vitorpamplona.amethyst.model.toHexKey
+import nostr.postr.Utils
+import java.util.Date
+
+@Immutable
+class LiveActivitiesEvent(
+    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 title() = tags.firstOrNull { it.size > 1 && it[0] == "title" }?.get(1)
+    fun summary() = tags.firstOrNull { it.size > 1 && it[0] == "summary" }?.get(1)
+    fun image() = tags.firstOrNull { it.size > 1 && it[0] == "image" }?.get(1)
+    fun streaming() = tags.firstOrNull { it.size > 1 && it[0] == "streaming" }?.get(1)
+    fun starts() = tags.firstOrNull { it.size > 1 && it[0] == "starts" }?.get(1)
+    fun ends() = tags.firstOrNull { it.size > 1 && it[0] == "ends" }?.get(1)
+    fun status() = tags.firstOrNull { it.size > 1 && it[0] == "status" }?.get(1)
+    fun currentParticipants() = tags.firstOrNull { it.size > 1 && it[0] == "current_participants" }?.get(1)
+    fun totalParticipants() = tags.firstOrNull { it.size > 1 && it[0] == "total_participants" }?.get(1)
+
+    fun participants() = tags.filter { it.size > 1 && it[0] == "p" }.map { Participant(it[1], it.getOrNull(2)) }
+
+    companion object {
+        const val kind = 30311
+
+        fun create(
+            privateKey: ByteArray,
+            createdAt: Long = Date().time / 1000
+        ): LiveActivitiesEvent {
+            val tags = mutableListOf<List<String>>()
+            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
+            val id = generateId(pubKey, createdAt, kind, tags, "")
+            val sig = Utils.sign(id, privateKey)
+            return LiveActivitiesEvent(id.toHexKey(), pubKey, createdAt, tags, "", sig.toHexKey())
+        }
+    }
+}

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

@@ -24,7 +24,7 @@ class LongTextNoteEvent(
     fun summary() = tags.filter { it.firstOrNull() == "summary" }.mapNotNull { it.getOrNull(1) }.firstOrNull()
 
     fun publishedAt() = try {
-        tags.filter { it.firstOrNull() == "published_at" }.mapNotNull { it.getOrNull(1) }.firstOrNull()?.toLong()
+        tags.firstOrNull { it.size > 1 && it[0] == "published_at" }?.get(1)?.toLongOrNull()
     } catch (_: Exception) {
         null
     }

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

@@ -1,6 +1,7 @@
 package com.vitorpamplona.amethyst.service.model
 
 import android.util.Log
+import androidx.compose.runtime.Stable
 import com.fasterxml.jackson.databind.DeserializationFeature
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import com.google.gson.Gson
@@ -12,9 +13,10 @@ import nostr.postr.Utils
 import java.io.ByteArrayInputStream
 import java.util.Date
 
+@Stable
 abstract class IdentityClaim(
-    var identity: String,
-    var proof: String
+    val identity: String,
+    val proof: String
 ) {
     abstract fun toProofUrl(): String
     abstract fun toIcon(): Int

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

@@ -52,7 +52,8 @@ class PollNoteEvent(
             consensusThreshold: Int?,
             closedAt: Int?,
             zapReceiver: String?,
-            markAsSensitive: Boolean
+            markAsSensitive: Boolean,
+            zapRaiserAmount: Long?
         ): PollNoteEvent {
             val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
             val tags = mutableListOf<List<String>>()
@@ -79,6 +80,9 @@ class PollNoteEvent(
             if (markAsSensitive) {
                 tags.add(listOf("content-warning", ""))
             }
+            zapRaiserAmount?.let {
+                tags.add(listOf("zapraiser", "$it"))
+            }
 
             val id = generateId(pubKey, createdAt, kind, tags, msg)
             val sig = Utils.sign(id, privateKey)

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

@@ -4,6 +4,7 @@ import android.util.Log
 import androidx.compose.runtime.Immutable
 import com.vitorpamplona.amethyst.model.HexKey
 import com.vitorpamplona.amethyst.model.toHexKey
+import com.vitorpamplona.amethyst.service.HexValidator
 import fr.acinq.secp256k1.Hex
 import nostr.postr.Utils
 import nostr.postr.toHex
@@ -23,11 +24,18 @@ class PrivateDmEvent(
      * nip-04 EncryptedDmEvent but may omit the recipient, too. This value can be queried and used
      * for initial messages.
      */
-    private fun recipientPubKey() = tags.firstOrNull { it.size > 1 && it[0] == "p" }
+    private fun recipientPubKey() = tags.firstOrNull { it.size > 1 && it[0] == "p" }?.get(1)
 
-    fun recipientPubKeyBytes() = recipientPubKey()?.runCatching { Hex.decode(this[1]) }?.getOrNull()
+    fun recipientPubKeyBytes() = recipientPubKey()?.runCatching { Hex.decode(this) }?.getOrNull()
 
-    fun verifiedRecipientPubKey() = recipientPubKey()?.runCatching { Hex.decode(this[1]).toHexKey() }?.getOrNull() // makes sure its a valid one
+    fun verifiedRecipientPubKey(): HexKey? {
+        val recipient = recipientPubKey()
+        return if (HexValidator.isHex(recipient)) {
+            recipient
+        } else {
+            null
+        }
+    }
 
     fun talkingWith(oneSideHex: String): HexKey {
         return if (pubKey == oneSideHex) verifiedRecipientPubKey() ?: pubKey else pubKey
@@ -78,7 +86,8 @@ class PrivateDmEvent(
             createdAt: Long = Date().time / 1000,
             publishedRecipientPubKey: ByteArray? = null,
             advertiseNip18: Boolean = true,
-            markAsSensitive: Boolean
+            markAsSensitive: Boolean,
+            zapRaiserAmount: Long?
         ): PrivateDmEvent {
             val content = Utils.encrypt(
                 if (advertiseNip18) { nip18Advertisement } else { "" } + msg,
@@ -102,6 +111,9 @@ class PrivateDmEvent(
             if (markAsSensitive) {
                 tags.add(listOf("content-warning", ""))
             }
+            zapRaiserAmount?.let {
+                tags.add(listOf("zapraiser", "$it"))
+            }
             val id = generateId(pubKey, createdAt, kind, tags, content)
             val sig = Utils.sign(id, privateKey)
             return PrivateDmEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())

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

@@ -17,8 +17,8 @@ class RepostEvent(
     sig: HexKey
 ) : Event(id, pubKey, createdAt, kind, tags, content, sig) {
 
-    fun boostedPost() = tags.filter { it.firstOrNull() == "e" }.mapNotNull { it.getOrNull(1) }
-    fun originalAuthor() = tags.filter { it.firstOrNull() == "p" }.mapNotNull { it.getOrNull(1) }
+    fun boostedPost() = taggedEvents()
+    fun originalAuthor() = taggedUsers()
 
     fun containedPost() = try {
         fromJson(content, Client.lenient)
@@ -36,7 +36,7 @@ class RepostEvent(
             val replyToAuthor = listOf("p", boostedPost.pubKey())
 
             val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
-            var tags: List<List<String>> = boostedPost.tags().plus(listOf(replyToPost, replyToAuthor))
+            var tags: List<List<String>> = listOf(replyToPost, replyToAuthor)
 
             if (boostedPost is AddressableEvent) {
                 tags = tags + listOf(listOf("a", boostedPost.address().toTag()))

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

@@ -34,6 +34,7 @@ class TextNoteEvent(
             extraTags: List<String>?,
             zapReceiver: String?,
             markAsSensitive: Boolean,
+            zapRaiserAmount: Long?,
             replyingTo: String?,
             root: String?,
             directMentions: Set<HexKey>,
@@ -89,6 +90,9 @@ class TextNoteEvent(
             if (markAsSensitive) {
                 tags.add(listOf("content-warning", ""))
             }
+            zapRaiserAmount?.let {
+                tags.add(listOf("zapraiser", "$it"))
+            }
 
             val id = generateId(pubKey, createdAt, kind, tags, msg)
             val sig = Utils.sign(id, privateKey)

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

@@ -67,7 +67,7 @@ object Nip19 {
             }
             parsed?.copy(additionalChars = additionalChars ?: "")
         } catch (e: Throwable) {
-            Log.e("NIP19 Parser", "Issue trying to Decode NIP19 $key: ${e.message}", e)
+            Log.w("NIP19 Parser", "Issue trying to Decode NIP19 $key: ${e.message}", e)
             null
         }
     }

app/src/main/java/com/vitorpamplona/amethyst/service/tts/TextToSpeechEngine.kt

@@ -0,0 +1,162 @@
+/*
+ * Created by Ayaan on 02/02/23, 10:30 pm
+ * Copyright (c) 2023 . All rights reserved.
+ * Last modified 02/02/23, 9:56 pm
+ */
+
+package com.vitorpamplona.amethyst.service.tts
+
+import android.content.Context
+import android.speech.tts.TextToSpeech
+import android.speech.tts.UtteranceProgressListener
+import java.util.Locale
+
+const val DEF_SPEECH_AND_PITCH = 0.8f
+
+fun getErrorText(errorCode: Int): String = when (errorCode) {
+    TextToSpeech.ERROR -> "ERROR"
+    TextToSpeech.ERROR_INVALID_REQUEST -> "ERROR_INVALID_REQUEST"
+    TextToSpeech.ERROR_NETWORK -> "ERROR_NETWORK"
+    TextToSpeech.ERROR_NETWORK_TIMEOUT -> "ERROR_NETWORK_TIMEOUT"
+    TextToSpeech.ERROR_SERVICE -> "ERROR_SERVICE"
+    TextToSpeech.ERROR_SYNTHESIS -> "ERROR_SYNTHESIS"
+    TextToSpeech.ERROR_NOT_INSTALLED_YET -> "ERROR_NOT_INSTALLED_YET"
+    else -> "UNKNOWN"
+}
+
+class TextToSpeechEngine private constructor() {
+    private var tts: TextToSpeech? = null
+
+    private var defaultPitch = 0.8f
+    private var defaultSpeed = 0.8f
+    private var defLanguage = Locale.getDefault()
+    private var onStartListener: (() -> Unit)? = null
+    private var onDoneListener: (() -> Unit)? = null
+    private var onErrorListener: ((String) -> Unit)? = null
+    private var onHighlightListener: ((Int, Int) -> Unit)? = null
+    private var message: String? = null
+
+    companion object {
+        private var instance: TextToSpeechEngine? = null
+        fun getInstance(): TextToSpeechEngine {
+            if (instance == null) {
+                instance = TextToSpeechEngine()
+            }
+            return instance!!
+        }
+    }
+
+    fun initTTS(context: Context, message: String) {
+        tts = TextToSpeech(context) {
+            if (it == TextToSpeech.SUCCESS) {
+                tts!!.language = defLanguage
+                tts!!.setPitch(defaultPitch)
+                tts!!.setSpeechRate(defaultSpeed)
+                tts!!.setListener(
+                    onStart = {
+                        onStartListener?.invoke()
+                    },
+                    onError = { e ->
+                        e?.let { error ->
+                            onErrorListener?.invoke(error)
+                        }
+                    },
+                    onRange = { start, end ->
+                        if (this@TextToSpeechEngine.message != null) {
+                            onHighlightListener?.invoke(start, end)
+                        }
+                    },
+                    onDone = {
+                        onStartListener?.invoke()
+                    }
+                )
+                speak(message)
+            } else {
+                onErrorListener?.invoke(getErrorText(it))
+            }
+        }
+    }
+
+    private fun speak(message: String): TextToSpeechEngine {
+        tts!!.speak(
+            message,
+            TextToSpeech.QUEUE_FLUSH,
+            null,
+            TextToSpeech.ACTION_TTS_QUEUE_PROCESSING_COMPLETED
+        )
+        return this
+    }
+
+    fun setPitchAndSpeed(pitch: Float, speed: Float) {
+        defaultPitch = pitch
+        defaultSpeed = speed
+    }
+
+    fun resetPitchAndSpeed() {
+        defaultPitch = DEF_SPEECH_AND_PITCH
+        defaultSpeed = DEF_SPEECH_AND_PITCH
+    }
+
+    fun setLanguage(local: Locale): TextToSpeechEngine {
+        this.defLanguage = local
+        return this
+    }
+
+    fun setHighlightedMessage(message: String) {
+        this.message = message
+    }
+
+    fun setOnStartListener(onStartListener: (() -> Unit)): TextToSpeechEngine {
+        this.onStartListener = onStartListener
+        return this
+    }
+
+    fun setOnCompletionListener(onDoneListener: () -> Unit): TextToSpeechEngine {
+        this.onDoneListener = onDoneListener
+        return this
+    }
+
+    fun setOnErrorListener(onErrorListener: (String) -> Unit): TextToSpeechEngine {
+        this.onErrorListener = onErrorListener
+        return this
+    }
+
+    fun setOnHighlightListener(onHighlightListener: (Int, Int) -> Unit): TextToSpeechEngine {
+        this.onHighlightListener = onHighlightListener
+        return this
+    }
+
+    fun destroy() {
+        tts?.stop()
+        tts?.shutdown()
+        tts = null
+        instance = null
+    }
+}
+
+inline fun TextToSpeech.setListener(
+    crossinline onStart: (String?) -> Unit = {},
+    crossinline onError: (String?) -> Unit = {},
+    crossinline onRange: (Int, Int) -> Unit = { _, _ -> },
+    crossinline onDone: (String?) -> Unit
+) = this.apply {
+    setOnUtteranceProgressListener(object : UtteranceProgressListener() {
+        override fun onStart(p0: String?) {
+            onStart.invoke(p0)
+        }
+
+        override fun onDone(p0: String?) {
+            onDone.invoke(p0)
+        }
+
+        @Deprecated("Deprecated in Java", ReplaceWith("onError.invoke(p0)"))
+        override fun onError(p0: String?) {
+            onError.invoke(p0)
+        }
+
+        override fun onRangeStart(utteranceId: String?, start: Int, end: Int, frame: Int) {
+            super.onRangeStart(utteranceId, start, end, frame)
+            onRange.invoke(start, end)
+        }
+    })
+}

app/src/main/java/com/vitorpamplona/amethyst/service/tts/TextToSpeechHelper.kt

@@ -0,0 +1,160 @@
+/*
+ * Created by Ayaan on 02/02/23, 10:30 pm
+ * Copyright (c) 2023 . All rights reserved.
+ * Last modified 02/02/23, 10:19 pm
+ */
+
+package com.vitorpamplona.amethyst.service.tts
+
+import android.content.Context
+import android.util.Log
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleEventObserver
+import androidx.lifecycle.LifecycleOwner
+import java.lang.ref.WeakReference
+import java.util.Locale
+
+class TextToSpeechHelper private constructor(private val context: WeakReference<Context>) :
+    LifecycleEventObserver {
+    private val appContext
+        get() = context.get()!!.applicationContext
+
+    private var message: String? = null
+
+    private var tts: TextToSpeechEngine? = null
+
+    private var onStart: (() -> Unit)? = null
+
+    private var onDoneListener: (() -> Unit)? = null
+
+    private var onErrorListener: ((String) -> Unit)? = null
+
+    private var onHighlightListener: ((Pair<Int, Int>) -> Unit)? = null
+
+    private var customActionForDestroy: (() -> Unit)? = null
+
+    init {
+        Log.d("Init", "Init TTS")
+        initTTS()
+    }
+
+    fun registerLifecycle(owner: LifecycleOwner): TextToSpeechHelper {
+        owner.lifecycle.addObserver(this)
+        return this
+    }
+
+    private fun initTTS() = context.get()?.run {
+        tts = TextToSpeechEngine.getInstance()
+            .setOnCompletionListener { onDoneListener?.invoke() }
+            .setOnErrorListener { onErrorListener?.invoke(it) }
+            .setOnStartListener { onStart?.invoke() }
+    }
+
+    fun speak(message: String): TextToSpeechHelper {
+        if (tts == null) {
+            initTTS()
+        }
+        this.message = message
+
+        tts?.initTTS(
+            appContext,
+            message
+        )
+        return this
+    }
+
+    /**
+     * This method will highlight the text in the textView
+     *
+     * @exception Exception("Message can't be null for highlighting !! Call speak() first")
+     */
+    fun highlight(): TextToSpeechHelper {
+        if (message == null) throw Exception("Message can't be null for highlighting !! Call speak() first")
+        tts?.setHighlightedMessage(message!!)
+        tts?.setOnHighlightListener { i, i2 ->
+            onHighlightListener?.invoke(Pair(i, i2))
+        }
+        return this
+    }
+
+    fun removeHighlight(): TextToSpeechHelper {
+        message = null
+        onHighlightListener = null
+        return this
+    }
+
+    fun destroy(
+        action: (() -> Unit) = {}
+    ) {
+        tts?.destroy()
+        tts = null
+        action.invoke()
+        INSTANCE = null
+    }
+
+    fun onStart(onStartListener: () -> Unit): TextToSpeechHelper {
+        this.onStart = onStartListener
+        return this
+    }
+
+    fun onDone(onCompleteListener: () -> Unit): TextToSpeechHelper {
+        this.onDoneListener = onCompleteListener
+        return this
+    }
+
+    fun onError(onErrorListener: (String) -> Unit): TextToSpeechHelper {
+        this.onErrorListener = onErrorListener
+        return this
+    }
+
+    fun onHighlight(onHighlightListener: (Pair<Int, Int>) -> Unit): TextToSpeechHelper {
+        this.onHighlightListener = onHighlightListener
+        return this
+    }
+
+    fun setCustomActionForDestroy(action: () -> Unit): TextToSpeechHelper {
+        customActionForDestroy = action
+        return this
+    }
+
+    fun setLanguage(locale: Locale): TextToSpeechHelper {
+        tts?.setLanguage(locale)
+        return this
+    }
+
+    fun setPitchAndSpeed(
+        pitch: Float = DEF_SPEECH_AND_PITCH,
+        speed: Float = DEF_SPEECH_AND_PITCH
+    ): TextToSpeechHelper {
+        tts?.setPitchAndSpeed(pitch, speed)
+        return this
+    }
+
+    fun resetPitchAndSpeed(): TextToSpeechHelper {
+        tts?.resetPitchAndSpeed()
+        return this
+    }
+
+    companion object {
+        private var INSTANCE: TextToSpeechHelper? = null
+        fun getInstance(context: Context): TextToSpeechHelper {
+            synchronized(TextToSpeechHelper::class.java) {
+                if (INSTANCE == null) {
+                    INSTANCE = TextToSpeechHelper(WeakReference(context))
+                }
+                return INSTANCE!!
+            }
+        }
+    }
+
+    override fun onStateChanged(source: LifecycleOwner, event: Lifecycle.Event) {
+        if (event == Lifecycle.Event.ON_DESTROY ||
+            event == Lifecycle.Event.ON_STOP ||
+            event == Lifecycle.Event.ON_PAUSE
+        ) {
+            destroy {
+                customActionForDestroy?.invoke()
+            }
+        }
+    }
+}

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

@@ -39,6 +39,7 @@ import java.net.URLEncoder
 import java.nio.charset.StandardCharsets
 
 class MainActivity : FragmentActivity() {
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 

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

@@ -7,19 +7,21 @@ import android.webkit.MimeTypeMap
 import androidx.core.net.toFile
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import com.vitorpamplona.amethyst.BuildConfig
+import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.service.HttpClient
 import okhttp3.*
 import okhttp3.MediaType.Companion.toMediaType
 import okio.BufferedSink
+import okio.IOException
 import okio.source
-import java.io.IOException
 import java.io.InputStream
+import java.util.Base64
 
 val charPool: List<Char> = ('a'..'z') + ('A'..'Z') + ('0'..'9')
 
 fun randomChars() = List(16) { charPool.random() }.joinToString("")
-
 object ImageUploader {
+    lateinit var account: Account
 
     fun uploadImage(
         uri: Uri,
@@ -33,12 +35,11 @@ object ImageUploader {
         val myContentType = contentType ?: contentResolver.getType(uri)
         val imageInputStream = contentResolver.openInputStream(uri)
 
-        val length = size
-            ?: contentResolver.query(uri, null, null, null, null)?.use {
-                it.moveToFirst()
-                val sizeIndex = it.getColumnIndex(OpenableColumns.SIZE)
-                it.getLong(sizeIndex)
-            } ?: kotlin.runCatching {
+        val length = size ?: contentResolver.query(uri, null, null, null, null)?.use {
+            it.moveToFirst()
+            val sizeIndex = it.getColumnIndex(OpenableColumns.SIZE)
+            it.getLong(sizeIndex)
+        } ?: kotlin.runCatching {
             uri.toFile().length()
         }.getOrNull() ?: 0
 
@@ -58,6 +59,9 @@ object ImageUploader {
             ServersAvailable.NOSTRFILES_DEV, ServersAvailable.NOSTRFILES_DEV_NIP_94 -> {
                 NostrFilesDevServer()
             }
+            ServersAvailable.NOSTRCHECK_ME, ServersAvailable.NOSTRCHECK_ME_NIP_94 -> {
+                NostrCheckMeServer()
+            }
             else -> {
                 NostrBuildServer()
             }
@@ -99,7 +103,7 @@ object ImageUploader {
             )
             .build()
 
-        server.clientID()?.let {
+        server.clientID(requestBody.toString())?.let {
             requestBuilder.addHeader("Authorization", it)
         }
 
@@ -133,6 +137,12 @@ object ImageUploader {
             }
         })
     }
+
+    fun NIP98Header(url: String, method: String, body: String): String {
+        val noteJson = account.createHTTPAuthorization(url, method, body)?.toJson() ?: ""
+        val encodedNIP98Event: String = Base64.getEncoder().encodeToString(noteJson.toByteArray())
+        return "Nostr " + encodedNIP98Event
+    }
 }
 
 abstract class FileServer {
@@ -140,7 +150,7 @@ abstract class FileServer {
     abstract fun parseUrlFromSuccess(body: String): String?
     abstract fun inputParameterName(contentType: String?): String
 
-    open fun clientID(): String? = null
+    open fun clientID(info: String): String? = null
 }
 
 class NostrImgServer : FileServer() {
@@ -156,7 +166,7 @@ class NostrImgServer : FileServer() {
         return contentType?.toMediaType()?.toString()?.split("/")?.get(0) ?: "image"
     }
 
-    override fun clientID() = null
+    override fun clientID(info: String) = null
 }
 
 class ImgurServer : FileServer() {
@@ -175,7 +185,7 @@ class ImgurServer : FileServer() {
         return contentType?.toMediaType()?.toString()?.split("/")?.get(0) ?: "image"
     }
 
-    override fun clientID() = "Client-ID e6aea87296f3f96"
+    override fun clientID(info: String) = "Client-ID e6aea87296f3f96"
 }
 
 class NostrBuildServer : FileServer() {
@@ -189,7 +199,7 @@ class NostrBuildServer : FileServer() {
         return "fileToUpload"
     }
 
-    override fun clientID() = null
+    override fun clientID(info: String) = null
 }
 
 class NostrFilesDevServer : FileServer() {
@@ -203,5 +213,43 @@ class NostrFilesDevServer : FileServer() {
         return "file"
     }
 
-    override fun clientID() = null
+    override fun clientID(info: String) = null
+}
+
+class NostrCheckMeServer : FileServer() {
+    override fun postUrl(contentType: String?) = "https://nostrcheck.me/api/v1/media"
+    override fun parseUrlFromSuccess(body: String): String? {
+        val tree = jacksonObjectMapper().readTree(body)
+        val url = tree?.get("url")?.asText()
+        var id = tree?.get("id")?.asText()
+        var isCompleted = false
+
+        val client = OkHttpClient()
+        var requrl = "https://nostrcheck.me/api/v1/media?id=" + id // + "&apikey=26d075787d261660682fb9d20dbffa538c708b1eda921d0efa2be95fbef4910a"
+
+        val request = Request.Builder()
+            .url(requrl)
+            .addHeader("Authorization", ImageUploader.NIP98Header(requrl, "GET", ""))
+            .get()
+            .build()
+
+        while (!isCompleted) {
+            val response = client.newCall(request).execute()
+            val body = response.body?.string()
+            val tree = jacksonObjectMapper().readTree(body)
+            isCompleted = tree?.get("status")?.asText() == "completed"
+            try {
+                Thread.sleep(500)
+            } catch (e: InterruptedException) {
+                e.printStackTrace()
+            }
+        }
+        return url
+    }
+
+    override fun inputParameterName(contentType: String?): String {
+        return "mediafile"
+    }
+
+    override fun clientID(body: String) = ImageUploader.NIP98Header("https://nostrcheck.me/api/v1/media", "POST", body)
 }

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

@@ -33,6 +33,7 @@ import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.derivedStateOf
 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
 import androidx.compose.ui.Alignment
@@ -60,10 +61,11 @@ import com.vitorpamplona.amethyst.model.User
 import com.vitorpamplona.amethyst.service.NostrSearchEventOrUserDataSource
 import com.vitorpamplona.amethyst.service.checkNotInMainThread
 import com.vitorpamplona.amethyst.ui.note.ChannelName
-import com.vitorpamplona.amethyst.ui.note.UserPicture
+import com.vitorpamplona.amethyst.ui.note.ClickableUserPicture
 import com.vitorpamplona.amethyst.ui.note.UsernameDisplay
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.SearchBarViewModel
+import com.vitorpamplona.amethyst.ui.theme.Size55dp
 import com.vitorpamplona.amethyst.ui.theme.placeholderText
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.channels.Channel
@@ -347,18 +349,22 @@ private fun RenderChannel(
     item: com.vitorpamplona.amethyst.model.Channel,
     onClick: () -> Unit
 ) {
+    val hasNewMessages = remember {
+        mutableStateOf(false)
+    }
+
     ChannelName(
         channelIdHex = item.idHex,
         channelPicture = item.profilePicture(),
         channelTitle = {
             Text(
-                "${item.info.name}",
+                item.toBestDisplayName(),
                 fontWeight = FontWeight.Bold
             )
         },
         channelLastTime = null,
-        channelLastContent = item.info.about,
-        false,
+        channelLastContent = item.summary(),
+        hasNewMessages,
         onClick = onClick
     )
 }
@@ -384,7 +390,7 @@ fun UserComposeForChat(
                 ),
             verticalAlignment = Alignment.CenterVertically
         ) {
-            UserPicture(baseUser, 55.dp, accountViewModel)
+            ClickableUserPicture(baseUser, Size55dp, accountViewModel)
 
             Column(
                 modifier = Modifier

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

@@ -25,14 +25,14 @@ import androidx.compose.ui.window.Dialog
 import androidx.compose.ui.window.DialogProperties
 import androidx.lifecycle.viewmodel.compose.viewModel
 import com.vitorpamplona.amethyst.R
-import com.vitorpamplona.amethyst.model.Channel
+import com.vitorpamplona.amethyst.model.PublicChatChannel
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.theme.placeholderText
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 
 @Composable
-fun NewChannelView(onClose: () -> Unit, accountViewModel: AccountViewModel, channel: Channel? = null) {
+fun NewChannelView(onClose: () -> Unit, accountViewModel: AccountViewModel, channel: PublicChatChannel? = null) {
     val postViewModel: NewChannelViewModel = viewModel()
     postViewModel.load(accountViewModel.account, channel)
 

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

@@ -4,17 +4,17 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.ui.text.input.TextFieldValue
 import androidx.lifecycle.ViewModel
 import com.vitorpamplona.amethyst.model.Account
-import com.vitorpamplona.amethyst.model.Channel
+import com.vitorpamplona.amethyst.model.PublicChatChannel
 
 class NewChannelViewModel : ViewModel() {
     private var account: Account? = null
-    private var originalChannel: Channel? = null
+    private var originalChannel: PublicChatChannel? = null
 
     val channelName = mutableStateOf(TextFieldValue())
     val channelPicture = mutableStateOf(TextFieldValue())
     val channelDescription = mutableStateOf(TextFieldValue())
 
-    fun load(account: Account, channel: Channel?) {
+    fun load(account: Account, channel: PublicChatChannel?) {
         this.account = account
         if (channel != null) {
             originalChannel = channel

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

@@ -50,6 +50,8 @@ open class NewMediaModel : ViewModel() {
             selectedServer = ServersAvailable.NOSTR_BUILD_NIP_94
         } else if (selectedServer == ServersAvailable.NOSTRFILES_DEV) {
             selectedServer = ServersAvailable.NOSTRFILES_DEV_NIP_94
+        } else if (selectedServer == ServersAvailable.NOSTRCHECK_ME) {
+            selectedServer = ServersAvailable.NOSTRCHECK_ME_NIP_94
         }
     }
 

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

@@ -22,6 +22,7 @@ import androidx.compose.material.icons.filled.ArrowForwardIos
 import androidx.compose.material.icons.filled.Bolt
 import androidx.compose.material.icons.filled.Cancel
 import androidx.compose.material.icons.filled.CurrencyBitcoin
+import androidx.compose.material.icons.filled.ShowChart
 import androidx.compose.material.icons.filled.Visibility
 import androidx.compose.material.icons.filled.VisibilityOff
 import androidx.compose.material.icons.outlined.ArrowForwardIos
@@ -66,12 +67,14 @@ import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.model.User
 import com.vitorpamplona.amethyst.service.NostrSearchEventOrUserDataSource
+import com.vitorpamplona.amethyst.service.noProtocolUrlValidator
 import com.vitorpamplona.amethyst.ui.components.*
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.TextSpinner
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.UserLine
 import com.vitorpamplona.amethyst.ui.theme.BitcoinOrange
 import com.vitorpamplona.amethyst.ui.theme.ButtonBorder
+import com.vitorpamplona.amethyst.ui.theme.Font14SP
 import com.vitorpamplona.amethyst.ui.theme.QuoteBorder
 import com.vitorpamplona.amethyst.ui.theme.mediumImportanceLink
 import com.vitorpamplona.amethyst.ui.theme.placeholderText
@@ -279,6 +282,15 @@ fun NewPostView(onClose: () -> Unit, baseReplyTo: Note? = null, quote: Note? = n
                                 }
                             }
 
+                            if (lud16 != null && postViewModel.wantsZapraiser) {
+                                Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.padding(vertical = 5.dp)) {
+                                    ZapRaiserRequest(
+                                        stringResource(id = R.string.zapraiser),
+                                        postViewModel
+                                    )
+                                }
+                            }
+
                             val myUrlPreview = postViewModel.urlPreview
                             if (myUrlPreview != null) {
                                 Row(modifier = Modifier.padding(top = 5.dp)) {
@@ -374,6 +386,12 @@ fun NewPostView(onClose: () -> Unit, baseReplyTo: Note? = null, quote: Note? = n
                             }
                         }
 
+                        if (postViewModel.canAddZapRaiser) {
+                            AddZapraiserButton(postViewModel.wantsZapraiser) {
+                                postViewModel.wantsZapraiser = !postViewModel.wantsZapraiser
+                            }
+                        }
+
                         MarkAsSensitive(postViewModel) {
                             postViewModel.wantsToMarkAsSensitive = !postViewModel.wantsToMarkAsSensitive
                         }
@@ -460,6 +478,56 @@ private fun AddPollButton(
     }
 }
 
+@Composable
+private fun AddZapraiserButton(
+    isLnInvoiceActive: Boolean,
+    onClick: () -> Unit
+) {
+    IconButton(
+        onClick = {
+            onClick()
+        }
+    ) {
+        Box(
+            Modifier
+                .height(20.dp)
+                .width(25.dp)
+        ) {
+            if (!isLnInvoiceActive) {
+                Icon(
+                    imageVector = Icons.Default.ShowChart,
+                    null,
+                    modifier = Modifier.size(20.dp).align(Alignment.TopStart),
+                    tint = MaterialTheme.colors.onBackground
+                )
+                Icon(
+                    imageVector = Icons.Default.Bolt,
+                    contentDescription = stringResource(R.string.zaps),
+                    modifier = Modifier
+                        .size(13.dp)
+                        .align(Alignment.BottomEnd),
+                    tint = MaterialTheme.colors.onBackground
+                )
+            } else {
+                Icon(
+                    imageVector = Icons.Default.ShowChart,
+                    null,
+                    modifier = Modifier.size(20.dp).align(Alignment.TopStart),
+                    tint = BitcoinOrange
+                )
+                Icon(
+                    imageVector = Icons.Default.Bolt,
+                    contentDescription = stringResource(R.string.zaps),
+                    modifier = Modifier
+                        .size(13.dp)
+                        .align(Alignment.BottomEnd),
+                    tint = BitcoinOrange
+                )
+            }
+        }
+    }
+}
+
 @Composable
 private fun AddLnInvoiceButton(
     isLnInvoiceActive: Boolean,
@@ -555,7 +623,7 @@ private fun ForwardZapTo(
                 Text(
                     text = stringResource(R.string.zap_forward_lnAddress),
                     color = MaterialTheme.colors.placeholderText,
-                    fontSize = 14.sp
+                    fontSize = Font14SP
                 )
             },
             colors = TextFieldDefaults
@@ -657,7 +725,8 @@ fun PostButton(onPost: () -> Unit = {}, isActive: Boolean, modifier: Modifier =
         colors = ButtonDefaults
             .buttonColors(
                 backgroundColor = if (isActive) MaterialTheme.colors.primary else Color.Gray
-            )
+            ),
+        contentPadding = PaddingValues(0.dp)
     ) {
         Text(text = stringResource(R.string.post), color = Color.White)
     }
@@ -730,11 +799,13 @@ enum class ServersAvailable {
     NOSTR_BUILD,
     NOSTRIMG,
     NOSTRFILES_DEV,
+    NOSTRCHECK_ME,
 
     // IMGUR_NIP_94,
     NOSTRIMG_NIP_94,
     NOSTR_BUILD_NIP_94,
     NOSTRFILES_DEV_NIP_94,
+    NOSTRCHECK_ME_NIP_94,
     NIP95
 }
 
@@ -757,10 +828,12 @@ fun ImageVideoDescription(
         Triple(ServersAvailable.NOSTRIMG, stringResource(id = R.string.upload_server_nostrimg), stringResource(id = R.string.upload_server_nostrimg_explainer)),
         Triple(ServersAvailable.NOSTR_BUILD, stringResource(id = R.string.upload_server_nostrbuild), stringResource(id = R.string.upload_server_nostrbuild_explainer)),
         Triple(ServersAvailable.NOSTRFILES_DEV, stringResource(id = R.string.upload_server_nostrfilesdev), stringResource(id = R.string.upload_server_nostrfilesdev_explainer)),
+        Triple(ServersAvailable.NOSTRCHECK_ME, stringResource(id = R.string.upload_server_nostrcheckme), stringResource(id = R.string.upload_server_nostrcheckme_explainer)),
         // Triple(ServersAvailable.IMGUR_NIP_94, stringResource(id = R.string.upload_server_imgur_nip94), stringResource(id = R.string.upload_server_imgur_nip94_explainer)),
         Triple(ServersAvailable.NOSTRIMG_NIP_94, stringResource(id = R.string.upload_server_nostrimg_nip94), stringResource(id = R.string.upload_server_nostrimg_nip94_explainer)),
         Triple(ServersAvailable.NOSTR_BUILD_NIP_94, stringResource(id = R.string.upload_server_nostrbuild_nip94), stringResource(id = R.string.upload_server_nostrbuild_nip94_explainer)),
         Triple(ServersAvailable.NOSTRFILES_DEV_NIP_94, stringResource(id = R.string.upload_server_nostrfilesdev_nip94), stringResource(id = R.string.upload_server_nostrfilesdev_nip94_explainer)),
+        Triple(ServersAvailable.NOSTRCHECK_ME_NIP_94, stringResource(id = R.string.upload_server_nostrcheckme_nip94), stringResource(id = R.string.upload_server_nostrcheckme_nip94_explainer)),
         Triple(ServersAvailable.NIP95, stringResource(id = R.string.upload_server_relays_nip95), stringResource(id = R.string.upload_server_relays_nip95_explainer))
     )
 

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

@@ -16,12 +16,13 @@ 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.AddressableEvent
 import com.vitorpamplona.amethyst.service.model.BaseTextNoteEvent
 import com.vitorpamplona.amethyst.service.model.PrivateDmEvent
 import com.vitorpamplona.amethyst.service.model.TextNoteEvent
+import com.vitorpamplona.amethyst.service.noProtocolUrlValidator
 import com.vitorpamplona.amethyst.ui.components.MediaCompressor
 import com.vitorpamplona.amethyst.ui.components.isValidURL
-import com.vitorpamplona.amethyst.ui.components.noProtocolUrlValidator
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.launch
@@ -74,6 +75,11 @@ open class NewPostViewModel() : ViewModel() {
     // NSFW, Sensitive
     var wantsToMarkAsSensitive by mutableStateOf(false)
 
+    // ZapRaiser
+    var canAddZapRaiser by mutableStateOf(false)
+    var wantsZapraiser by mutableStateOf(false)
+    var zapRaiserAmount by mutableStateOf<Long?>(null)
+
     open fun load(account: Account, replyingTo: Note?, quote: Note?) {
         originalNote = replyingTo
         replyingTo?.let { replyNote ->
@@ -105,11 +111,14 @@ open class NewPostViewModel() : ViewModel() {
         }
 
         canAddInvoice = account.userProfile().info?.lnAddress() != null
+        canAddZapRaiser = account.userProfile().info?.lnAddress() != null
         canUsePoll = originalNote?.event !is PrivateDmEvent && originalNote?.channelHex() == null
         contentToAddUrl = null
 
         wantsForwardZapTo = false
         wantsToMarkAsSensitive = false
+        wantsZapraiser = false
+        zapRaiserAmount = null
         forwardZapTo = null
         forwardZapToEditting = TextFieldValue("")
 
@@ -130,12 +139,18 @@ open class NewPostViewModel() : ViewModel() {
             null
         }
 
+        val localZapRaiserAmount = if (wantsZapraiser) zapRaiserAmount else null
+
         if (wantsPoll) {
-            account?.sendPoll(tagger.message, tagger.replyTos, tagger.mentions, pollOptions, valueMaximum, valueMinimum, consensusThreshold, closedAt, zapReceiver, wantsToMarkAsSensitive)
+            account?.sendPoll(tagger.message, tagger.replyTos, tagger.mentions, pollOptions, valueMaximum, valueMinimum, consensusThreshold, closedAt, zapReceiver, wantsToMarkAsSensitive, localZapRaiserAmount)
         } else if (originalNote?.channelHex() != null) {
-            account?.sendChannelMessage(tagger.message, tagger.channelHex!!, tagger.replyTos, tagger.mentions, zapReceiver, wantsToMarkAsSensitive)
+            if (originalNote is AddressableEvent && originalNote?.address() != null) {
+                account?.sendLiveMessage(tagger.message, originalNote?.address()!!, tagger.replyTos, tagger.mentions, zapReceiver, wantsToMarkAsSensitive, localZapRaiserAmount)
+            } else {
+                account?.sendChannelMessage(tagger.message, tagger.channelHex!!, tagger.replyTos, tagger.mentions, zapReceiver, wantsToMarkAsSensitive, localZapRaiserAmount)
+            }
         } else if (originalNote?.event is PrivateDmEvent) {
-            account?.sendPrivateMessage(tagger.message, originalNote!!.author!!, originalNote!!, tagger.mentions, zapReceiver, wantsToMarkAsSensitive)
+            account?.sendPrivateMessage(tagger.message, originalNote!!.author!!, originalNote!!, tagger.mentions, zapReceiver, wantsToMarkAsSensitive, localZapRaiserAmount)
         } else {
             // adds markers
             val rootId =
@@ -151,6 +166,7 @@ open class NewPostViewModel() : ViewModel() {
                 tags = null,
                 zapReceiver = zapReceiver,
                 wantsToMarkAsSensitive = wantsToMarkAsSensitive,
+                zapRaiserAmount = localZapRaiserAmount,
                 replyingTo = replyId,
                 root = rootId,
                 directMentions = tagger.directMentions
@@ -228,6 +244,8 @@ open class NewPostViewModel() : ViewModel() {
         closedAt = null
 
         wantsInvoice = false
+        wantsZapraiser = false
+        zapRaiserAmount = null
 
         wantsForwardZapTo = false
         wantsToMarkAsSensitive = false
@@ -333,8 +351,7 @@ open class NewPostViewModel() : ViewModel() {
     }
 
     fun canPost(): Boolean {
-        return message.text.isNotBlank() && !isUploadingImage && !wantsInvoice &&
-            (!wantsPoll || pollOptions.values.all { it.isNotEmpty() }) && contentToAddUrl == null
+        return message.text.isNotBlank() && !isUploadingImage && !wantsInvoice && (!wantsZapraiser || zapRaiserAmount != null) && (!wantsPoll || pollOptions.values.all { it.isNotEmpty() }) && contentToAddUrl == null
     }
 
     fun includePollHashtagInMessage(include: Boolean, hashtag: String) {

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

@@ -1,5 +1,10 @@
 package com.vitorpamplona.amethyst.ui.actions
 
+import android.content.Context
+import android.widget.Toast
+import androidx.compose.foundation.ExperimentalFoundationApi
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.combinedClickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
@@ -25,6 +30,7 @@ import androidx.compose.material.icons.filled.Cancel
 import androidx.compose.material.icons.filled.DeleteSweep
 import androidx.compose.material.icons.filled.Download
 import androidx.compose.material.icons.filled.Groups
+import androidx.compose.material.icons.filled.Paid
 import androidx.compose.material.icons.filled.Public
 import androidx.compose.material.icons.filled.Search
 import androidx.compose.material.icons.filled.SyncProblem
@@ -35,10 +41,12 @@ import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextOverflow
@@ -48,20 +56,32 @@ import androidx.compose.ui.window.Dialog
 import androidx.compose.ui.window.DialogProperties
 import androidx.lifecycle.viewmodel.compose.viewModel
 import com.vitorpamplona.amethyst.R
+import com.vitorpamplona.amethyst.model.RelayInformation
 import com.vitorpamplona.amethyst.model.RelaySetupInfo
 import com.vitorpamplona.amethyst.service.relays.FeedType
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.theme.ButtonBorder
+import com.vitorpamplona.amethyst.ui.theme.Font14SP
+import com.vitorpamplona.amethyst.ui.theme.Size35dp
 import com.vitorpamplona.amethyst.ui.theme.placeholderText
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.launch
 import java.lang.Math.round
 
 @Composable
-fun NewRelayListView(onClose: () -> Unit, accountViewModel: AccountViewModel, relayToAdd: String = "") {
+fun NewRelayListView(onClose: () -> Unit, accountViewModel: AccountViewModel, relayToAdd: String = "", nav: (String) -> Unit) {
     val postViewModel: NewRelayListViewModel = viewModel()
     val feedState by postViewModel.relays.collectAsState()
+    val context = LocalContext.current
+    val scope = rememberCoroutineScope()
 
     LaunchedEffect(Unit) {
         postViewModel.load(accountViewModel.account)
+        postViewModel.relays.value.forEach { item ->
+            loadRelayInfo(item.url, context, scope) {
+                postViewModel.togglePaidRelay(item, it.limitation?.payment_required ?: false)
+            }
+        }
     }
 
     Dialog(
@@ -107,6 +127,7 @@ fun NewRelayListView(onClose: () -> Unit, accountViewModel: AccountViewModel, re
                             if (index == 0) {
                                 ServerConfigHeader()
                             }
+
                             ServerConfig(
                                 item,
                                 onToggleDownload = { postViewModel.toggleDownload(it) },
@@ -118,7 +139,11 @@ fun NewRelayListView(onClose: () -> Unit, accountViewModel: AccountViewModel, re
                                 onToggleGlobal = { postViewModel.toggleGlobal(it) },
                                 onToggleSearch = { postViewModel.toggleSearch(it) },
 
-                                onDelete = { postViewModel.deleteRelay(it) }
+                                onDelete = { postViewModel.deleteRelay(it) },
+                                accountViewModel = accountViewModel,
+                                nav = nav,
+                                scope = scope,
+                                context = context
                             )
                         }
                     }
@@ -156,7 +181,7 @@ fun ServerConfigHeader() {
                     Text(
                         text = stringResource(R.string.bytes),
                         maxLines = 1,
-                        fontSize = 14.sp,
+                        fontSize = Font14SP,
                         modifier = Modifier.weight(1.2f),
                         color = MaterialTheme.colors.placeholderText
                     )
@@ -166,7 +191,7 @@ fun ServerConfigHeader() {
                     Text(
                         text = stringResource(id = R.string.bytes),
                         maxLines = 1,
-                        fontSize = 14.sp,
+                        fontSize = Font14SP,
                         modifier = Modifier.weight(1.2f),
                         color = MaterialTheme.colors.placeholderText
                     )
@@ -176,7 +201,7 @@ fun ServerConfigHeader() {
                     Text(
                         text = stringResource(R.string.errors),
                         maxLines = 1,
-                        fontSize = 14.sp,
+                        fontSize = Font14SP,
                         modifier = Modifier.weight(1f),
                         color = MaterialTheme.colors.placeholderText
                     )
@@ -186,7 +211,7 @@ fun ServerConfigHeader() {
                     Text(
                         text = stringResource(R.string.spam),
                         maxLines = 1,
-                        fontSize = 14.sp,
+                        fontSize = Font14SP,
                         modifier = Modifier.weight(1f),
                         color = MaterialTheme.colors.placeholderText
                     )
@@ -202,6 +227,7 @@ fun ServerConfigHeader() {
     }
 }
 
+@OptIn(ExperimentalFoundationApi::class)
 @Composable
 fun ServerConfig(
     item: RelaySetupInfo,
@@ -214,8 +240,25 @@ fun ServerConfig(
     onToggleGlobal: (RelaySetupInfo) -> Unit,
     onToggleSearch: (RelaySetupInfo) -> Unit,
 
-    onDelete: (RelaySetupInfo) -> Unit
+    onDelete: (RelaySetupInfo) -> Unit,
+    accountViewModel: AccountViewModel,
+    nav: (String) -> Unit,
+    context: Context,
+    scope: CoroutineScope
 ) {
+    var relayInfo: RelayInformation? by remember { mutableStateOf(null) }
+
+    if (relayInfo != null) {
+        RelayInformationDialog(
+            onClose = {
+                relayInfo = null
+            },
+            relayInfo = relayInfo!!,
+            accountViewModel,
+            nav
+        )
+    }
+
     Column(Modifier.fillMaxWidth()) {
         Row(
             verticalAlignment = Alignment.CenterVertically,
@@ -239,9 +282,26 @@ fun ServerConfig(
 
             Column(Modifier.weight(1f)) {
                 Row(verticalAlignment = Alignment.CenterVertically) {
+                    if (item.paidRelay) {
+                        Icon(
+                            imageVector = Icons.Default.Paid,
+                            null,
+                            modifier = Modifier
+                                .padding(end = 5.dp)
+                                .size(14.dp),
+                            tint = Color.Green
+                        )
+                    }
+
                     Text(
-                        text = item.url.removePrefix("wss://"),
-                        modifier = Modifier.weight(1f),
+                        text = item.url.removePrefix("wss://").removeSuffix("/"),
+                        modifier = Modifier
+                            .weight(1f)
+                            .clickable {
+                                loadRelayInfo(item.url, context, scope) {
+                                    relayInfo = it
+                                }
+                            },
                         maxLines = 1,
                         overflow = TextOverflow.Ellipsis
                     )
@@ -251,15 +311,30 @@ fun ServerConfig(
                     Column(Modifier.weight(1f)) {
                         Row(verticalAlignment = Alignment.CenterVertically) {
                             IconButton(
-                                modifier = Modifier.size(30.dp),
-                                onClick = { onToggleFollows(item) }
+                                modifier = Modifier
+                                    .size(30.dp),
+                                onClick = { }
                             ) {
                                 Icon(
                                     painterResource(R.drawable.ic_home),
                                     stringResource(R.string.home_feed),
                                     modifier = Modifier
                                         .padding(end = 5.dp)
-                                        .size(15.dp),
+                                        .size(15.dp)
+                                        .combinedClickable(
+                                            onClick = { onToggleFollows(item) },
+                                            onLongClick = {
+                                                scope.launch {
+                                                    Toast
+                                                        .makeText(
+                                                            context,
+                                                            context.getString(R.string.home_feed),
+                                                            Toast.LENGTH_SHORT
+                                                        )
+                                                        .show()
+                                                }
+                                            }
+                                        ),
                                     tint = if (item.feedTypes.contains(FeedType.FOLLOWS)) {
                                         Color.Green
                                     } else {
@@ -271,14 +346,28 @@ fun ServerConfig(
                             }
                             IconButton(
                                 modifier = Modifier.size(30.dp),
-                                onClick = { onTogglePrivateDMs(item) }
+                                onClick = { }
                             ) {
                                 Icon(
                                     painterResource(R.drawable.ic_dm),
                                     stringResource(R.string.private_message_feed),
                                     modifier = Modifier
                                         .padding(horizontal = 5.dp)
-                                        .size(15.dp),
+                                        .size(15.dp)
+                                        .combinedClickable(
+                                            onClick = { onTogglePrivateDMs(item) },
+                                            onLongClick = {
+                                                scope.launch {
+                                                    Toast
+                                                        .makeText(
+                                                            context,
+                                                            context.getString(R.string.private_message_feed),
+                                                            Toast.LENGTH_SHORT
+                                                        )
+                                                        .show()
+                                                }
+                                            }
+                                        ),
                                     tint = if (item.feedTypes.contains(FeedType.PRIVATE_DMS)) {
                                         Color.Green
                                     } else {
@@ -290,14 +379,28 @@ fun ServerConfig(
                             }
                             IconButton(
                                 modifier = Modifier.size(30.dp),
-                                onClick = { onTogglePublicChats(item) }
+                                onClick = { }
                             ) {
                                 Icon(
                                     imageVector = Icons.Default.Groups,
                                     stringResource(R.string.public_chat_feed),
                                     modifier = Modifier
                                         .padding(horizontal = 5.dp)
-                                        .size(15.dp),
+                                        .size(15.dp)
+                                        .combinedClickable(
+                                            onClick = { onTogglePublicChats(item) },
+                                            onLongClick = {
+                                                scope.launch {
+                                                    Toast
+                                                        .makeText(
+                                                            context,
+                                                            context.getString(R.string.public_chat_feed),
+                                                            Toast.LENGTH_SHORT
+                                                        )
+                                                        .show()
+                                                }
+                                            }
+                                        ),
                                     tint = if (item.feedTypes.contains(FeedType.PUBLIC_CHATS)) {
                                         Color.Green
                                     } else {
@@ -309,14 +412,28 @@ fun ServerConfig(
                             }
                             IconButton(
                                 modifier = Modifier.size(30.dp),
-                                onClick = { onToggleGlobal(item) }
+                                onClick = { }
                             ) {
                                 Icon(
                                     imageVector = Icons.Default.Public,
                                     stringResource(R.string.global_feed),
                                     modifier = Modifier
                                         .padding(horizontal = 5.dp)
-                                        .size(15.dp),
+                                        .size(15.dp)
+                                        .combinedClickable(
+                                            onClick = { onToggleGlobal(item) },
+                                            onLongClick = {
+                                                scope.launch {
+                                                    Toast
+                                                        .makeText(
+                                                            context,
+                                                            context.getString(R.string.global_feed),
+                                                            Toast.LENGTH_SHORT
+                                                        )
+                                                        .show()
+                                                }
+                                            }
+                                        ),
                                     tint = if (item.feedTypes.contains(FeedType.GLOBAL)) {
                                         Color.Green
                                     } else {
@@ -336,7 +453,21 @@ fun ServerConfig(
                                     stringResource(R.string.search_feed),
                                     modifier = Modifier
                                         .padding(horizontal = 5.dp)
-                                        .size(15.dp),
+                                        .size(15.dp)
+                                        .combinedClickable(
+                                            onClick = { onToggleSearch(item) },
+                                            onLongClick = {
+                                                scope.launch {
+                                                    Toast
+                                                        .makeText(
+                                                            context,
+                                                            context.getString(R.string.search_feed),
+                                                            Toast.LENGTH_SHORT
+                                                        )
+                                                        .show()
+                                                }
+                                            }
+                                        ),
                                     tint = if (item.feedTypes.contains(FeedType.SEARCH)) {
                                         Color.Green
                                     } else {
@@ -353,14 +484,28 @@ fun ServerConfig(
                         Row(verticalAlignment = Alignment.CenterVertically) {
                             IconButton(
                                 modifier = Modifier.size(30.dp),
-                                onClick = { onToggleDownload(item) }
+                                onClick = { }
                             ) {
                                 Icon(
                                     imageVector = Icons.Default.Download,
-                                    null,
+                                    stringResource(R.string.read_from_relay),
                                     modifier = Modifier
                                         .padding(horizontal = 5.dp)
-                                        .size(15.dp),
+                                        .size(15.dp)
+                                        .combinedClickable(
+                                            onClick = { onToggleDownload(item) },
+                                            onLongClick = {
+                                                scope.launch {
+                                                    Toast
+                                                        .makeText(
+                                                            context,
+                                                            context.getString(R.string.read_from_relay),
+                                                            Toast.LENGTH_SHORT
+                                                        )
+                                                        .show()
+                                                }
+                                            }
+                                        ),
                                     tint = if (item.read) {
                                         Color.Green
                                     } else {
@@ -381,14 +526,28 @@ fun ServerConfig(
 
                             IconButton(
                                 modifier = Modifier.size(30.dp),
-                                onClick = { onToggleUpload(item) }
+                                onClick = { }
                             ) {
                                 Icon(
                                     imageVector = Icons.Default.Upload,
-                                    null,
+                                    stringResource(R.string.write_to_relay),
                                     modifier = Modifier
                                         .padding(horizontal = 5.dp)
-                                        .size(15.dp),
+                                        .size(15.dp)
+                                        .combinedClickable(
+                                            onClick = { onToggleUpload(item) },
+                                            onLongClick = {
+                                                scope.launch {
+                                                    Toast
+                                                        .makeText(
+                                                            context,
+                                                            context.getString(R.string.write_to_relay),
+                                                            Toast.LENGTH_SHORT
+                                                        )
+                                                        .show()
+                                                }
+                                            }
+                                        ),
                                     tint = if (item.write) {
                                         Color.Green
                                     } else {
@@ -409,10 +568,24 @@ fun ServerConfig(
 
                             Icon(
                                 imageVector = Icons.Default.SyncProblem,
-                                null,
+                                stringResource(R.string.errors),
                                 modifier = Modifier
                                     .padding(horizontal = 5.dp)
-                                    .size(15.dp),
+                                    .size(15.dp)
+                                    .combinedClickable(
+                                        onClick = { },
+                                        onLongClick = {
+                                            scope.launch {
+                                                Toast
+                                                    .makeText(
+                                                        context,
+                                                        context.getString(R.string.errors),
+                                                        Toast.LENGTH_SHORT
+                                                    )
+                                                    .show()
+                                            }
+                                        }
+                                    ),
                                 tint = if (item.errorCount > 0) Color.Yellow else Color.Green
                             )
 
@@ -426,8 +599,24 @@ fun ServerConfig(
 
                             Icon(
                                 imageVector = Icons.Default.DeleteSweep,
-                                null,
-                                modifier = Modifier.padding(horizontal = 5.dp).size(15.dp),
+                                stringResource(R.string.spam),
+                                modifier = Modifier
+                                    .padding(horizontal = 5.dp)
+                                    .size(15.dp)
+                                    .combinedClickable(
+                                        onClick = { },
+                                        onLongClick = {
+                                            scope.launch {
+                                                Toast
+                                                    .makeText(
+                                                        context,
+                                                        context.getString(R.string.spam),
+                                                        Toast.LENGTH_SHORT
+                                                    )
+                                                    .show()
+                                            }
+                                        }
+                                    ),
                                 tint = if (item.spamCount > 0) Color.Yellow else Color.Green
                             )
 
@@ -477,7 +666,7 @@ fun EditableServerConfig(relayToAdd: String, onNewRelay: (RelaySetupInfo) -> Uni
                 imageVector = Icons.Default.Download,
                 null,
                 modifier = Modifier
-                    .size(35.dp)
+                    .size(Size35dp)
                     .padding(horizontal = 5.dp),
                 tint = if (read) Color.Green else MaterialTheme.colors.placeholderText
             )
@@ -488,7 +677,7 @@ fun EditableServerConfig(relayToAdd: String, onNewRelay: (RelaySetupInfo) -> Uni
                 imageVector = Icons.Default.Upload,
                 null,
                 modifier = Modifier
-                    .size(35.dp)
+                    .size(Size35dp)
                     .padding(horizontal = 5.dp),
                 tint = if (write) Color.Green else MaterialTheme.colors.placeholderText
             )

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

@@ -136,6 +136,12 @@ class NewRelayListViewModel : ViewModel() {
             it.updated(relay, relay.copy(feedTypes = newTypes))
         }
     }
+
+    fun togglePaidRelay(relay: RelaySetupInfo, paid: Boolean) {
+        _relays.update {
+            it.updated(relay, relay.copy(paidRelay = paid))
+        }
+    }
 }
 
 fun <T> Iterable<T>.updated(old: T, new: T): List<T> = map { if (it == old) new else it }

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

@@ -0,0 +1,369 @@
+package com.vitorpamplona.amethyst.ui.actions
+
+import android.content.Context
+import android.util.Log
+import android.widget.Toast
+import androidx.compose.animation.Crossfade
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.ExperimentalLayoutApi
+import androidx.compose.foundation.layout.FlowRow
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material.Surface
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import androidx.compose.ui.window.Dialog
+import androidx.compose.ui.window.DialogProperties
+import com.vitorpamplona.amethyst.R
+import com.vitorpamplona.amethyst.model.RelayInformation
+import com.vitorpamplona.amethyst.service.HttpClient
+import com.vitorpamplona.amethyst.service.checkNotInMainThread
+import com.vitorpamplona.amethyst.ui.components.ClickableEmail
+import com.vitorpamplona.amethyst.ui.components.ClickableUrl
+import com.vitorpamplona.amethyst.ui.note.LoadUser
+import com.vitorpamplona.amethyst.ui.note.UserCompose
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
+import com.vitorpamplona.amethyst.ui.theme.DoubleVertSpacer
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.launch
+import okhttp3.Call
+import okhttp3.Callback
+import okhttp3.Request
+import okhttp3.Response
+import java.io.IOException
+
+@OptIn(ExperimentalLayoutApi::class)
+@Composable
+fun RelayInformationDialog(
+    onClose: () -> Unit,
+    relayInfo: RelayInformation,
+    accountViewModel: AccountViewModel,
+    nav: (String) -> Unit
+) {
+    Dialog(
+        onDismissRequest = { onClose() },
+        properties = DialogProperties(
+            usePlatformDefaultWidth = false,
+            dismissOnClickOutside = false
+        )
+    ) {
+        Surface {
+            val scrollState = rememberScrollState()
+
+            Column(
+                modifier = Modifier
+                    .padding(10.dp)
+                    .fillMaxSize()
+                    .verticalScroll(scrollState)
+            ) {
+                Row(
+                    modifier = Modifier.fillMaxWidth(),
+                    horizontalArrangement = Arrangement.SpaceBetween,
+                    verticalAlignment = Alignment.CenterVertically
+                ) {
+                    CloseButton(onCancel = {
+                        onClose()
+                    })
+                }
+
+                Row(
+                    modifier = Modifier.fillMaxWidth(),
+                    horizontalArrangement = Arrangement.Center
+                ) {
+                    Title(relayInfo.name ?: "")
+                }
+
+                Row(
+                    modifier = Modifier.fillMaxWidth(),
+                    horizontalArrangement = Arrangement.Center
+                ) {
+                    SectionContent(relayInfo.description ?: "")
+                }
+
+                Section(stringResource(R.string.owner))
+
+                relayInfo.pubkey?.let {
+                    DisplayOwnerInformation(it, accountViewModel, nav)
+                }
+
+                Section(stringResource(R.string.software))
+
+                DisplaySoftwareInformation(relayInfo)
+
+                Section(stringResource(R.string.version))
+
+                SectionContent(relayInfo.version ?: "")
+
+                Section(stringResource(R.string.contact))
+
+                Box(modifier = Modifier.padding(start = 10.dp)) {
+                    ClickableEmail(relayInfo.contact ?: "")
+                }
+
+                Section(stringResource(R.string.supports))
+
+                DisplaySupportedNips(relayInfo)
+
+                relayInfo.fees?.admission?.let {
+                    if (it.isNotEmpty()) {
+                        Section(stringResource(R.string.admission_fees))
+
+                        it.forEach { item ->
+                            SectionContent("${item.amount?.div(1000) ?: 0} sats")
+                        }
+                    }
+                }
+
+                relayInfo.payments_url?.let {
+                    Section(stringResource(R.string.payments_url))
+
+                    Box(modifier = Modifier.padding(start = 10.dp)) {
+                        ClickableUrl(
+                            urlText = it,
+                            url = it
+                        )
+                    }
+                }
+
+                relayInfo.limitation?.let {
+                    Section(stringResource(R.string.limitations))
+                    val authRequired = it.auth_required ?: false
+                    val authRequiredText = if (authRequired) stringResource(R.string.yes) else stringResource(R.string.no)
+                    val paymentRequired = it.payment_required ?: false
+                    val paymentRequiredText = if (paymentRequired) stringResource(R.string.yes) else stringResource(R.string.no)
+
+                    Column {
+                        SectionContent("${stringResource(R.string.message_length)}: ${it.max_message_length ?: 0}")
+                        SectionContent("${stringResource(R.string.subscriptions)}: ${it.max_subscriptions ?: 0}")
+                        SectionContent("${stringResource(R.string.filters)}: ${it.max_subscriptions ?: 0}")
+                        SectionContent("${stringResource(R.string.subscription_id_length)}: ${it.max_subid_length ?: 0}")
+                        SectionContent("${stringResource(R.string.minimum_prefix)}: ${it.min_prefix ?: 0}")
+                        SectionContent("${stringResource(R.string.maximum_event_tags)}: ${it.max_event_tags ?: 0}")
+                        SectionContent("${stringResource(R.string.content_length)}: ${it.max_content_length ?: 0}")
+                        SectionContent("${stringResource(R.string.minimum_pow)}: ${it.min_pow_difficulty ?: 0}")
+                        SectionContent("${stringResource(R.string.auth)}: $authRequiredText")
+                        SectionContent("${stringResource(R.string.payment)}: $paymentRequiredText")
+                    }
+                }
+
+                relayInfo.relay_countries?.let {
+                    Section(stringResource(R.string.countries))
+
+                    FlowRow {
+                        it.forEach { item ->
+                            SectionContent(item)
+                        }
+                    }
+                }
+
+                relayInfo.language_tags?.let {
+                    Section(stringResource(R.string.languages))
+
+                    FlowRow {
+                        it.forEach { item ->
+                            SectionContent(item)
+                        }
+                    }
+                }
+
+                relayInfo.tags?.let {
+                    Section(stringResource(R.string.tags))
+
+                    FlowRow {
+                        it.forEach { item ->
+                            SectionContent(item)
+                        }
+                    }
+                }
+
+                relayInfo.posting_policy?.let {
+                    Section(stringResource(R.string.posting_policy))
+
+                    Box(Modifier.padding(10.dp)) {
+                        ClickableUrl(
+                            it,
+                            it
+                        )
+                    }
+                }
+            }
+        }
+    }
+}
+
+@Composable
+@OptIn(ExperimentalLayoutApi::class)
+private fun DisplaySupportedNips(relayInfo: RelayInformation) {
+    FlowRow {
+        relayInfo.supported_nips?.forEach { item ->
+            val text = item.toString().padStart(2, '0')
+            Box(Modifier.padding(10.dp)) {
+                ClickableUrl(
+                    urlText = "$text",
+                    url = "https://github.com/nostr-protocol/nips/blob/master/$text.md"
+                )
+            }
+        }
+
+        relayInfo.supported_nip_extensions?.forEach { item ->
+            val text = item.padStart(2, '0')
+            Box(Modifier.padding(10.dp)) {
+                ClickableUrl(
+                    urlText = "$text",
+                    url = "https://github.com/nostr-protocol/nips/blob/master/$text.md"
+                )
+            }
+        }
+    }
+}
+
+@Composable
+private fun DisplaySoftwareInformation(relayInfo: RelayInformation) {
+    val url = (relayInfo.software ?: "").replace("git+", "")
+    Box(modifier = Modifier.padding(start = 10.dp)) {
+        ClickableUrl(
+            urlText = url,
+            url = url
+        )
+    }
+}
+
+@Composable
+private fun DisplayOwnerInformation(
+    userHex: String,
+    accountViewModel: AccountViewModel,
+    nav: (String) -> Unit
+) {
+    LoadUser(baseUserHex = userHex) {
+        Crossfade(it) {
+            if (it != null) {
+                UserCompose(baseUser = it, accountViewModel = accountViewModel, showDiviser = false, nav = nav)
+            }
+        }
+    }
+}
+
+@Composable
+fun Title(text: String) {
+    Spacer(modifier = DoubleVertSpacer)
+    Text(
+        text = text,
+        fontWeight = FontWeight.Bold,
+        fontSize = 24.sp
+    )
+    Spacer(modifier = DoubleVertSpacer)
+}
+
+@Composable
+fun Section(text: String) {
+    Spacer(modifier = DoubleVertSpacer)
+    Text(
+        text = text,
+        fontWeight = FontWeight.Bold,
+        fontSize = 20.sp
+    )
+    Spacer(modifier = DoubleVertSpacer)
+}
+
+@Composable
+fun SectionContent(text: String) {
+    Text(
+        modifier = Modifier.padding(start = 10.dp),
+        text = text
+    )
+}
+
+fun loadRelayInfo(
+    dirtyUrl: String,
+    context: Context,
+    scope: CoroutineScope,
+    onInfo: (RelayInformation) -> Unit
+) {
+    try {
+        val url = if (dirtyUrl.contains("://")) {
+            dirtyUrl
+                .replace("wss://", "https://")
+                .replace("ws://", "http://")
+        } else {
+            "https://$dirtyUrl"
+        }
+
+        val request: Request = Request
+            .Builder()
+            .header("Accept", "application/nostr+json")
+            .url(url)
+            .build()
+
+        HttpClient.getHttpClient()
+            .newCall(request)
+            .enqueue(
+                object : Callback {
+                    override fun onResponse(call: Call, response: Response) {
+                        checkNotInMainThread()
+                        response.use {
+                            val body = it.body.string()
+                            try {
+                                if (it.isSuccessful) {
+                                    onInfo(RelayInformation.fromJson(body))
+                                } else {
+                                    scope.launch {
+                                        Toast
+                                            .makeText(
+                                                context,
+                                                context.getString(R.string.an_error_ocurred_trying_to_get_relay_information, dirtyUrl),
+                                                Toast.LENGTH_SHORT
+                                            ).show()
+                                    }
+                                }
+                            } catch (e: Exception) {
+                                Log.e("RelayInfoFail", "Resulting Message from Relay $dirtyUrl in not parseable: $body", e)
+                                scope.launch {
+                                    Toast
+                                        .makeText(
+                                            context,
+                                            context.getString(R.string.an_error_ocurred_trying_to_get_relay_information, dirtyUrl),
+                                            Toast.LENGTH_SHORT
+                                        ).show()
+                                }
+                            }
+                        }
+                    }
+
+                    override fun onFailure(call: Call, e: IOException) {
+                        Log.e("RelayInfoFail", "Resulting Message from Relay in not parseable $dirtyUrl", e)
+                        scope.launch {
+                            Toast
+                                .makeText(
+                                    context,
+                                    context.getString(R.string.an_error_ocurred_trying_to_get_relay_information, dirtyUrl),
+                                    Toast.LENGTH_SHORT
+                                ).show()
+                        }
+                    }
+                }
+            )
+    } catch (e: Exception) {
+        Log.e("RelayInfoFail", "Invalid URL $dirtyUrl", e)
+        scope.launch {
+            Toast
+                .makeText(
+                    context,
+                    context.getString(R.string.an_error_ocurred_trying_to_get_relay_information, dirtyUrl),
+                    Toast.LENGTH_SHORT
+                ).show()
+        }
+    }
+}

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

@@ -1,83 +0,0 @@
-package com.vitorpamplona.amethyst.ui.components
-
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.Immutable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.ColorFilter
-import androidx.compose.ui.graphics.DefaultAlpha
-import androidx.compose.ui.graphics.FilterQuality
-import androidx.compose.ui.graphics.drawscope.DrawScope
-import androidx.compose.ui.graphics.painter.Painter
-import androidx.compose.ui.layout.ContentScale
-import androidx.compose.ui.unit.Dp
-import coil.compose.AsyncImage
-import coil.compose.AsyncImagePainter
-import java.util.Base64
-
-@Immutable
-data class ResizeImage(val url: String?, val size: Dp) {
-    fun proxyUrl(): String? {
-        if (url == null) return null
-
-        // Fixes Image size to reduce pings to servers for each size used in the app
-        val imgPx = 200 // with(LocalDensity.current) { model.size.toPx().toInt() }
-        val base64 = Base64.getUrlEncoder().encodeToString(url.toByteArray())
-
-        return url // "https://d12fidohs5rlxk.cloudfront.net/preset:sharp/rs:fit:$imgPx:$imgPx:0/gravity:sm/$base64"
-    }
-}
-
-@Composable
-fun AsyncImageProxy(
-    model: ResizeImage,
-    contentDescription: String?,
-    modifier: Modifier = Modifier,
-    placeholder: Painter? = null,
-    error: Painter? = null,
-    fallback: Painter? = error,
-    onLoading: ((AsyncImagePainter.State.Loading) -> Unit)? = null,
-    onSuccess: ((AsyncImagePainter.State.Success) -> Unit)? = null,
-    onError: ((AsyncImagePainter.State.Error) -> Unit)? = null,
-    alignment: Alignment = Alignment.Center,
-    contentScale: ContentScale = ContentScale.Fit,
-    alpha: Float = DefaultAlpha,
-    colorFilter: ColorFilter? = null,
-    filterQuality: FilterQuality = DrawScope.DefaultFilterQuality
-) {
-    if (model.url == null) {
-        AsyncImage(
-            model = model.url,
-            contentDescription = contentDescription,
-            modifier = modifier,
-            placeholder = placeholder,
-            error = error,
-            fallback = fallback,
-            onLoading = onLoading,
-            onSuccess = onSuccess,
-            onError = onError,
-            alignment = alignment,
-            contentScale = contentScale,
-            alpha = alpha,
-            colorFilter = colorFilter,
-            filterQuality = filterQuality
-        )
-    } else {
-        AsyncImage(
-            model = model.proxyUrl(),
-            contentDescription = contentDescription,
-            modifier = modifier,
-            placeholder = placeholder,
-            error = error,
-            fallback = fallback,
-            onLoading = onLoading,
-            onSuccess = onSuccess,
-            onError = onError,
-            alignment = alignment,
-            contentScale = contentScale,
-            alpha = alpha,
-            colorFilter = colorFilter,
-            filterQuality = filterQuality
-        )
-    }
-}

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

@@ -1,5 +1,6 @@
 package com.vitorpamplona.amethyst.ui.components
 
+import androidx.compose.runtime.Stable
 import com.vitorpamplona.amethyst.service.checkNotInMainThread
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
@@ -15,6 +16,7 @@ import java.util.concurrent.atomic.AtomicBoolean
 /**
  * This class is designed to have a waiting time between two calls of invalidate
  */
+@Stable
 class BundledUpdate(
     val delay: Long,
     val dispatcher: CoroutineDispatcher = Dispatchers.Default
@@ -51,6 +53,7 @@ class BundledUpdate(
 /**
  * This class is designed to have a waiting time between two calls of invalidate
  */
+@Stable
 class BundledInsert<T>(
     val delay: Long,
     val dispatcher: CoroutineDispatcher = Dispatchers.Default

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

@@ -0,0 +1,197 @@
+package com.vitorpamplona.amethyst.ui.components
+
+import android.content.Intent
+import android.net.Uri
+import android.widget.Toast
+import androidx.compose.animation.Crossfade
+import androidx.compose.foundation.border
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.material.*
+import androidx.compose.runtime.*
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.LocalClipboardManager
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextDirection
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import androidx.core.content.ContextCompat.startActivity
+import com.vitorpamplona.amethyst.R
+import com.vitorpamplona.amethyst.service.CashuProcessor
+import com.vitorpamplona.amethyst.service.CashuToken
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
+import com.vitorpamplona.amethyst.ui.theme.QuoteBorder
+import com.vitorpamplona.amethyst.ui.theme.subtleBorder
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+
+@Composable
+fun CashuPreview(cashutoken: String, accountViewModel: AccountViewModel) {
+    var cachuData by remember { mutableStateOf<GenericLoadable<CashuToken>>(GenericLoadable.Loading<CashuToken>()) }
+
+    LaunchedEffect(key1 = cashutoken) {
+        launch(Dispatchers.IO) {
+            val newCachuData = CashuProcessor().parse(cashutoken)
+            launch(Dispatchers.Main) {
+                cachuData = newCachuData
+            }
+        }
+    }
+
+    Crossfade(targetState = cachuData) {
+        when (it) {
+            is GenericLoadable.Loaded<CashuToken> -> CashuPreview(it.loaded, accountViewModel)
+            is GenericLoadable.Error<CashuToken> -> Text(
+                text = "$cashutoken ",
+                style = LocalTextStyle.current.copy(textDirection = TextDirection.Content)
+            )
+            else -> {}
+        }
+    }
+}
+
+@Composable
+fun CashuPreview(token: CashuToken, accountViewModel: AccountViewModel) {
+    val lud16 = remember(accountViewModel) {
+        accountViewModel.account.userProfile().info?.lud16
+    }
+
+    val useWebService = false
+    val context = LocalContext.current
+    val scope = rememberCoroutineScope()
+    val clipboardManager = LocalClipboardManager.current
+
+    Column(
+        modifier = Modifier
+            .fillMaxWidth()
+            .padding(start = 30.dp, end = 30.dp)
+            .clip(shape = QuoteBorder)
+            .border(1.dp, MaterialTheme.colors.subtleBorder, QuoteBorder)
+    ) {
+        Column(
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(30.dp)
+        ) {
+            Row(
+                verticalAlignment = Alignment.CenterVertically,
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .padding(bottom = 10.dp)
+            ) {
+                Icon(
+                    painter = painterResource(R.drawable.cashu),
+                    null,
+                    modifier = Modifier.size(20.dp),
+                    tint = Color.Unspecified
+                )
+
+                Text(
+                    text = stringResource(R.string.cashu),
+                    fontSize = 20.sp,
+                    fontWeight = FontWeight.W500,
+                    modifier = Modifier.padding(start = 10.dp)
+                )
+            }
+
+            Divider()
+
+            token.totalAmount.let {
+                Text(
+                    text = "$it ${stringResource(id = R.string.sats)}",
+                    fontSize = 25.sp,
+                    fontWeight = FontWeight.W500,
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .padding(vertical = 10.dp)
+                )
+            }
+
+            Row(
+
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .padding(bottom = 10.dp)
+            ) {
+                Button(
+
+                    modifier = Modifier
+                        .padding(vertical = 10.dp).padding(horizontal = 2.dp),
+                    onClick = {
+                        if (lud16 != null) {
+                            scope.launch(Dispatchers.IO) {
+                                CashuProcessor().melt(
+                                    token,
+                                    lud16,
+                                    onSuccess = {
+                                        scope.launch {
+                                            Toast.makeText(context, it, Toast.LENGTH_SHORT).show()
+                                        }
+                                    },
+                                    onError = {
+                                        scope.launch {
+                                            Toast.makeText(context, it, Toast.LENGTH_SHORT).show()
+                                        }
+                                    }
+                                )
+                            }
+                        } else {
+                            scope.launch {
+                                Toast.makeText(
+                                    context,
+                                    "No Lightning Address set",
+                                    Toast.LENGTH_SHORT
+                                ).show()
+                            }
+                        }
+                    },
+                    shape = QuoteBorder,
+                    colors = ButtonDefaults.buttonColors(
+                        backgroundColor = MaterialTheme.colors.primary
+                    )
+                ) {
+                    Text(
+                        stringResource(R.string.cashu_redeem),
+                        color = Color.White,
+                        fontSize = 18.sp
+                    )
+                }
+                Button(
+                    modifier = Modifier
+                        .padding(vertical = 10.dp).padding(horizontal = 1.dp),
+                    onClick = {
+                        if (useWebService) {
+                            // In case we want to use the cashu.me webservice
+                            val url = "https://redeem.cashu.me?token=$token&lightning=$lud16&autopay=false"
+                            val intent = Intent(Intent.ACTION_VIEW, Uri.parse(url))
+                            startActivity(context, intent, null)
+                        } else {
+                            // Copying the token to clipboard for now
+                            var orignaltoken = token.token
+                            clipboardManager.setText(AnnotatedString("$orignaltoken"))
+                            scope.launch {
+                                Toast.makeText(context, "Copied token to clipboard", Toast.LENGTH_SHORT).show()
+                            }
+                        }
+                    },
+                    shape = QuoteBorder,
+                    colors = ButtonDefaults.buttonColors(
+                        backgroundColor = MaterialTheme.colors.primary
+                    )
+                ) {
+                    Text("⎘", color = Color.White, fontSize = 18.sp)
+                }
+            }
+        }
+    }
+}

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

@@ -7,6 +7,7 @@ import androidx.compose.foundation.text.ClickableText
 import androidx.compose.material.LocalTextStyle
 import androidx.compose.material.MaterialTheme
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.text.AnnotatedString
 
@@ -15,7 +16,7 @@ fun ClickableEmail(email: String) {
     val context = LocalContext.current
 
     ClickableText(
-        text = AnnotatedString("$email "),
+        text = remember { AnnotatedString(email) },
         onClick = { runCatching { context.sendMail(email) } },
         style = LocalTextStyle.current.copy(color = MaterialTheme.colors.primary)
     )

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

@@ -7,6 +7,7 @@ import androidx.compose.foundation.text.ClickableText
 import androidx.compose.material.LocalTextStyle
 import androidx.compose.material.MaterialTheme
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.text.AnnotatedString
 
@@ -15,7 +16,7 @@ fun ClickablePhone(phone: String) {
     val context = LocalContext.current
 
     ClickableText(
-        text = AnnotatedString("$phone "),
+        text = remember { AnnotatedString(phone) },
         onClick = { runCatching { context.dial(phone) } },
         style = LocalTextStyle.current.copy(color = MaterialTheme.colors.primary)
     )

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

@@ -50,6 +50,7 @@ import com.vitorpamplona.amethyst.service.nip19.Nip19
 import com.vitorpamplona.amethyst.ui.actions.ImmutableListOfLists
 import com.vitorpamplona.amethyst.ui.actions.toImmutableListOfLists
 import com.vitorpamplona.amethyst.ui.note.LoadChannel
+import com.vitorpamplona.amethyst.ui.note.toShortenHex
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.ImmutableMap
 import kotlinx.collections.immutable.persistentListOf
@@ -78,7 +79,7 @@ fun ClickableRoute(
         else -> {
             Text(
                 remember {
-                    "@${nip19.hex}${nip19.additionalChars} "
+                    "@${nip19.hex}${nip19.additionalChars}"
                 }
             )
         }
@@ -92,8 +93,8 @@ private fun LoadNote(
 ) {
     var noteBase by remember(hex) { mutableStateOf(LocalCache.getNoteIfExists(hex)) }
 
-    LaunchedEffect(key1 = hex) {
-        if (noteBase == null) {
+    if (noteBase == null) {
+        LaunchedEffect(key1 = hex) {
             launch(Dispatchers.IO) {
                 noteBase = LocalCache.checkGetOrCreateNote(hex)
             }
@@ -111,7 +112,16 @@ private fun DisplayEvent(
     nav: (String) -> Unit
 ) {
     LoadNote(nip19.hex) {
-        DisplayNoteLink(it, nip19, nav)
+        if (it != null) {
+            DisplayNoteLink(it, nip19, nav)
+        } else {
+            CreateClickableText(
+                clickablePart = remember(nip19) { "@${nip19.hex.toShortenHex()}" },
+                suffix = nip19.additionalChars,
+                route = remember(nip19) { "Event/${nip19.hex}" },
+                nav = nav
+            )
+        }
     }
 }
 
@@ -121,7 +131,16 @@ private fun DisplayNote(
     nav: (String) -> Unit
 ) {
     LoadNote(nip19.hex) {
-        DisplayNoteLink(it, nip19, nav)
+        if (it != null) {
+            DisplayNoteLink(it, nip19, nav)
+        } else {
+            CreateClickableText(
+                clickablePart = remember(nip19) { "@${nip19.hex.toShortenHex()}" },
+                suffix = nip19.additionalChars,
+                route = remember(nip19) { "Event/${nip19.hex}" },
+                nav = nav
+            )
+        }
     }
 }
 
@@ -137,7 +156,7 @@ private fun DisplayNoteLink(
 
     val channelHex = remember(noteState) { note.channelHex() }
     val noteIdDisplayNote = remember(noteState) { "@${note.idDisplayNote()}" }
-    val addedCharts = remember { "${nip19.additionalChars} " }
+    val addedCharts = remember { "${nip19.additionalChars}" }
 
     if (note.event is ChannelCreateEvent || nip19.kind == ChannelCreateEvent.kind) {
         CreateClickableText(
@@ -186,8 +205,8 @@ private fun DisplayAddress(
 ) {
     var noteBase by remember(nip19) { mutableStateOf(LocalCache.getNoteIfExists(nip19.hex)) }
 
-    LaunchedEffect(key1 = nip19.hex) {
-        if (noteBase == null) {
+    if (noteBase == null) {
+        LaunchedEffect(key1 = nip19.hex) {
             launch(Dispatchers.IO) {
                 noteBase = LocalCache.checkGetOrCreateAddressableNote(nip19.hex)
             }
@@ -199,7 +218,7 @@ private fun DisplayAddress(
 
         val route = remember(noteState) { "Note/${nip19.hex}" }
         val displayName = remember(noteState) { "@${noteState?.note?.idDisplayNote()}" }
-        val addedCharts = remember { "${nip19.additionalChars} " }
+        val addedCharts = remember { "${nip19.additionalChars}" }
 
         CreateClickableText(
             clickablePart = displayName,
@@ -212,7 +231,7 @@ private fun DisplayAddress(
     if (noteBase == null) {
         Text(
             remember {
-                "@${nip19.hex}${nip19.additionalChars} "
+                "@${nip19.hex}${nip19.additionalChars}"
             }
         )
     }
@@ -225,8 +244,8 @@ private fun DisplayUser(
 ) {
     var userBase by remember(nip19) { mutableStateOf(LocalCache.getUserIfExists(nip19.hex)) }
 
-    LaunchedEffect(key1 = nip19.hex) {
-        if (userBase == null) {
+    if (userBase == null) {
+        LaunchedEffect(key1 = nip19.hex) {
             launch(Dispatchers.IO) {
                 userBase = LocalCache.checkGetOrCreateUser(nip19.hex)
             }
@@ -240,7 +259,7 @@ private fun DisplayUser(
     if (userBase == null) {
         Text(
             remember {
-                "@${nip19.hex}${nip19.additionalChars} "
+                "@${nip19.hex}${nip19.additionalChars}"
             }
         )
     }
@@ -268,16 +287,17 @@ private fun RenderUserAsClickableText(
     }
 
     val addedCharts = remember(nip19) {
-        "${nip19.additionalChars} "
+        "${nip19.additionalChars}"
     }
 
     userDisplayName?.let {
         CreateClickableTextWithEmoji(
             clickablePart = it,
             suffix = addedCharts,
-            tags = userTags,
+            maxLines = 1,
             route = route,
-            nav = nav
+            nav = nav,
+            tags = userTags
         )
     }
 }
@@ -285,25 +305,41 @@ private fun RenderUserAsClickableText(
 @Composable
 fun CreateClickableText(
     clickablePart: String,
-    suffix: String,
+    suffix: String?,
+    maxLines: Int = Int.MAX_VALUE,
     overrideColor: Color? = null,
     fontWeight: FontWeight = FontWeight.Normal,
     route: String,
     nav: (String) -> Unit
 ) {
-    ClickableText(
-        text = buildAnnotatedString {
-            withStyle(
-                LocalTextStyle.current.copy(color = overrideColor ?: MaterialTheme.colors.primary, fontWeight = fontWeight).toSpanStyle()
-            ) {
+    val currentStyle = LocalTextStyle.current
+    val primaryColor = MaterialTheme.colors.primary
+    val onBackgroundColor = MaterialTheme.colors.onBackground
+
+    val clickablePartStyle = remember(primaryColor, overrideColor) {
+        currentStyle.copy(color = overrideColor ?: primaryColor, fontWeight = fontWeight).toSpanStyle()
+    }
+
+    val nonClickablePartStyle = remember(onBackgroundColor, overrideColor) {
+        currentStyle.copy(color = overrideColor ?: onBackgroundColor, fontWeight = fontWeight).toSpanStyle()
+    }
+
+    val text = remember(clickablePartStyle, nonClickablePartStyle, clickablePart, suffix) {
+        buildAnnotatedString {
+            withStyle(clickablePartStyle) {
                 append(clickablePart)
             }
-            withStyle(
-                LocalTextStyle.current.copy(color = overrideColor ?: MaterialTheme.colors.onBackground, fontWeight = fontWeight).toSpanStyle()
-            ) {
-                append(suffix)
+            if (!suffix.isNullOrBlank()) {
+                withStyle(nonClickablePartStyle) {
+                    append(suffix)
+                }
             }
-        },
+        }
+    }
+
+    ClickableText(
+        text = text,
+        maxLines = maxLines,
         onClick = { nav(route) }
     )
 }
@@ -381,8 +417,8 @@ fun CreateTextWithEmoji(
 ) {
     var emojiList by remember(text) { mutableStateOf<ImmutableList<Renderable>>(persistentListOf()) }
 
-    LaunchedEffect(key1 = text) {
-        if (emojis.isNotEmpty()) {
+    if (emojis.isNotEmpty()) {
+        LaunchedEffect(key1 = text) {
             launch(Dispatchers.Default) {
                 val newEmojiList = assembleAnnotatedList(text, emojis)
                 if (newEmojiList.isNotEmpty()) {
@@ -410,14 +446,17 @@ fun CreateTextWithEmoji(
             modifier = modifier
         )
     } else {
-        val style = LocalTextStyle.current.merge(
-            TextStyle(
-                color = textColor,
-                textAlign = textAlign,
-                fontWeight = fontWeight,
-                fontSize = fontSize
-            )
-        ).toSpanStyle()
+        val currentStyle = LocalTextStyle.current
+        val style = remember(currentStyle) {
+            currentStyle.merge(
+                TextStyle(
+                    color = textColor,
+                    textAlign = textAlign,
+                    fontWeight = fontWeight,
+                    fontSize = fontSize
+                )
+            ).toSpanStyle()
+        }
 
         InLineIconRenderer(emojiList, style, maxLines, overflow, modifier)
     }
@@ -426,6 +465,7 @@ fun CreateTextWithEmoji(
 @Composable
 fun CreateClickableTextWithEmoji(
     clickablePart: String,
+    maxLines: Int = Int.MAX_VALUE,
     tags: ImmutableListOfLists<String>?,
     style: TextStyle,
     onClick: (Int) -> Unit
@@ -448,29 +488,37 @@ fun CreateClickableTextWithEmoji(
 
     if (emojiList.isEmpty()) {
         ClickableText(
-            AnnotatedString(clickablePart),
+            text = AnnotatedString(clickablePart),
             style = style,
+            maxLines = maxLines,
             onClick = onClick
         )
     } else {
-        ClickableInLineIconRenderer(emojiList, style.toSpanStyle()) {
+        ClickableInLineIconRenderer(emojiList, maxLines, style.toSpanStyle()) {
             onClick(it)
         }
     }
 }
 
+@Immutable
+data class DoubleEmojiList(
+    val part1: ImmutableList<Renderable>,
+    val part2: ImmutableList<Renderable>
+)
+
 @Composable
 fun CreateClickableTextWithEmoji(
     clickablePart: String,
-    suffix: String,
-    tags: ImmutableListOfLists<String>?,
+    suffix: String?,
+    maxLines: Int = Int.MAX_VALUE,
     overrideColor: Color? = null,
     fontWeight: FontWeight = FontWeight.Normal,
     route: String,
-    nav: (String) -> Unit
+    nav: (String) -> Unit,
+    tags: ImmutableListOfLists<String>?
 ) {
     var emojiLists by remember(clickablePart) {
-        mutableStateOf<Pair<ImmutableList<Renderable>, ImmutableList<Renderable>>?>(null)
+        mutableStateOf<DoubleEmojiList?>(null)
     }
 
     LaunchedEffect(key1 = clickablePart) {
@@ -480,23 +528,31 @@ fun CreateClickableTextWithEmoji(
 
             if (emojis.isNotEmpty()) {
                 val newEmojiList1 = assembleAnnotatedList(clickablePart, emojis)
-                val newEmojiList2 = assembleAnnotatedList(suffix, emojis)
+                val newEmojiList2 = suffix?.let { assembleAnnotatedList(it, emojis) } ?: emptyList<Renderable>()
 
                 if (newEmojiList1.isNotEmpty() || newEmojiList2.isNotEmpty()) {
-                    emojiLists = Pair(newEmojiList1.toImmutableList(), newEmojiList2.toImmutableList())
+                    emojiLists = DoubleEmojiList(newEmojiList1.toImmutableList(), newEmojiList2.toImmutableList())
                 }
             }
         }
     }
 
     if (emojiLists == null) {
-        CreateClickableText(clickablePart, suffix, overrideColor, fontWeight, route, nav)
+        CreateClickableText(clickablePart, suffix, maxLines, overrideColor, fontWeight, route, nav)
     } else {
-        ClickableInLineIconRenderer(emojiLists!!.first, LocalTextStyle.current.copy(color = overrideColor ?: MaterialTheme.colors.primary, fontWeight = fontWeight).toSpanStyle()) {
+        ClickableInLineIconRenderer(
+            emojiLists!!.part1,
+            maxLines,
+            LocalTextStyle.current.copy(color = overrideColor ?: MaterialTheme.colors.primary, fontWeight = fontWeight).toSpanStyle()
+        ) {
             nav(route)
         }
 
-        InLineIconRenderer(emojiLists!!.second, LocalTextStyle.current.copy(color = overrideColor ?: MaterialTheme.colors.onBackground, fontWeight = fontWeight).toSpanStyle())
+        InLineIconRenderer(
+            emojiLists!!.part2,
+            LocalTextStyle.current.copy(color = overrideColor ?: MaterialTheme.colors.onBackground, fontWeight = fontWeight).toSpanStyle(),
+            maxLines
+        )
     }
 }
 
@@ -521,7 +577,12 @@ class TextType(val text: String) : Renderable()
 class ImageUrlType(val url: String) : Renderable()
 
 @Composable
-fun ClickableInLineIconRenderer(wordsInOrder: ImmutableList<Renderable>, style: SpanStyle, onClick: (Int) -> Unit) {
+fun ClickableInLineIconRenderer(
+    wordsInOrder: ImmutableList<Renderable>,
+    maxLines: Int = Int.MAX_VALUE,
+    style: SpanStyle,
+    onClick: (Int) -> Unit
+) {
     val inlineContent = wordsInOrder.mapIndexedNotNull { idx, value ->
         if (value is ImageUrlType) {
             Pair(
@@ -574,6 +635,7 @@ fun ClickableInLineIconRenderer(wordsInOrder: ImmutableList<Renderable>, style:
         text = annotatedText,
         modifier = pressIndicator,
         inlineContent = inlineContent,
+        maxLines = maxLines,
         onTextLayout = {
             layoutResult.value = it
         }

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

@@ -2,6 +2,7 @@ package com.vitorpamplona.amethyst.ui.components
 
 import android.content.Intent
 import android.net.Uri
+import androidx.compose.animation.Crossfade
 import androidx.compose.foundation.text.ClickableText
 import androidx.compose.material.LocalTextStyle
 import androidx.compose.material.MaterialTheme
@@ -25,13 +26,16 @@ fun MayBeWithdrawal(lnurlWord: String) {
         }
     }
 
-    lnWithdrawal?.let {
-        ClickableWithdrawal(withdrawalString = it)
+    Crossfade(targetState = lnWithdrawal) {
+        if (it != null) {
+            ClickableWithdrawal(withdrawalString = it)
+        } else {
+            Text(
+                text = lnurlWord,
+                style = LocalTextStyle.current.copy(textDirection = TextDirection.Content)
+            )
+        }
     }
-        ?: Text(
-            text = "$lnurlWord ",
-            style = LocalTextStyle.current.copy(textDirection = TextDirection.Content)
-        )
 }
 
 @Composable

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

@@ -1,5 +1,6 @@
 package com.vitorpamplona.amethyst.ui.components
 
+import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.PaddingValues
@@ -19,13 +20,12 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.drawBehind
-import androidx.compose.ui.graphics.Brush
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.ui.actions.ImmutableListOfLists
+import com.vitorpamplona.amethyst.ui.note.getGradient
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.theme.ButtonBorder
 import com.vitorpamplona.amethyst.ui.theme.secondaryButtonBackground
@@ -80,16 +80,7 @@ fun ExpandableRichTextViewer(
                 modifier = Modifier
                     .align(Alignment.BottomCenter)
                     .fillMaxWidth()
-                    .drawBehind {
-                        drawRect(
-                            Brush.verticalGradient(
-                                colors = listOf(
-                                    backgroundColor.value.copy(alpha = 0f),
-                                    backgroundColor.value
-                                )
-                            )
-                        )
-                    }
+                    .background(getGradient(backgroundColor))
             ) {
                 ShowMoreButton() {
                     showFullText = !showFullText

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

@@ -0,0 +1,19 @@
+package com.vitorpamplona.amethyst.ui.components
+
+import androidx.compose.runtime.Immutable
+
+@Immutable
+sealed class GenericLoadable<T> {
+
+    @Immutable
+    class Loading<T> : GenericLoadable<T>()
+
+    @Immutable
+    class Loaded<T>(val loaded: T) : GenericLoadable<T>()
+
+    @Immutable
+    class Empty<T> : GenericLoadable<T>()
+
+    @Immutable
+    class Error<T>(val errorMessage: String) : GenericLoadable<T>()
+}

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

@@ -2,6 +2,7 @@ package com.vitorpamplona.amethyst.ui.components
 
 import android.content.Intent
 import android.net.Uri
+import androidx.compose.animation.Crossfade
 import androidx.compose.foundation.border
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
@@ -27,7 +28,7 @@ import com.vitorpamplona.amethyst.service.lnurl.LnInvoiceUtil
 import com.vitorpamplona.amethyst.ui.theme.QuoteBorder
 import com.vitorpamplona.amethyst.ui.theme.subtleBorder
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.withContext
+import kotlinx.coroutines.launch
 import java.text.NumberFormat
 
 @Composable
@@ -35,7 +36,7 @@ fun MayBeInvoicePreview(lnbcWord: String) {
     var lnInvoice by remember { mutableStateOf<Pair<String, String?>?>(null) }
 
     LaunchedEffect(key1 = lnbcWord) {
-        withContext(Dispatchers.IO) {
+        launch(Dispatchers.IO) {
             val myInvoice = LnInvoiceUtil.findInvoice(lnbcWord)
             if (myInvoice != null) {
                 val myInvoiceAmount = try {
@@ -50,13 +51,16 @@ fun MayBeInvoicePreview(lnbcWord: String) {
         }
     }
 
-    lnInvoice?.let {
-        InvoicePreview(it.first, it.second)
+    Crossfade(targetState = lnInvoice) {
+        if (it != null) {
+            InvoicePreview(it.first, it.second)
+        } else {
+            Text(
+                text = lnbcWord,
+                style = LocalTextStyle.current.copy(textDirection = TextDirection.Content)
+            )
+        }
     }
-        ?: Text(
-            text = "$lnbcWord ",
-            style = LocalTextStyle.current.copy(textDirection = TextDirection.Content)
-        )
 }
 
 @Composable

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

@@ -10,6 +10,7 @@ import com.abedelazizshe.lightcompressorlibrary.VideoCompressor
 import com.abedelazizshe.lightcompressorlibrary.VideoQuality
 import com.abedelazizshe.lightcompressorlibrary.config.AppSpecificStorageConfiguration
 import com.abedelazizshe.lightcompressorlibrary.config.Configuration
+import com.vitorpamplona.amethyst.service.checkNotInMainThread
 import id.zelory.compressor.Compressor
 import id.zelory.compressor.constraint.default
 import java.io.File
@@ -24,6 +25,8 @@ class MediaCompressor {
         onReady: (Uri, String?, Long?) -> Unit,
         onError: (String) -> Unit
     ) {
+        checkNotInMainThread()
+
         if (contentType?.startsWith("video", true) == true) {
             VideoCompressor.start(
                 context = applicationContext, // => This is required

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

@@ -2,6 +2,8 @@ package com.vitorpamplona.amethyst.ui.components
 
 import android.content.Context
 import android.net.Uri
+import androidx.compose.runtime.Immutable
+import androidx.compose.runtime.Stable
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.toArgb
 import coil.ImageLoader
@@ -11,7 +13,6 @@ import coil.fetch.Fetcher
 import coil.fetch.SourceResult
 import coil.request.ImageRequest
 import coil.request.Options
-import coil.size.Size
 import com.vitorpamplona.amethyst.service.checkNotInMainThread
 import okio.Buffer
 import java.security.MessageDigest
@@ -32,6 +33,8 @@ private fun bytesToRGB(b1: Byte, b2: Byte, b3: Byte): Color {
 }
 
 private fun svgString(msg: String): String {
+    checkNotInMainThread()
+
     val hash = MessageDigest.getInstance("SHA-256").digest(msg.toByteArray())
     val hashHex = hash.joinToString(separator = "") { b -> "%02x".format(b) }
     val bgColor = bytesToRGB(hash[0], hash[1], hash[2])
@@ -59,9 +62,9 @@ private fun svgString(msg: String): String {
 </svg>"""
 }
 
+@Stable
 class HashImageFetcher(
     private val context: Context,
-    private val size: Size,
     private val data: Uri
 ) : Fetcher {
 
@@ -81,21 +84,21 @@ class HashImageFetcher(
 
     object Factory : Fetcher.Factory<Uri> {
         override fun create(data: Uri, options: Options, imageLoader: ImageLoader): Fetcher {
-            return HashImageFetcher(options.context, options.size, data)
+            return HashImageFetcher(options.context, data)
         }
     }
 }
 object Robohash {
-    fun imageRequest(context: Context, message: String, robotSize: Size): ImageRequest {
+    fun imageRequest(context: Context, message: String): ImageRequest {
         return ImageRequest
             .Builder(context)
             .data("robohash:$message")
             .fetcherFactory(HashImageFetcher.Factory)
-            .size(robotSize)
             .build()
     }
 }
 
+@Immutable
 private data class Part(val style: String, val paths: String)
 
 private const val background = """<polyline class="cls-bg" points="150.3 7.4 55.1 97.9 55.1 203.1 150.3 293.6 245.9 203.1 245.9 97.9 150.3 7.4"/>"""

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

@@ -10,18 +10,13 @@ import androidx.compose.ui.graphics.FilterQuality
 import androidx.compose.ui.graphics.drawscope.DrawScope
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.platform.LocalDensity
-import androidx.compose.ui.unit.Dp
 import coil.compose.AsyncImage
 import coil.compose.AsyncImagePainter
 import coil.compose.rememberAsyncImagePainter
-import coil.size.Size
-import java.util.Date
 
 @Composable
 fun RobohashAsyncImage(
     robot: String,
-    robotSize: Dp,
     modifier: Modifier = Modifier,
     contentDescription: String? = null,
     transform: (AsyncImagePainter.State) -> AsyncImagePainter.State = AsyncImagePainter.DefaultTransform,
@@ -33,18 +28,9 @@ fun RobohashAsyncImage(
     filterQuality: FilterQuality = DrawScope.DefaultFilterQuality
 ) {
     val context = LocalContext.current
-    val size = with(LocalDensity.current) {
-        remember {
-            robotSize.roundToPx()
-        }
-    }
 
-    val imageRequest = remember(robotSize, robot) {
-        Robohash.imageRequest(
-            context,
-            robot,
-            Size(size, size)
-        )
+    val imageRequest = remember(robot) {
+        Robohash.imageRequest(context, robot)
     }
 
     AsyncImage(
@@ -61,13 +47,10 @@ fun RobohashAsyncImage(
     )
 }
 
-var imageErrors = mapOf<String, Long>()
-
 @Composable
 fun RobohashFallbackAsyncImage(
     robot: String,
-    robotSize: Dp,
-    model: String,
+    model: String?,
     contentDescription: String?,
     modifier: Modifier = Modifier,
     alignment: Alignment = Alignment.Center,
@@ -76,55 +59,30 @@ fun RobohashFallbackAsyncImage(
     colorFilter: ColorFilter? = null,
     filterQuality: FilterQuality = DrawScope.DefaultFilterQuality
 ) {
-    val errorCache = remember(imageErrors) { imageErrors[model] }
+    val context = LocalContext.current
+    val painter = rememberAsyncImagePainter(
+        model = Robohash.imageRequest(context, robot)
+    )
 
-    if (errorCache != null && (Date().time / 1000) - errorCache < (60 * 5)) {
-        RobohashAsyncImage(
-            robot = robot,
-            robotSize = robotSize,
-            contentDescription = contentDescription,
-            modifier = modifier,
-            alignment = alignment,
-            contentScale = contentScale,
-            alpha = alpha,
-            colorFilter = colorFilter,
-            filterQuality = filterQuality
-        )
-    } else {
-        val context = LocalContext.current
-        val painter = with(LocalDensity.current) {
-            rememberAsyncImagePainter(
-                model = Robohash.imageRequest(
-                    context,
-                    robot,
-                    Size(robotSize.roundToPx(), robotSize.roundToPx())
-                )
-            )
-        }
-
-        AsyncImage(
-            model = model,
-            contentDescription = contentDescription,
-            modifier = modifier,
-            placeholder = painter,
-            fallback = painter,
-            error = painter,
-            alignment = alignment,
-            contentScale = contentScale,
-            alpha = alpha,
-            colorFilter = colorFilter,
-            filterQuality = filterQuality,
-            onError = {
-                imageErrors = imageErrors + Pair(model, Date().time / 1000)
-            }
-        )
-    }
+    AsyncImage(
+        model = model,
+        contentDescription = contentDescription,
+        modifier = modifier,
+        placeholder = painter,
+        fallback = painter,
+        error = painter,
+        alignment = alignment,
+        contentScale = contentScale,
+        alpha = alpha,
+        colorFilter = colorFilter,
+        filterQuality = filterQuality
+    )
 }
 
 @Composable
 fun RobohashAsyncImageProxy(
     robot: String,
-    model: ResizeImage,
+    model: String?,
     contentDescription: String?,
     modifier: Modifier = Modifier,
     alignment: Alignment = Alignment.Center,
@@ -133,32 +91,15 @@ fun RobohashAsyncImageProxy(
     colorFilter: ColorFilter? = null,
     filterQuality: FilterQuality = DrawScope.DefaultFilterQuality
 ) {
-    val proxy = remember(model) { model.proxyUrl() }
-
-    if (proxy == null) {
-        RobohashAsyncImage(
-            robot = robot,
-            robotSize = model.size,
-            contentDescription = contentDescription,
-            modifier = modifier,
-            alignment = alignment,
-            contentScale = contentScale,
-            alpha = alpha,
-            colorFilter = colorFilter,
-            filterQuality = filterQuality
-        )
-    } else {
-        RobohashFallbackAsyncImage(
-            robot = robot,
-            robotSize = model.size,
-            model = proxy,
-            contentDescription = contentDescription,
-            modifier = modifier,
-            alignment = alignment,
-            contentScale = contentScale,
-            alpha = alpha,
-            colorFilter = colorFilter,
-            filterQuality = filterQuality
-        )
-    }
+    RobohashFallbackAsyncImage(
+        robot = robot,
+        model = model,
+        contentDescription = contentDescription,
+        modifier = modifier,
+        alignment = alignment,
+        contentScale = contentScale,
+        alpha = alpha,
+        colorFilter = colorFilter,
+        filterQuality = filterQuality
+    )
 }

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

@@ -33,19 +33,34 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import com.vitorpamplona.amethyst.R
+import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.theme.ButtonBorder
 
 @Composable
 fun SensitivityWarning(
-    hasSensitiveContent: Boolean,
+    note: Note,
+    accountViewModel: AccountViewModel,
+    content: @Composable () -> Unit
+) {
+    val hasSensitiveContent = remember(note.event) { note.event?.isSensitive() ?: false }
+
+    if (hasSensitiveContent) {
+        SensitivityWarning(accountViewModel, content)
+    } else {
+        content()
+    }
+}
+
+@Composable
+fun SensitivityWarning(
     accountViewModel: AccountViewModel,
     content: @Composable () -> Unit
 ) {
     val accountState by accountViewModel.accountLiveData.observeAsState()
 
     var showContentWarningNote by remember(accountState) {
-        mutableStateOf(accountState?.account?.showSensitiveContent != true && hasSensitiveContent)
+        mutableStateOf(accountState?.account?.showSensitiveContent != true)
     }
 
     if (showContentWarningNote) {

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

@@ -29,8 +29,8 @@ import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.focus.focusRequester
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
 import androidx.compose.ui.window.Dialog
+import com.vitorpamplona.amethyst.ui.theme.Font14SP
 import kotlinx.collections.immutable.ImmutableList
 
 @Composable
@@ -120,7 +120,7 @@ fun SpinnerSelectionDialog(
                                     modifier = Modifier
                                         .fillMaxWidth()
                                 ) {
-                                    Text(text = it, color = Color.Gray, fontSize = 14.sp)
+                                    Text(text = it, color = Color.Gray, fontSize = Font14SP)
                                 }
                             }
                         }

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

@@ -21,11 +21,13 @@ fun UrlPreview(url: String, urlText: String) {
     }
 
     // Doesn't use a viewModel because of viewModel reusing issues (too many UrlPreview are created).
-    LaunchedEffect(url) {
-        if (urlPreviewState == UrlPreviewState.Loading) {
+    if (urlPreviewState == UrlPreviewState.Loading) {
+        LaunchedEffect(url) {
             launch(Dispatchers.IO) {
                 UrlCachedPreviewer.previewInfo(url) {
-                    urlPreviewState = it
+                    launch(Dispatchers.Main) {
+                        urlPreviewState = it
+                    }
                 }
             }
         }

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

@@ -52,12 +52,18 @@ import com.google.android.exoplayer2.C
 import com.google.android.exoplayer2.ExoPlayer
 import com.google.android.exoplayer2.MediaItem
 import com.google.android.exoplayer2.Player
+import com.google.android.exoplayer2.ext.okhttp.OkHttpDataSource
 import com.google.android.exoplayer2.source.ProgressiveMediaSource
+import com.google.android.exoplayer2.source.hls.HlsMediaSource
 import com.google.android.exoplayer2.ui.AspectRatioFrameLayout
 import com.google.android.exoplayer2.ui.StyledPlayerView
+import com.google.android.exoplayer2.upstream.DataSource
 import com.vitorpamplona.amethyst.VideoCache
+import com.vitorpamplona.amethyst.service.HttpClient
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
+import kotlin.time.ExperimentalTime
+import kotlin.time.measureTimedValue
 
 public var DefaultMutedSetting = mutableStateOf(true)
 
@@ -93,14 +99,29 @@ fun LoadThumbAndThenVideoView(videoUri: String, description: String? = null, thu
     }
 }
 
+@OptIn(ExperimentalTime::class)
 @Composable
 fun VideoView(
     videoUri: String,
     description: String? = null,
     thumb: VideoThumb? = null,
     onDialog: ((Boolean) -> Unit)? = null
+) {
+    val (value, elapsed) = measureTimedValue {
+        VideoView1(videoUri, description, thumb, onDialog)
+    }
+    Log.d("Rendering Metrics", "VideoView $elapsed $videoUri")
+}
+
+@Composable
+fun VideoView1(
+    videoUri: String,
+    description: String? = null,
+    thumb: VideoThumb? = null,
+    onDialog: ((Boolean) -> Unit)? = null
 ) {
     var exoPlayerData by remember { mutableStateOf<VideoPlayer?>(null) }
+    val defaultToStart by remember { mutableStateOf(DefaultMutedSetting.value) }
     val context = LocalContext.current
 
     LaunchedEffect(key1 = videoUri) {
@@ -112,7 +133,7 @@ fun VideoView(
     }
 
     exoPlayerData?.let {
-        VideoView(videoUri, description, it, thumb, onDialog)
+        VideoView(videoUri, description, it, defaultToStart, thumb, onDialog)
     }
 
     DisposableEffect(Unit) {
@@ -122,11 +143,28 @@ fun VideoView(
     }
 }
 
+@OptIn(ExperimentalTime::class)
 @Composable
 fun VideoView(
     videoUri: String,
     description: String? = null,
     exoPlayerData: VideoPlayer,
+    defaultToStart: Boolean = false,
+    thumb: VideoThumb? = null,
+    onDialog: ((Boolean) -> Unit)? = null
+) {
+    val (value, elapsed) = measureTimedValue {
+        VideoView1(videoUri, description, exoPlayerData, defaultToStart, thumb, onDialog)
+    }
+    Log.d("Rendering Metrics", "VideoView $elapsed $videoUri")
+}
+
+@Composable
+fun VideoView1(
+    videoUri: String,
+    description: String? = null,
+    exoPlayerData: VideoPlayer,
+    defaultToStart: Boolean = false,
     thumb: VideoThumb? = null,
     onDialog: ((Boolean) -> Unit)? = null
 ) {
@@ -137,9 +175,17 @@ fun VideoView(
     exoPlayerData.exoPlayer.apply {
         repeatMode = Player.REPEAT_MODE_ALL
         videoScalingMode = C.VIDEO_SCALING_MODE_SCALE_TO_FIT
-        volume = if (DefaultMutedSetting.value) 0f else 1f
-        if (videoUri.startsWith("file") == true) {
+        volume = if (defaultToStart) 0f else 1f
+        if (videoUri.startsWith("file")) {
             setMediaItem(media)
+        } else if (videoUri.endsWith("m3u8")) {
+            // Should not use cache.
+            val dataSourceFactory: DataSource.Factory = OkHttpDataSource.Factory(HttpClient.getHttpClient())
+            setMediaSource(
+                HlsMediaSource.Factory(dataSourceFactory).createMediaSource(
+                    media
+                )
+            )
         } else {
             setMediaSource(
                 ProgressiveMediaSource.Factory(VideoCache.get()).createMediaSource(

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

@@ -0,0 +1,100 @@
+package com.vitorpamplona.amethyst.ui.components
+
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.material.Divider
+import androidx.compose.material.Icon
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.OutlinedTextField
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.input.KeyboardType
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import com.vitorpamplona.amethyst.R
+import com.vitorpamplona.amethyst.ui.actions.NewPostViewModel
+import com.vitorpamplona.amethyst.ui.theme.Size20Modifier
+import com.vitorpamplona.amethyst.ui.theme.placeholderText
+
+@Composable
+fun ZapRaiserRequest(
+    titleText: String? = null,
+    newPostViewModel: NewPostViewModel
+) {
+    Column(
+        modifier = Modifier.fillMaxWidth()
+    ) {
+        Column(
+            modifier = Modifier.fillMaxWidth()
+        ) {
+            Row(
+                verticalAlignment = Alignment.CenterVertically,
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .padding(bottom = 10.dp)
+            ) {
+                Icon(
+                    painter = painterResource(R.drawable.lightning),
+                    null,
+                    modifier = Size20Modifier,
+                    tint = Color.Unspecified
+                )
+
+                Text(
+                    text = titleText ?: stringResource(R.string.zapraiser),
+                    fontSize = 20.sp,
+                    fontWeight = FontWeight.W500,
+                    modifier = Modifier.padding(start = 10.dp)
+                )
+            }
+
+            Divider()
+
+            Text(
+                text = stringResource(R.string.zapraiser_explainer),
+                color = MaterialTheme.colors.placeholderText,
+                modifier = Modifier.padding(vertical = 10.dp)
+            )
+
+            OutlinedTextField(
+                label = { Text(text = stringResource(R.string.zapraiser_target_amount_in_sats)) },
+                modifier = Modifier.fillMaxWidth(),
+                value = if (newPostViewModel.zapRaiserAmount != null) {
+                    newPostViewModel.zapRaiserAmount.toString()
+                } else {
+                    ""
+                },
+                onValueChange = {
+                    runCatching {
+                        if (it.isEmpty()) {
+                            newPostViewModel.zapRaiserAmount = null
+                        } else {
+                            newPostViewModel.zapRaiserAmount = it.toLongOrNull()
+                        }
+                    }
+                },
+                placeholder = {
+                    Text(
+                        text = "1000",
+                        color = MaterialTheme.colors.placeholderText
+                    )
+                },
+                keyboardOptions = KeyboardOptions.Default.copy(
+                    keyboardType = KeyboardType.Number
+                ),
+                singleLine = true
+            )
+        }
+    }
+}

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

@@ -1,17 +1,16 @@
 package com.vitorpamplona.amethyst.ui.components
 
 import android.content.Context
+import android.os.Build
 import android.util.Log
 import android.widget.Toast
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.background
-import androidx.compose.foundation.border
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.combinedClickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.BoxWithConstraints
-import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.ExperimentalLayoutApi
 import androidx.compose.foundation.layout.FlowRow
 import androidx.compose.foundation.layout.Row
@@ -25,7 +24,7 @@ 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.pager.rememberPagerState
 import androidx.compose.foundation.text.InlineTextContent
 import androidx.compose.foundation.text.appendInlineContent
 import androidx.compose.material.Icon
@@ -37,8 +36,10 @@ import androidx.compose.material.Text
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Report
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.Immutable
 import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
@@ -46,11 +47,11 @@ import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalClipboardManager
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalView
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.text.Placeholder
@@ -59,12 +60,12 @@ import androidx.compose.ui.text.buildAnnotatedString
 import androidx.compose.ui.text.withStyle
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.isFinite
-import androidx.compose.ui.unit.sp
 import androidx.compose.ui.window.Dialog
 import androidx.compose.ui.window.DialogProperties
 import androidx.core.net.toUri
 import coil.annotation.ExperimentalCoilApi
 import coil.compose.AsyncImage
+import coil.compose.AsyncImagePainter
 import coil.imageLoader
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.model.toHexKey
@@ -73,9 +74,8 @@ import com.vitorpamplona.amethyst.ui.actions.CloseButton
 import com.vitorpamplona.amethyst.ui.actions.LoadingAnimation
 import com.vitorpamplona.amethyst.ui.actions.SaveToGallery
 import com.vitorpamplona.amethyst.ui.note.BlankNote
-import com.vitorpamplona.amethyst.ui.theme.QuoteBorder
-import com.vitorpamplona.amethyst.ui.theme.hashVerified
-import com.vitorpamplona.amethyst.ui.theme.subtleBorder
+import com.vitorpamplona.amethyst.ui.theme.Font17SP
+import com.vitorpamplona.amethyst.ui.theme.imageModifier
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.Dispatchers
@@ -175,14 +175,7 @@ fun ZoomableContentView(content: ZoomableContent, images: ImmutableList<Zoomable
         mutableStateOf(false)
     }
 
-    var mainImageModifier = Modifier
-        .fillMaxWidth()
-        .clip(shape = QuoteBorder)
-        .border(
-            1.dp,
-            MaterialTheme.colors.subtleBorder,
-            QuoteBorder
-        )
+    var mainImageModifier = MaterialTheme.colors.imageModifier
 
     if (content is ZoomableUrlContent) {
         mainImageModifier = mainImageModifier.combinedClickable(
@@ -215,90 +208,57 @@ fun ZoomableContentView(content: ZoomableContent, images: ImmutableList<Zoomable
     }
 }
 
-@OptIn(ExperimentalLayoutApi::class)
 @Composable
 private fun LocalImageView(
     content: ZoomableLocalImage,
     mainImageModifier: Modifier
 ) {
-    BoxWithConstraints(contentAlignment = Alignment.Center) {
-        // store the dialog open or close state
-        var imageLoadingState by remember {
-            mutableStateOf<Boolean?>(null)
-        }
+    if (content.localFile != null && content.localFile.exists()) {
+        BoxWithConstraints(contentAlignment = Alignment.Center) {
+            val myModifier = remember {
+                mainImageModifier
+                    .widthIn(max = maxWidth)
+                    .heightIn(max = maxHeight)
+                    .run {
+                        aspectRatio(content.dim)?.let { ratio ->
+                            this.aspectRatio(ratio, false)
+                        } ?: this
+                    }
+            }
 
-        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 = remember {
-            if (maxHeight.isFinite) ContentScale.Fit else ContentScale.FillWidth
-        }
+            val verifierModifier = Modifier.align(Alignment.TopEnd)
+
+            val painterState = remember {
+                mutableStateOf<AsyncImagePainter.State?>(null)
+            }
 
-        if (content.localFile != null && content.localFile.exists()) {
             AsyncImage(
                 model = content.localFile,
                 contentDescription = content.description,
                 contentScale = contentScale,
                 modifier = myModifier,
-                onError = {
-                    if (imageLoadingState != false) {
-                        imageLoadingState = false
-                    }
-                },
-                onSuccess = {
-                    if (imageLoadingState != true) {
-                        imageLoadingState = true
-                    }
+                onState = {
+                    painterState.value = it
                 }
             )
-        }
 
-        if (imageLoadingState == true) {
-            if (content.isVerified != null) {
-                HashVerificationSymbol(content.isVerified, Modifier.align(Alignment.TopEnd))
-            }
-        } else if (imageLoadingState == false || content.localFile == null || !content.localFile.exists()) {
-            BlankNote()
-        } else {
-            if (content.blurhash != null) {
-                DisplayBlurHash(content.blurhash, content.description, contentScale, myModifier)
-            } else {
-                FlowRow() {
-                    DisplayUrlWithLoadingSymbol(content)
-                }
-            }
+            AddedImageFeatures(painterState, content, contentScale, myModifier, verifierModifier)
         }
+    } else {
+        BlankNote()
     }
 }
 
-@OptIn(ExperimentalLayoutApi::class)
 @Composable
 private fun UrlImageView(
     content: ZoomableUrlImage,
     mainImageModifier: Modifier
 ) {
-    val scope = rememberCoroutineScope()
-
     BoxWithConstraints(contentAlignment = Alignment.Center) {
-        val context = LocalContext.current
-
-        // store the dialog open or close state
-        var imageLoadingStatus by remember {
-            mutableStateOf<Boolean?>(null)
-        }
-
-        var verifiedHash by remember {
-            mutableStateOf<Boolean?>(null)
-        }
-
         val myModifier = remember {
             mainImageModifier
                 .widthIn(max = maxWidth)
@@ -314,35 +274,37 @@ private fun UrlImageView(
             if (maxHeight.isFinite) ContentScale.Fit else ContentScale.FillWidth
         }
 
+        val verifierModifier = Modifier.align(Alignment.TopEnd)
+
+        val painterState = remember {
+            mutableStateOf<AsyncImagePainter.State?>(null)
+        }
+
         AsyncImage(
             model = content.url,
             contentDescription = content.description,
             contentScale = contentScale,
             modifier = myModifier,
-            onError = {
-                if (imageLoadingStatus != false) {
-                    imageLoadingStatus = false
-                }
-            },
-            onSuccess = {
-                if (verifiedHash == null) {
-                    scope.launch(Dispatchers.IO) {
-                        verifiedHash = verifyHash(content, context)
-                    }
-                }
-                if (imageLoadingStatus != true) {
-                    imageLoadingStatus = true
-                }
+            onState = {
+                painterState.value = it
             }
         )
 
-        if (imageLoadingStatus == true) {
-            verifiedHash?.let {
-                HashVerificationSymbol(it, Modifier.align(Alignment.TopEnd))
-            }
-        } else if (imageLoadingStatus == false) {
-            ClickableUrl(urlText = "${content.url} ", url = content.url)
-        } else {
+        AddedImageFeatures(painterState, content, contentScale, myModifier, verifierModifier)
+    }
+}
+
+@Composable
+@OptIn(ExperimentalLayoutApi::class)
+private fun AddedImageFeatures(
+    painter: MutableState<AsyncImagePainter.State?>,
+    content: ZoomableLocalImage,
+    contentScale: ContentScale,
+    myModifier: Modifier,
+    verifiedModifier: Modifier
+) {
+    when (painter.value) {
+        null, is AsyncImagePainter.State.Loading -> {
             if (content.blurhash != null) {
                 DisplayBlurHash(content.blurhash, content.description, contentScale, myModifier)
             } else {
@@ -351,6 +313,70 @@ private fun UrlImageView(
                 }
             }
         }
+
+        is AsyncImagePainter.State.Error -> {
+            BlankNote()
+        }
+
+        is AsyncImagePainter.State.Success -> {
+            if (content.isVerified != null) {
+                HashVerificationSymbol(content.isVerified, verifiedModifier)
+            }
+        }
+
+        else -> {
+        }
+    }
+}
+
+@Composable
+@OptIn(ExperimentalLayoutApi::class)
+private fun AddedImageFeatures(
+    painter: MutableState<AsyncImagePainter.State?>,
+    content: ZoomableUrlImage,
+    contentScale: ContentScale,
+    myModifier: Modifier,
+    verifiedModifier: Modifier
+) {
+    var verifiedHash by remember {
+        mutableStateOf<Boolean?>(null)
+    }
+
+    when (painter.value) {
+        null, is AsyncImagePainter.State.Loading -> {
+            if (content.blurhash != null) {
+                DisplayBlurHash(content.blurhash, content.description, contentScale, myModifier)
+            } else {
+                FlowRow() {
+                    DisplayUrlWithLoadingSymbol(content)
+                }
+            }
+        }
+
+        is AsyncImagePainter.State.Error -> {
+            ClickableUrl(urlText = "${content.url} ", url = content.url)
+        }
+
+        is AsyncImagePainter.State.Success -> {
+            if (content.hash != null) {
+                val context = LocalContext.current
+                LaunchedEffect(key1 = content.url) {
+                    launch(Dispatchers.IO) {
+                        val newVerifiedHash = verifyHash(content, context)
+                        if (newVerifiedHash != verifiedHash) {
+                            verifiedHash = newVerifiedHash
+                        }
+                    }
+                }
+            }
+
+            verifiedHash?.let {
+                HashVerificationSymbol(it, verifiedModifier)
+            }
+        }
+
+        else -> {
+        }
     }
 }
 
@@ -386,7 +412,7 @@ private fun DisplayUrlWithLoadingSymbol(content: ZoomableContent) {
 @Composable
 private fun DisplayUrlWithLoadingSymbolWait(content: ZoomableContent) {
     if (content is ZoomableUrlContent) {
-        ClickableUrl(urlText = "${content.url} ", url = content.url)
+        ClickableUrl(urlText = remember { "${content.url} " }, url = content.url)
     } else {
         Text("Loading content... ")
     }
@@ -405,8 +431,8 @@ private fun DisplayUrlWithLoadingSymbolWait(content: ZoomableContent) {
             myId,
             InlineTextContent(
                 Placeholder(
-                    width = 17.sp,
-                    height = 17.sp,
+                    width = Font17SP,
+                    height = Font17SP,
                     placeholderVerticalAlign = PlaceholderVerticalAlign.Center
                 )
             ) {
@@ -448,13 +474,34 @@ private fun DisplayBlurHash(
 @OptIn(ExperimentalFoundationApi::class)
 @Composable
 fun ZoomableImageDialog(imageUrl: ZoomableContent, allImages: ImmutableList<ZoomableContent> = listOf(imageUrl).toImmutableList(), onDismiss: () -> Unit) {
+    val view = LocalView.current
+
+    DisposableEffect(key1 = Unit) {
+        if (Build.VERSION.SDK_INT >= 30) {
+            view.windowInsetsController?.hide(
+                android.view.WindowInsets.Type.systemBars()
+            )
+        }
+
+        onDispose {
+            if (Build.VERSION.SDK_INT >= 30) {
+                view.windowInsetsController?.show(
+                    android.view.WindowInsets.Type.systemBars()
+                )
+            }
+        }
+    }
+
     Dialog(
         onDismissRequest = onDismiss,
-        properties = DialogProperties(usePlatformDefaultWidth = false)
+        properties = DialogProperties(
+            usePlatformDefaultWidth = false,
+            decorFitsSystemWindows = false
+        )
     ) {
         Surface(modifier = Modifier.fillMaxSize(), color = MaterialTheme.colors.background) {
-            Column() {
-                val pagerState: PagerState = remember { PagerState() }
+            Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.TopCenter) {
+                val pagerState: PagerState = rememberPagerState()
 
                 LaunchedEffect(key1 = pagerState, key2 = imageUrl) {
                     val page = allImages.indexOf(imageUrl)
@@ -463,6 +510,18 @@ fun ZoomableImageDialog(imageUrl: ZoomableContent, allImages: ImmutableList<Zoom
                     }
                 }
 
+                if (allImages.size > 1) {
+                    SlidingCarousel(
+                        pagerState = pagerState,
+                        itemsCount = allImages.size,
+                        itemContent = { index ->
+                            RenderImageOrVideo(allImages[index])
+                        }
+                    )
+                } else {
+                    RenderImageOrVideo(imageUrl)
+                }
+
                 Row(
                     modifier = Modifier
                         .padding(10.dp)
@@ -479,18 +538,6 @@ fun ZoomableImageDialog(imageUrl: ZoomableContent, allImages: ImmutableList<Zoom
                         SaveToGallery(localFile = myContent.localFile, mimeType = myContent.mimeType)
                     }
                 }
-
-                if (allImages.size > 1) {
-                    SlidingCarousel(
-                        pagerState = pagerState,
-                        itemsCount = allImages.size,
-                        itemContent = { index ->
-                            RenderImageOrVideo(allImages[index])
-                        }
-                    )
-                } else {
-                    RenderImageOrVideo(imageUrl)
-                }
             }
         }
     }
@@ -549,15 +596,7 @@ private fun HashVerificationSymbol(verifiedHash: Boolean, modifier: Modifier) {
             .height(40.dp)
             .padding(10.dp)
     ) {
-        Box(
-            Modifier
-                .clip(CircleShape)
-                .fillMaxSize(0.6f)
-                .align(Alignment.Center)
-                .background(MaterialTheme.colors.background)
-        )
-
-        if (verifiedHash == true) {
+        if (verifiedHash) {
             IconButton(
                 onClick = {
                     scope.launch {
@@ -572,11 +611,11 @@ private fun HashVerificationSymbol(verifiedHash: Boolean, modifier: Modifier) {
                 Icon(
                     painter = painterResource(R.drawable.ic_verified),
                     "Hash Verified",
-                    tint = MaterialTheme.colors.hashVerified,
+                    tint = Color.Unspecified,
                     modifier = Modifier.size(30.dp)
                 )
             }
-        } else if (verifiedHash == false) {
+        } else {
             IconButton(
                 onClick = {
                     scope.launch {

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

@@ -7,6 +7,10 @@ import com.vitorpamplona.amethyst.model.Note
 object BookmarkPrivateFeedFilter : FeedFilter<Note>() {
     lateinit var account: Account
 
+    override fun feedKey(): String {
+        return account.userProfile().latestBookmarkList?.id ?: ""
+    }
+
     override fun feed(): List<Note> {
         val privKey = account.loggedIn.privKey ?: return emptyList()
 

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

@@ -7,6 +7,9 @@ import com.vitorpamplona.amethyst.model.Note
 object BookmarkPublicFeedFilter : FeedFilter<Note>() {
     lateinit var account: Account
 
+    override fun feedKey(): String {
+        return BookmarkPrivateFeedFilter.account.userProfile().latestBookmarkList?.id ?: ""
+    }
     override fun feed(): List<Note> {
         val bookmarks = account.userProfile().latestBookmarkList
 

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

@@ -5,6 +5,11 @@ import com.vitorpamplona.amethyst.model.Channel
 import com.vitorpamplona.amethyst.model.Note
 
 class ChannelFeedFilter(val channel: Channel, val account: Account) : AdditiveFeedFilter<Note>() {
+
+    override fun feedKey(): String {
+        return channel.idHex
+    }
+
     // returns the last Note of each user.
     override fun feed(): List<Note> {
         return channel.notes

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

@@ -6,6 +6,10 @@ import com.vitorpamplona.amethyst.model.User
 
 class ChatroomFeedFilter(val withUser: User, val account: Account) : AdditiveFeedFilter<Note>() {
     // returns the last Note of each user.
+    override fun feedKey(): String {
+        return withUser.pubkeyHex
+    }
+
     override fun feed(): List<Note> {
         val messages = account
             .userProfile()

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

@@ -11,6 +11,10 @@ import kotlin.time.measureTimedValue
 
 class ChatroomListKnownFeedFilter(val account: Account) : AdditiveFeedFilter<Note>() {
 
+    override fun feedKey(): String {
+        return account.userProfile().pubkeyHex
+    }
+
     // returns the last Note of each user.
     override fun feed(): List<Note> {
         val me = account.userProfile()
@@ -30,9 +34,9 @@ class ChatroomListKnownFeedFilter(val account: Account) : AdditiveFeedFilter<Not
 
         val publicChannels = account.followingChannels().map { it ->
             it.notes.values
-                .filter { account.isAcceptable(it) }
+                .filter { account.isAcceptable(it) && it.event != null }
                 .sortedWith(compareBy({ it.createdAt() }, { it.idHex }))
-                .lastOrNull { it.event != null }
+                .lastOrNull()
         }
 
         return (privateMessages + publicChannels)

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

@@ -10,6 +10,10 @@ import kotlin.time.measureTimedValue
 
 class ChatroomListNewFeedFilter(val account: Account) : AdditiveFeedFilter<Note>() {
 
+    override fun feedKey(): String {
+        return account.userProfile().pubkeyHex
+    }
+
     // returns the last Note of each user.
     override fun feed(): List<Note> {
         val me = account.userProfile()

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

@@ -15,9 +15,16 @@ abstract class FeedFilter<T> {
         }
 
         Log.d("Time", "${this.javaClass.simpleName} Full Feed in $elapsed with ${feed.size} objects")
-        return feed.take(1000)
+        return feed.take(limit())
     }
 
+    open fun limit() = 1000
+
+    /**
+     * Returns a string that serves as the key to invalidate the list if it changes.
+     */
+    abstract fun feedKey(): String
+
     abstract fun feed(): List<T>
 }
 
@@ -33,7 +40,7 @@ abstract class AdditiveFeedFilter<T> : FeedFilter<T>() {
             val newItemsToBeAdded = applyFilter(newItems)
             if (newItemsToBeAdded.isNotEmpty()) {
                 val newList = oldList.toSet() + newItemsToBeAdded
-                sort(newList).take(1000)
+                sort(newList).take(limit())
             } else {
                 oldList
             }

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

@@ -1,49 +0,0 @@
-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.*
-
-class GlobalFeedFilter(val account: Account) : AdditiveFeedFilter<Note>() {
-
-    override fun feed(): List<Note> {
-        val notes = innerApplyFilter(LocalCache.notes.values)
-        val longFormNotes = innerApplyFilter(LocalCache.addressables.values)
-
-        return sort(notes + longFormNotes)
-    }
-
-    override fun applyFilter(collection: Set<Note>): Set<Note> {
-        return innerApplyFilter(collection)
-    }
-
-    private fun innerApplyFilter(collection: Collection<Note>): Set<Note> {
-        val followChannels = account.followingChannels
-        val followUsers = account.followingKeySet()
-        val now = System.currentTimeMillis() / 1000
-
-        return collection
-            .asSequence()
-            .filter {
-                (it.event is BaseTextNoteEvent || it.event is AudioTrackEvent) && it.replyTo.isNullOrEmpty()
-            }
-            .filter {
-                val channel = it.channelHex()
-                // does not show events already in the public chat list
-                (channel == null || channel !in followChannels) &&
-                    // does not show people the user already follows
-                    (it.author?.pubkeyHex !in followUsers)
-            }
-            .filter { account.isAcceptable(it) }
-            .filter {
-                // Do not show notes with the creation time exceeding the current time, as they will always stay at the top of the global feed, which is cheating.
-                it.createdAt()!! <= now
-            }
-            .toSet()
-    }
-
-    override fun sort(collection: Set<Note>): List<Note> {
-        return collection.sortedWith(compareBy({ it.createdAt() }, { it.idHex })).reversed()
-    }
-}

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

@@ -12,6 +12,10 @@ object HashtagFeedFilter : AdditiveFeedFilter<Note>() {
     lateinit var account: Account
     var tag: String? = null
 
+    override fun feedKey(): String {
+        return account.userProfile().pubkeyHex + "-" + tag
+    }
+
     fun loadHashtag(account: Account, tag: String?) {
         this.account = account
         this.tag = tag

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

@@ -5,6 +5,9 @@ import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.User
 
 class HiddenAccountsFeedFilter(val account: Account) : FeedFilter<User>() {
+    override fun feedKey(): String {
+        return account.userProfile().pubkeyHex + "-" + HashtagFeedFilter.tag
+    }
 
     override fun feed(): List<User> {
         return (account.hiddenUsers + account.transientHiddenUsers)

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

@@ -1,12 +1,20 @@
 package com.vitorpamplona.amethyst.ui.dal
 
 import com.vitorpamplona.amethyst.model.Account
+import com.vitorpamplona.amethyst.model.GLOBAL_FOLLOWS
 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
+import com.vitorpamplona.amethyst.service.model.LiveActivitiesChatMessageEvent
 import com.vitorpamplona.amethyst.service.model.PollNoteEvent
 import com.vitorpamplona.amethyst.service.model.TextNoteEvent
 
 class HomeConversationsFeedFilter(val account: Account) : AdditiveFeedFilter<Note>() {
+
+    override fun feedKey(): String {
+        return account.userProfile().pubkeyHex + "-" + account.defaultHomeFollowList
+    }
+
     override fun feed(): List<Note> {
         return sort(innerApplyFilter(LocalCache.notes.values))
     }
@@ -16,16 +24,21 @@ class HomeConversationsFeedFilter(val account: Account) : AdditiveFeedFilter<Not
     }
 
     private fun innerApplyFilter(collection: Collection<Note>): Set<Note> {
+        val isGlobal = account.defaultHomeFollowList == GLOBAL_FOLLOWS
+
         val followingKeySet = account.selectedUsersFollowList(account.defaultHomeFollowList) ?: emptySet()
         val followingTagSet = account.selectedTagsFollowList(account.defaultHomeFollowList) ?: emptySet()
 
+        val now = System.currentTimeMillis() / 1000
+
         return collection
             .asSequence()
             .filter {
-                (it.event is TextNoteEvent || it.event is PollNoteEvent) &&
-                    (it.author?.pubkeyHex in followingKeySet || (it.event?.isTaggedHashes(followingTagSet) ?: false)) &&
+                (it.event is TextNoteEvent || it.event is PollNoteEvent || it.event is ChannelMessageEvent || it.event is LiveActivitiesChatMessageEvent) &&
+                    (isGlobal || it.author?.pubkeyHex in followingKeySet || it.event?.isTaggedHashes(followingTagSet) ?: false) &&
                     // && account.isAcceptable(it)  // This filter follows only. No need to check if acceptable
                     it.author?.let { !account.isHidden(it) } ?: true &&
+                    ((it.event?.createdAt() ?: 0) < now) &&
                     !it.isNewThread()
             }
             .toSet()

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

@@ -0,0 +1,57 @@
+package com.vitorpamplona.amethyst.ui.dal
+
+import com.vitorpamplona.amethyst.model.Account
+import com.vitorpamplona.amethyst.model.GLOBAL_FOLLOWS
+import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.service.OnlineChecker
+import com.vitorpamplona.amethyst.service.checkNotInMainThread
+import com.vitorpamplona.amethyst.service.model.LiveActivitiesEvent
+import java.util.Date
+
+class HomeLiveActivitiesFeedFilter(val account: Account) : AdditiveFeedFilter<Note>() {
+    override fun feedKey(): String {
+        val followingKeySet = account.selectedUsersFollowList(account.defaultHomeFollowList)?.size ?: 0
+        val followingTagSet = account.selectedTagsFollowList(account.defaultHomeFollowList)?.size ?: 0
+
+        return account.userProfile().pubkeyHex + "-" + account.defaultHomeFollowList + "-" + followingKeySet + "-" + followingTagSet
+    }
+
+    override fun feed(): List<Note> {
+        val longFormNotes = innerApplyFilter(LocalCache.addressables.values)
+
+        return sort(longFormNotes)
+    }
+
+    override fun applyFilter(collection: Set<Note>): Set<Note> {
+        return innerApplyFilter(collection)
+    }
+
+    private fun innerApplyFilter(collection: Collection<Note>): Set<Note> {
+        checkNotInMainThread()
+
+        val isGlobal = account.defaultHomeFollowList == GLOBAL_FOLLOWS
+
+        val followingKeySet = account.selectedUsersFollowList(account.defaultHomeFollowList) ?: emptySet()
+        val followingTagSet = account.selectedTagsFollowList(account.defaultHomeFollowList) ?: emptySet()
+
+        val twoHrs = (Date().time / 1000) - 60 * 60 * 2 // hrs
+
+        return collection
+            .asSequence()
+            .filter { it ->
+                val noteEvent = it.event
+                (noteEvent is LiveActivitiesEvent && noteEvent.createdAt > twoHrs && noteEvent.status() == "live" && OnlineChecker.isOnline(noteEvent.streaming())) &&
+                    (isGlobal || it.author?.pubkeyHex in followingKeySet || noteEvent.isTaggedHashes(followingTagSet)) &&
+                    // && account.isAcceptable(it)  // This filter follows only. No need to check if acceptable
+                    it.author?.let { !account.isHidden(it.pubkeyHex) } ?: true
+            }
+            .toSet()
+    }
+
+    override fun limit() = 2
+
+    override fun sort(collection: Set<Note>): List<Note> {
+        return collection.sortedWith(compareBy({ it.createdAt() }, { it.idHex })).reversed()
+    }
+}