v0.65.1

Added #Cashu

app/build.gradle

@@ -13,8 +13,8 @@ android {
         applicationId "com.vitorpamplona.amethyst"
         minSdk 26
         targetSdk 33
-        versionCode 230
-        versionName "0.63.0"
+        versionCode 237
+        versionName "0.65.1"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {

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

@@ -55,6 +55,7 @@ private object PrefKeys {
     const val DEFAULT_HOME_FOLLOW_LIST = "defaultHomeFollowList"
     const val DEFAULT_STORIES_FOLLOW_LIST = "defaultStoriesFollowList"
     const val DEFAULT_NOTIFICATION_FOLLOW_LIST = "defaultNotificationFollowList"
+    const val DEFAULT_DISCOVERY_FOLLOW_LIST = "defaultDiscoveryFollowList"
     const val ZAP_PAYMENT_REQUEST_SERVER = "zapPaymentServer"
     const val LATEST_CONTACT_LIST = "latestContactList"
     const val HIDE_DELETE_REQUEST_DIALOG = "hide_delete_request_dialog"
@@ -216,6 +217,7 @@ object LocalPreferences {
             putString(PrefKeys.DEFAULT_HOME_FOLLOW_LIST, account.defaultHomeFollowList)
             putString(PrefKeys.DEFAULT_STORIES_FOLLOW_LIST, account.defaultStoriesFollowList)
             putString(PrefKeys.DEFAULT_NOTIFICATION_FOLLOW_LIST, account.defaultNotificationFollowList)
+            putString(PrefKeys.DEFAULT_DISCOVERY_FOLLOW_LIST, account.defaultDiscoveryFollowList)
             putString(PrefKeys.ZAP_PAYMENT_REQUEST_SERVER, gson.toJson(account.zapPaymentRequest))
             putString(PrefKeys.LATEST_CONTACT_LIST, Event.gson.toJson(account.backupContactList))
             putBoolean(PrefKeys.HIDE_DELETE_REQUEST_DIALOG, account.hideDeleteRequestDialog)
@@ -256,6 +258,7 @@ object LocalPreferences {
             val defaultHomeFollowList = getString(PrefKeys.DEFAULT_HOME_FOLLOW_LIST, null) ?: KIND3_FOLLOWS
             val defaultStoriesFollowList = getString(PrefKeys.DEFAULT_STORIES_FOLLOW_LIST, null) ?: GLOBAL_FOLLOWS
             val defaultNotificationFollowList = getString(PrefKeys.DEFAULT_NOTIFICATION_FOLLOW_LIST, null) ?: GLOBAL_FOLLOWS
+            val defaultDiscoveryFollowList = getString(PrefKeys.DEFAULT_DISCOVERY_FOLLOW_LIST, null) ?: GLOBAL_FOLLOWS
 
             val zapAmountChoices = gson.fromJson(
                 getString(PrefKeys.ZAP_AMOUNTS, "[]"),
@@ -349,6 +352,7 @@ object LocalPreferences {
                 defaultHomeFollowList = defaultHomeFollowList,
                 defaultStoriesFollowList = defaultStoriesFollowList,
                 defaultNotificationFollowList = defaultNotificationFollowList,
+                defaultDiscoveryFollowList = defaultDiscoveryFollowList,
                 zapPaymentRequest = zapPaymentRequestServer,
                 hideDeleteRequestDialog = hideDeleteRequestDialog,
                 hideBlockAlertDialog = hideBlockAlertDialog,

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

@@ -14,7 +14,7 @@ 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.NostrDiscoveryDataSource
 import com.vitorpamplona.amethyst.service.NostrHomeDataSource
 import com.vitorpamplona.amethyst.service.NostrSingleChannelDataSource
 import com.vitorpamplona.amethyst.service.NostrSingleEventDataSource
@@ -67,6 +67,7 @@ object ServiceManager {
             NostrHomeDataSource.account = myAccount
             NostrChatroomListDataSource.account = myAccount
             NostrVideoDataSource.account = myAccount
+            NostrDiscoveryDataSource.account = myAccount
             ImageUploader.account = myAccount
 
             // Notification Elements
@@ -88,8 +89,8 @@ object ServiceManager {
         NostrHomeDataSource.stop()
         NostrChannelDataSource.stop()
         NostrChatroomListDataSource.stop()
+        NostrDiscoveryDataSource.stop()
 
-        NostrGlobalDataSource.stop()
         NostrSingleChannelDataSource.stop()
         NostrSingleEventDataSource.stop()
         NostrSingleUserDataSource.stop()

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

@@ -62,6 +62,7 @@ class Account(
     var defaultHomeFollowList: String = KIND3_FOLLOWS,
     var defaultStoriesFollowList: String = GLOBAL_FOLLOWS,
     var defaultNotificationFollowList: String = GLOBAL_FOLLOWS,
+    var defaultDiscoveryFollowList: String = GLOBAL_FOLLOWS,
     var zapPaymentRequest: Nip47URI? = null,
     var hideDeleteRequestDialog: Boolean = false,
     var hideBlockAlertDialog: Boolean = false,
@@ -899,6 +900,12 @@ class Account(
         saveable.invalidateData()
     }
 
+    fun changeDefaultDiscoveryFollowList(name: String) {
+        defaultDiscoveryFollowList = name
+        live.invalidateData()
+        saveable.invalidateData()
+    }
+
     fun changeZapAmounts(newAmounts: List<Long>) {
         zapAmountChoices = newAmounts
         live.invalidateData()

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

@@ -7,18 +7,19 @@ import androidx.compose.ui.unit.dp
 import com.vitorpamplona.amethyst.R
 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(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
     }

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

@@ -35,7 +35,7 @@ object LocalCache {
     fun checkGetOrCreateUser(key: String): User? {
         checkNotInMainThread()
 
-        if (isValidHexNpub(key)) {
+        if (isValidHex(key)) {
             return getOrCreateUser(key)
         }
         return null
@@ -69,7 +69,7 @@ object LocalCache {
         if (ATag.isATag(key)) {
             return checkGetOrCreateAddressableNote(key)
         }
-        if (isValidHexNpub(key)) {
+        if (isValidHex(key)) {
             val note = getOrCreateNote(key)
             val noteEvent = note.event
             if (noteEvent is AddressableEvent) {
@@ -94,7 +94,7 @@ object LocalCache {
     fun checkGetOrCreateChannel(key: String): Channel? {
         checkNotInMainThread()
 
-        if (isValidHexNpub(key)) {
+        if (isValidHex(key)) {
             return getOrCreateChannel(key) {
                 PublicChatChannel(key)
             }
@@ -108,7 +108,7 @@ object LocalCache {
         return null
     }
 
-    private fun isValidHexNpub(key: String): Boolean {
+    private fun isValidHex(key: String): Boolean {
         if (key.isBlank()) return false
         if (key.contains(":")) return false
 
@@ -798,7 +798,7 @@ object LocalCache {
 
         note.loadEvent(event, author, replyTo)
 
-        // Log.d("CM", "New Note (${notes.size},${users.size}) ${note.author?.toBestDisplayName()} ${note.event?.content()} ${formattedDateTime(event.createdAt)}")
+        Log.d("CM", "New Chat Note (${note.author?.toBestDisplayName()} ${note.event?.content()} ${formattedDateTime(event.createdAt)}")
 
         // Counts the replies
         replyTo.forEach {

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

@@ -279,6 +279,20 @@ open class Note(val idHex: String) {
         }
     }
 
+    fun publicZapAuthors(): Set<HexKey> {
+        // Zaps who the requester was the user
+        return zaps.mapNotNull {
+            it.key.author?.pubkeyHex
+        }.toSet()
+    }
+
+    fun reactionAuthors(): Set<HexKey> {
+        // Zaps who the requester was the user
+        return reactions.values.map {
+            it.mapNotNull { it.author?.pubkeyHex }
+        }.flatten().toSet()
+    }
+
     fun isReactedBy(user: User): String? {
         return reactions.filter {
             it.value.any { it.author?.pubkeyHex == user.pubkeyHex }
@@ -502,7 +516,7 @@ 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() {

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

@@ -459,7 +459,7 @@ class UserMetadata {
 
 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/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

@@ -53,7 +53,7 @@ class CashuProcessor {
             LightningAddressResolver().lnAddressInvoice(
                 lnaddress = lud16,
                 milliSats = token.redeemInvoiceAmount * 1000, // Make invoice and leave room for fees
-                message = "Reedem Cashu",
+                message = "Redeem Cashu",
                 onSuccess = { invoice ->
                     meltInvoice(token, invoice, onSuccess, onError)
                 },

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

@@ -19,6 +19,9 @@ class Nip05Verifier() {
         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
     }
@@ -92,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/NostrDiscoveryDataSource.kt

@@ -0,0 +1,57 @@
+package com.vitorpamplona.amethyst.service
+
+import com.vitorpamplona.amethyst.model.Account
+import com.vitorpamplona.amethyst.service.model.ChannelCreateEvent
+import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
+import com.vitorpamplona.amethyst.service.model.ChannelMetadataEvent
+import com.vitorpamplona.amethyst.service.model.LiveActivitiesChatMessageEvent
+import com.vitorpamplona.amethyst.service.model.LiveActivitiesEvent
+import com.vitorpamplona.amethyst.service.relays.FeedType
+import com.vitorpamplona.amethyst.service.relays.JsonFilter
+import com.vitorpamplona.amethyst.service.relays.TypedFilter
+
+object NostrDiscoveryDataSource : NostrDataSource("DiscoveryFeed") {
+    lateinit var account: Account
+
+    fun createContextualFilter(): TypedFilter {
+        val follows = account.selectedUsersFollowList(account.defaultDiscoveryFollowList)
+
+        val followKeys = follows?.map {
+            it.substring(0, 6)
+        }
+
+        return TypedFilter(
+            types = setOf(FeedType.GLOBAL),
+            filter = JsonFilter(
+                authors = followKeys,
+                kinds = listOf(ChannelCreateEvent.kind, ChannelMetadataEvent.kind, ChannelMessageEvent.kind, LiveActivitiesChatMessageEvent.kind, LiveActivitiesEvent.kind),
+                limit = 1000
+            )
+        )
+    }
+
+    fun createFollowTagsFilter(): TypedFilter? {
+        val hashToLoad = account.selectedTagsFollowList(account.defaultDiscoveryFollowList)
+
+        if (hashToLoad.isNullOrEmpty()) return null
+
+        return TypedFilter(
+            types = setOf(FeedType.GLOBAL),
+            filter = JsonFilter(
+                kinds = listOf(ChannelCreateEvent.kind, ChannelMetadataEvent.kind, ChannelMessageEvent.kind, LiveActivitiesChatMessageEvent.kind, LiveActivitiesEvent.kind),
+                tags = mapOf(
+                    "t" to hashToLoad.map {
+                        listOf(it, it.lowercase(), it.uppercase(), it.capitalize())
+                    }.flatten()
+                ),
+                limit = 1000
+            )
+        )
+    }
+
+    val discoveryFeedChannel = requestNewChannel()
+
+    override fun updateChannelFilters() {
+        discoveryFeedChannel.typedFilters = listOfNotNull(createContextualFilter(), createFollowTagsFilter()).ifEmpty { null }
+    }
+}

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

@@ -51,13 +51,13 @@ 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),

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

@@ -122,6 +122,8 @@ object NostrSingleEventDataSource : NostrDataSource("SingleEventFeed") {
     }
 
     val singleEventChannel = requestNewChannel { time, relayUrl ->
+        checkNotInMainThread()
+
         eventsToWatch.forEach {
             val eose = it.lastReactionsDownloadTime[relayUrl]
             if (eose == null) {
@@ -159,16 +161,16 @@ object NostrSingleEventDataSource : NostrDataSource("SingleEventFeed") {
         }
     }
 
-    fun addAddress(aTag: Note) {
-        if (!addressesToWatch.contains(aTag)) {
-            addressesToWatch = addressesToWatch.plus(aTag)
+    fun addAddress(addressableNote: Note) {
+        if (!addressesToWatch.contains(addressableNote)) {
+            addressesToWatch = addressesToWatch.plus(addressableNote)
             invalidateFilters()
         }
     }
 
-    fun removeAddress(aTag: Note) {
-        if (addressesToWatch.contains(aTag)) {
-            addressesToWatch = addressesToWatch.minus(aTag)
+    fun removeAddress(addressableNote: Note) {
+        if (addressesToWatch.contains(addressableNote)) {
+            addressesToWatch = addressesToWatch.minus(addressableNote)
             invalidateFilters()
         }
     }

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

@@ -25,15 +25,27 @@ class LiveActivitiesEvent(
     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 status() = checkStatus(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)) }
 
+    fun checkStatus(eventStatus: String?): String? {
+        return if (eventStatus == STATUS_LIVE && createdAt < Date().time / 1000 - (60 * 60 * 8)) { // 2 hours {
+            STATUS_ENDED
+        } else {
+            eventStatus
+        }
+    }
+
     companion object {
         const val kind = 30311
 
+        const val STATUS_LIVE = "live"
+        const val STATUS_PLANNED = "planned"
+        const val STATUS_ENDED = "ended"
+
         fun create(
             privateKey: ByteArray,
             createdAt: Long = Date().time / 1000

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

@@ -67,6 +67,7 @@ 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
@@ -88,8 +89,7 @@ import kotlinx.coroutines.withContext
 @OptIn(ExperimentalComposeUiApi::class)
 @Composable
 fun NewPostView(onClose: () -> Unit, baseReplyTo: Note? = null, quote: Note? = null, accountViewModel: AccountViewModel, nav: (String) -> Unit) {
-    val accountState by accountViewModel.accountLiveData.observeAsState()
-    val account = remember(accountState) { accountState?.account } ?: return
+    val account = remember(accountViewModel) { accountViewModel.account }
 
     val postViewModel: NewPostViewModel = viewModel()
 

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

@@ -20,9 +20,9 @@ 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

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

@@ -292,32 +292,44 @@ fun loadRelayInfo(
     scope: CoroutineScope,
     onInfo: (RelayInformation) -> Unit
 ) {
-    val url = if (dirtyUrl.contains("://")) {
-        dirtyUrl
-            .replace("wss://", "https://")
-            .replace("ws://", "http://")
-    } else {
-        "https://$dirtyUrl"
-    }
+    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()
+        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 {
+        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(
@@ -327,31 +339,31 @@ fun loadRelayInfo(
                                         ).show()
                                 }
                             }
-                        } catch (e: Exception) {
-                            Log.e("RelayInfoFail", "Resulting Message from Relay 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()
                         }
                     }
                 }
-
-                override fun onFailure(call: Call, e: IOException) {
-                    Log.e("RelayInfoFail", "Resulting Message from Relay in not parseable", 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/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}"
                 }
             )
         }
@@ -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(
@@ -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}"
             }
         )
     }
@@ -240,7 +259,7 @@ private fun DisplayUser(
     if (userBase == null) {
         Text(
             remember {
-                "@${nip19.hex}${nip19.additionalChars} "
+                "@${nip19.hex}${nip19.additionalChars}"
             }
         )
     }
@@ -268,7 +287,7 @@ private fun RenderUserAsClickableText(
     }
 
     val addedCharts = remember(nip19) {
-        "${nip19.additionalChars} "
+        "${nip19.additionalChars}"
     }
 
     userDisplayName?.let {
@@ -286,7 +305,7 @@ private fun RenderUserAsClickableText(
 @Composable
 fun CreateClickableText(
     clickablePart: String,
-    suffix: String,
+    suffix: String?,
     maxLines: Int = Int.MAX_VALUE,
     overrideColor: Color? = null,
     fontWeight: FontWeight = FontWeight.Normal,
@@ -310,8 +329,10 @@ fun CreateClickableText(
             withStyle(clickablePartStyle) {
                 append(clickablePart)
             }
-            withStyle(nonClickablePartStyle) {
-                append(suffix)
+            if (!suffix.isNullOrBlank()) {
+                withStyle(nonClickablePartStyle) {
+                    append(suffix)
+                }
             }
         }
     }
@@ -488,7 +509,7 @@ data class DoubleEmojiList(
 @Composable
 fun CreateClickableTextWithEmoji(
     clickablePart: String,
-    suffix: String,
+    suffix: String?,
     maxLines: Int = Int.MAX_VALUE,
     overrideColor: Color? = null,
     fontWeight: FontWeight = FontWeight.Normal,
@@ -507,7 +528,7 @@ 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 = DoubleEmojiList(newEmojiList1.toImmutableList(), newEmojiList2.toImmutableList())

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

@@ -31,7 +31,7 @@ fun MayBeWithdrawal(lnurlWord: String) {
             ClickableWithdrawal(withdrawalString = it)
         } else {
             Text(
-                text = "$lnurlWord ",
+                text = lnurlWord,
                 style = LocalTextStyle.current.copy(textDirection = TextDirection.Content)
             )
         }

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

@@ -56,7 +56,7 @@ fun MayBeInvoicePreview(lnbcWord: String) {
             InvoicePreview(it.first, it.second)
         } else {
             Text(
-                text = "$lnbcWord ",
+                text = lnbcWord,
                 style = LocalTextStyle.current.copy(textDirection = TextDirection.Content)
             )
         }

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

@@ -1,14 +1,16 @@
 package com.vitorpamplona.amethyst.ui.components
 
 import android.util.Log
-import android.util.LruCache
 import android.util.Patterns
 import androidx.compose.animation.Crossfade
 import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.text.BasicText
 import androidx.compose.foundation.text.ClickableText
 import androidx.compose.foundation.text.InlineTextContent
 import androidx.compose.foundation.text.appendInlineContent
 import androidx.compose.material.Icon
+import androidx.compose.material.LocalContentAlpha
+import androidx.compose.material.LocalContentColor
 import androidx.compose.material.LocalTextStyle
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.ProvideTextStyle
@@ -17,25 +19,47 @@ import androidx.compose.runtime.*
 import androidx.compose.runtime.livedata.observeAsState
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.takeOrElse
+import androidx.compose.ui.layout.SubcomposeLayout
 import androidx.compose.ui.platform.LocalUriHandler
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.*
 import androidx.compose.ui.text.style.TextDirection
+import androidx.compose.ui.unit.Constraints
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.em
 import androidx.lifecycle.distinctUntilChanged
 import androidx.lifecycle.map
 import com.halilibo.richtext.markdown.Markdown
 import com.halilibo.richtext.markdown.MarkdownParseOptions
 import com.halilibo.richtext.ui.material.MaterialRichText
-import com.linkedin.urls.detection.UrlDetector
-import com.linkedin.urls.detection.UrlDetectorOptions
 import com.vitorpamplona.amethyst.model.HashtagIcon
 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.model.User
 import com.vitorpamplona.amethyst.model.checkForHashtagWithIcon
+import com.vitorpamplona.amethyst.service.BechSegment
+import com.vitorpamplona.amethyst.service.CachedRichTextParser
+import com.vitorpamplona.amethyst.service.CashuSegment
+import com.vitorpamplona.amethyst.service.EmailSegment
+import com.vitorpamplona.amethyst.service.EmojiSegment
+import com.vitorpamplona.amethyst.service.HashIndexEventSegment
+import com.vitorpamplona.amethyst.service.HashIndexUserSegment
+import com.vitorpamplona.amethyst.service.HashTagSegment
+import com.vitorpamplona.amethyst.service.ImageSegment
+import com.vitorpamplona.amethyst.service.InvoiceSegment
+import com.vitorpamplona.amethyst.service.LinkSegment
+import com.vitorpamplona.amethyst.service.PhoneSegment
+import com.vitorpamplona.amethyst.service.RegularTextSegment
+import com.vitorpamplona.amethyst.service.RichTextViewerState
+import com.vitorpamplona.amethyst.service.SchemelessUrlSegment
+import com.vitorpamplona.amethyst.service.Segment
+import com.vitorpamplona.amethyst.service.WithdrawSegment
 import com.vitorpamplona.amethyst.service.nip19.Nip19
 import com.vitorpamplona.amethyst.ui.actions.ImmutableListOfLists
+import com.vitorpamplona.amethyst.ui.note.LoadUser
 import com.vitorpamplona.amethyst.ui.note.NoteCompose
+import com.vitorpamplona.amethyst.ui.note.toShortenHex
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.theme.Font17SP
 import com.vitorpamplona.amethyst.ui.theme.MarkdownTextStyle
@@ -43,15 +67,6 @@ import com.vitorpamplona.amethyst.ui.theme.innerPostModifier
 import com.vitorpamplona.amethyst.ui.theme.markdownStyle
 import com.vitorpamplona.amethyst.ui.theme.replyModifier
 import com.vitorpamplona.amethyst.ui.uriToRoute
-import kotlinx.collections.immutable.ImmutableList
-import kotlinx.collections.immutable.ImmutableMap
-import kotlinx.collections.immutable.ImmutableSet
-import kotlinx.collections.immutable.persistentListOf
-import kotlinx.collections.immutable.persistentMapOf
-import kotlinx.collections.immutable.persistentSetOf
-import kotlinx.collections.immutable.toImmutableList
-import kotlinx.collections.immutable.toImmutableMap
-import kotlinx.collections.immutable.toImmutableSet
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import java.net.MalformedURLException
@@ -62,14 +77,8 @@ import java.util.regex.Pattern
 val imageExtensions = listOf("png", "jpg", "gif", "bmp", "jpeg", "webp", "svg")
 val videoExtensions = listOf("mp4", "avi", "wmv", "mpg", "amv", "webm", "mov", "mp3", "m3u8")
 
-// Group 1 = url, group 4 additional chars
-val noProtocolUrlValidator = Pattern.compile("(([\\w\\d-]+\\.)*[a-zA-Z][\\w-]+[\\.\\:]\\w+([\\/\\?\\=\\&\\#\\.]?[\\w-]+)*\\/?)(.*)")
-
 val tagIndex = Pattern.compile("\\#\\[([0-9]+)\\](.*)")
-
-val mentionsPattern: Pattern = Pattern.compile("@([A-Za-z0-9_\\-]+)")
 val hashTagsPattern: Pattern = Pattern.compile("#([^\\s!@#\$%^&*()=+./,\\[{\\]};:'\"?><]+)(.*)", Pattern.CASE_INSENSITIVE)
-val urlPattern: Pattern = Patterns.WEB_URL
 
 fun isValidURL(url: String?): Boolean {
     return try {
@@ -103,23 +112,14 @@ fun RichTextViewer(
 ) {
     Column(modifier = modifier) {
         if (remember(content) { isMarkdown(content) }) {
-            RenderContentAsMarkdown(content, backgroundColor, tags, nav)
+            RenderContentAsMarkdown(content, tags, nav)
         } else {
             RenderRegular(content, tags, canPreview, backgroundColor, accountViewModel, nav)
         }
     }
 }
 
-val urlSetCache = LruCache<String, RichTextViewerState>(200)
-
-@Immutable
-data class RichTextViewerState(
-    val urlSet: ImmutableSet<String>,
-    val imagesForPager: ImmutableMap<String, ZoomableUrlContent>,
-    val imageList: ImmutableList<ZoomableUrlContent>,
-    val customEmoji: ImmutableMap<String, String>
-)
-
+@OptIn(ExperimentalLayoutApi::class)
 @Composable
 private fun RenderRegular(
     content: String,
@@ -130,218 +130,128 @@ private fun RenderRegular(
     nav: (String) -> Unit
 ) {
     val state by remember(content) {
-        if (urlSetCache[content] != null) {
-            mutableStateOf(urlSetCache[content])
-        } else {
-            val newUrls = parseUrls(content, tags)
-            urlSetCache.put(content, newUrls)
-            mutableStateOf(newUrls)
+        mutableStateOf(CachedRichTextParser.parseText(content, tags))
+    }
+
+    val currentTextStyle = LocalTextStyle.current
+
+    val textStyle = currentTextStyle.copy(
+        textDirection = TextDirection.Content,
+        lineHeight = 1.4.em,
+        color = currentTextStyle.color.takeOrElse {
+            LocalContentColor.current.copy(alpha = LocalContentAlpha.current)
         }
-    }
+    )
 
-    val paragraphs = remember(content) {
-        content.split('\n').toImmutableList()
-    }
-
-    // FlowRow doesn't work well with paragraphs. So we need to split them
-    paragraphs.forEach { paragraph ->
-        RenderParagraph(paragraph, state, canPreview, backgroundColor, accountViewModel, nav, tags)
-    }
-}
-
-@Composable
-@OptIn(ExperimentalLayoutApi::class)
-private fun RenderParagraph(
-    paragraph: String,
-    state: RichTextViewerState,
-    canPreview: Boolean,
-    backgroundColor: MutableState<Color>,
-    accountViewModel: AccountViewModel,
-    nav: (String) -> Unit,
-    tags: ImmutableListOfLists<String>
-) {
-    val s = remember(paragraph) {
-        if (isArabic(paragraph)) {
-            paragraph.trim().split(' ').reversed().toImmutableList()
-        } else {
-            paragraph.trim().split(' ').toImmutableList()
-        }
-    }
-
-    FlowRow() {
-        s.forEach { word: String ->
-            RenderWord(
-                word,
-                state,
-                canPreview,
-                backgroundColor,
-                accountViewModel,
-                nav,
-                tags
-            )
-        }
-    }
-}
-
-private fun parseUrls(
-    content: String,
-    tags: ImmutableListOfLists<String>
-): RichTextViewerState {
-    val urls = UrlDetector(content, UrlDetectorOptions.Default).detect()
-    val urlSet = urls.mapTo(LinkedHashSet(urls.size)) { it.originalUrl }
-    val imagesForPager = urlSet.mapNotNull { fullUrl ->
-        val removedParamsFromUrl = fullUrl.split("?")[0].lowercase()
-        if (imageExtensions.any { removedParamsFromUrl.endsWith(it) }) {
-            ZoomableUrlImage(fullUrl)
-        } else if (videoExtensions.any { removedParamsFromUrl.endsWith(it) }) {
-            ZoomableUrlVideo(fullUrl)
-        } else {
-            null
-        }
-    }.associateBy { it.url }
-    val imageList = imagesForPager.values.toList()
-
-    val emojiMap =
-        tags.lists.filter { it.size > 2 && it[0] == "emoji" }.associate { ":${it[1]}:" to it[2] }
-
-    return if (urlSet.isNotEmpty() || emojiMap.isNotEmpty()) {
-        RichTextViewerState(
-            urlSet.toImmutableSet(),
-            imagesForPager.toImmutableMap(),
-            imageList.toImmutableList(),
-            emojiMap.toImmutableMap()
-        )
-    } else {
-        RichTextViewerState(
-            persistentSetOf(),
-            persistentMapOf(),
-            persistentListOf(),
-            persistentMapOf()
-        )
-    }
-}
-
-enum class WordType {
-    IMAGE, LINK, EMOJI, INVOICE, WITHDRAW, CASHU, EMAIL, PHONE, BECH, HASH_INDEX, HASHTAG, SCHEMELESS_URL, OTHER
-}
-
-@Composable
-private fun RenderWord(
-    word: String,
-    state: RichTextViewerState,
-    canPreview: Boolean,
-    backgroundColor: MutableState<Color>,
-    accountViewModel: AccountViewModel,
-    nav: (String) -> Unit,
-    tags: ImmutableListOfLists<String>
-) {
-    val type = remember(word) {
-        if (state.imagesForPager[word] != null) {
-            WordType.IMAGE
-        } else if (state.urlSet.contains(word)) {
-            WordType.LINK
-        } else if (state.customEmoji.any { word.contains(it.key) }) {
-            WordType.EMOJI
-        } else if (word.startsWith("lnbc", true)) {
-            WordType.INVOICE
-        } else if (word.startsWith("lnurl", true)) {
-            WordType.WITHDRAW
-        } else if (word.startsWith("cashuA", true)) {
-            WordType.CASHU
-        } else if (Patterns.EMAIL_ADDRESS.matcher(word).matches()) {
-            WordType.EMAIL
-        } else if (word.length > 6 && Patterns.PHONE.matcher(word).matches()) {
-            WordType.PHONE
-        } else if (startsWithNIP19Scheme(word)) {
-            WordType.BECH
-        } else if (word.startsWith("#")) {
-            if (tagIndex.matcher(word).matches()) {
-                if (tags.lists.isNotEmpty()) {
-                    WordType.HASH_INDEX
-                } else {
-                    WordType.OTHER
+    MeasureSpaceWidth() { spaceWidth ->
+        Column {
+            if (canPreview) {
+                // FlowRow doesn't work well with paragraphs. So we need to split them
+                state.paragraphs.forEach { paragraph ->
+                    FlowRow(horizontalArrangement = Arrangement.spacedBy(spaceWidth)) {
+                        paragraph.forEach { word ->
+                            RenderWordWithPreview(
+                                word,
+                                state,
+                                backgroundColor,
+                                textStyle,
+                                accountViewModel,
+                                nav
+                            )
+                        }
+                    }
                 }
-            } else if (hashTagsPattern.matcher(word).matches()) {
-                WordType.HASHTAG
             } else {
-                WordType.OTHER
+                // FlowRow doesn't work well with paragraphs. So we need to split them
+                state.paragraphs.forEach { paragraph ->
+                    FlowRow(horizontalArrangement = Arrangement.spacedBy(spaceWidth)) {
+                        paragraph.forEach { word ->
+                            RenderWordWithoutPreview(
+                                word,
+                                state,
+                                backgroundColor,
+                                textStyle,
+                                accountViewModel,
+                                nav
+                            )
+                        }
+                    }
+                }
             }
-        } else if (noProtocolUrlValidator.matcher(word).matches()) {
-            WordType.SCHEMELESS_URL
-        } else {
-            WordType.OTHER
         }
     }
+}
 
-    if (canPreview) {
-        RenderWordWithPreview(type, word, state, tags, backgroundColor, accountViewModel, nav)
-    } else {
-        RenderWordWithoutPreview(type, word, state, tags, backgroundColor, accountViewModel, nav)
+@Composable
+fun MeasureSpaceWidth(
+    content: @Composable (measuredWidth: Dp) -> Unit
+) {
+    SubcomposeLayout { constraints ->
+        val measuredWidth = subcompose("viewToMeasure", { Text(" ") })[0].measure(Constraints()).width.toDp()
+
+        val contentPlaceable = subcompose("content") {
+            content(measuredWidth)
+        }[0].measure(constraints)
+        layout(contentPlaceable.width, contentPlaceable.height) {
+            contentPlaceable.place(0, 0)
+        }
     }
 }
 
 @Composable
 private fun RenderWordWithoutPreview(
-    type: WordType,
-    word: String,
+    word: Segment,
     state: RichTextViewerState,
-    tags: ImmutableListOfLists<String>,
     backgroundColor: MutableState<Color>,
+    style: TextStyle,
     accountViewModel: AccountViewModel,
     nav: (String) -> Unit
 ) {
-    val wordSpace = remember(word) {
-        "$word "
-    }
-
-    when (type) {
+    when (word) {
         // Don't preview Images
-        WordType.IMAGE -> UrlPreview(word, wordSpace)
-        WordType.LINK -> UrlPreview(word, wordSpace)
-        WordType.EMOJI -> RenderCustomEmoji(word, state)
+        is ImageSegment -> ClickableUrl(word.segmentText, word.segmentText)
+        is LinkSegment -> ClickableUrl(word.segmentText, word.segmentText)
+        is EmojiSegment -> RenderCustomEmoji(word.segmentText, state)
         // Don't offer to pay invoices
-        WordType.INVOICE -> NormalWord(wordSpace)
+        is InvoiceSegment -> NormalWord(word.segmentText, style)
         // Don't offer to withdraw
-        WordType.WITHDRAW -> NormalWord(wordSpace)
-        WordType.CASHU -> NormalWord(wordSpace)
-        WordType.EMAIL -> ClickableEmail(word)
-        WordType.PHONE -> ClickablePhone(word)
-        WordType.BECH -> BechLink(word, false, backgroundColor, accountViewModel, nav)
-        WordType.HASHTAG -> HashTag(word, nav)
-        WordType.HASH_INDEX -> TagLink(word, tags, false, backgroundColor, accountViewModel, nav)
-        WordType.SCHEMELESS_URL -> NoProtocolUrlRenderer(word)
-        WordType.OTHER -> NormalWord(wordSpace)
+        is WithdrawSegment -> NormalWord(word.segmentText, style)
+        is CashuSegment -> NormalWord(word.segmentText, style)
+        is EmailSegment -> ClickableEmail(word.segmentText)
+        is PhoneSegment -> ClickablePhone(word.segmentText)
+        is BechSegment -> BechLink(word.segmentText, false, backgroundColor, accountViewModel, nav)
+        is HashTagSegment -> HashTag(word, nav)
+        is HashIndexUserSegment -> TagLink(word, nav)
+        is HashIndexEventSegment -> TagLink(word, false, backgroundColor, accountViewModel, nav)
+        is SchemelessUrlSegment -> NoProtocolUrlRenderer(word)
+        is RegularTextSegment -> NormalWord(word.segmentText, style)
     }
 }
 
 @Composable
 private fun RenderWordWithPreview(
-    type: WordType,
-    word: String,
+    word: Segment,
     state: RichTextViewerState,
-    tags: ImmutableListOfLists<String>,
     backgroundColor: MutableState<Color>,
+    style: TextStyle,
     accountViewModel: AccountViewModel,
     nav: (String) -> Unit
 ) {
-    val wordSpace = remember(word) {
-        "$word "
-    }
-
-    when (type) {
-        WordType.IMAGE -> ZoomableContentView(word, state)
-        WordType.LINK -> UrlPreview(word, wordSpace)
-        WordType.EMOJI -> RenderCustomEmoji(word, state)
-        WordType.INVOICE -> MayBeInvoicePreview(word)
-        WordType.WITHDRAW -> MayBeWithdrawal(word)
-        WordType.CASHU -> CashuPreview(word, accountViewModel)
-        WordType.EMAIL -> ClickableEmail(word)
-        WordType.PHONE -> ClickablePhone(word)
-        WordType.BECH -> BechLink(word, true, backgroundColor, accountViewModel, nav)
-        WordType.HASHTAG -> HashTag(word, nav)
-        WordType.HASH_INDEX -> TagLink(word, tags, true, backgroundColor, accountViewModel, nav)
-        WordType.SCHEMELESS_URL -> NoProtocolUrlRenderer(word)
-        WordType.OTHER -> NormalWord(wordSpace)
+    when (word) {
+        is ImageSegment -> ZoomableContentView(word.segmentText, state)
+        is LinkSegment -> UrlPreview(word.segmentText, word.segmentText)
+        is EmojiSegment -> RenderCustomEmoji(word.segmentText, state)
+        is InvoiceSegment -> MayBeInvoicePreview(word.segmentText)
+        is WithdrawSegment -> MayBeWithdrawal(word.segmentText)
+        is CashuSegment -> CashuPreview(word.segmentText, accountViewModel)
+        is EmailSegment -> ClickableEmail(word.segmentText)
+        is PhoneSegment -> ClickablePhone(word.segmentText)
+        is BechSegment -> BechLink(word.segmentText, true, backgroundColor, accountViewModel, nav)
+        is HashTagSegment -> HashTag(word, nav)
+        is HashIndexUserSegment -> TagLink(word, nav)
+        is HashIndexEventSegment -> TagLink(word, true, backgroundColor, accountViewModel, nav)
+        is SchemelessUrlSegment -> NoProtocolUrlRenderer(word)
+        is RegularTextSegment -> NormalWord(word.segmentText, style)
     }
 }
 
@@ -353,70 +263,36 @@ private fun ZoomableContentView(word: String, state: RichTextViewerState) {
 }
 
 @Composable
-private fun NormalWord(word: String) {
-    Text(
+private fun NormalWord(word: String, style: TextStyle) {
+    BasicText(
         text = word,
-        style = LocalTextStyle.current.copy(textDirection = TextDirection.Content)
+        style = style
     )
 }
 
-@Immutable
-data class UrlWithExtraChars(val url: String, val extraChars: String)
-
 @Composable
-private fun NoProtocolUrlRenderer(word: String) {
-    val wordSpace = remember(word) {
-        "$word "
-    }
-
-    var linkedUrl by remember(word) {
-        mutableStateOf<UrlWithExtraChars?>(null)
-    }
-
-    LaunchedEffect(key1 = word) {
-        launch(Dispatchers.Default) {
-            val matcher = noProtocolUrlValidator.matcher(word)
-            if (matcher.find()) {
-                val url = matcher.group(1) // url
-                val additionalChars = matcher.group(4) ?: "" // additional chars
-
-                launch(Dispatchers.Main) {
-                    linkedUrl = UrlWithExtraChars(url, additionalChars)
-                }
-            }
-        }
-    }
-
-    Crossfade(targetState = linkedUrl) {
-        if (it != null) {
-            RenderUrl(it)
-        } else {
-            Text(
-                text = wordSpace,
-                style = LocalTextStyle.current.copy(textDirection = TextDirection.Content)
-            )
-        }
-    }
+private fun NoProtocolUrlRenderer(word: SchemelessUrlSegment) {
+    RenderUrl(word)
 }
 
 @Composable
-private fun RenderUrl(it: UrlWithExtraChars) {
+private fun RenderUrl(segment: SchemelessUrlSegment) {
     Row() {
-        ClickableUrl(it.url, "https://${it.url}")
-        Text("${it.extraChars} ")
+        ClickableUrl(segment.url, "https://${segment.url}")
+        segment.extras?.let { it1 -> Text(it1) }
     }
 }
 
 @Composable
 fun RenderCustomEmoji(word: String, state: RichTextViewerState) {
     CreateTextWithEmoji(
-        text = remember { "$word " },
+        text = word,
         emojis = state.customEmoji
     )
 }
 
 @Composable
-private fun RenderContentAsMarkdown(content: String, backgroundColor: MutableState<Color>, tags: ImmutableListOfLists<String>?, nav: (String) -> Unit) {
+private fun RenderContentAsMarkdown(content: String, tags: ImmutableListOfLists<String>?, nav: (String) -> Unit) {
     val uri = LocalUriHandler.current
     val onClick = remember {
         { link: String ->
@@ -464,9 +340,11 @@ private fun RefreshableContent(content: String, tags: ImmutableListOfLists<Strin
 @Composable
 fun ObserverAllNIP19References(content: String, tags: ImmutableListOfLists<String>?, onRefresh: () -> Unit) {
     var nip19References by remember(content) { mutableStateOf<List<Nip19.Return>>(emptyList()) }
+
     LaunchedEffect(key1 = content) {
         launch(Dispatchers.IO) {
             nip19References = returnNIP19References(content, tags)
+            onRefresh()
         }
     }
 
@@ -513,10 +391,12 @@ private fun ObserveNIP19Event(
 
 @Composable
 fun ObserveNote(note: Note, onRefresh: () -> Unit) {
-    val noteState by note.live().metadata.observeAsState()
+    val loadedNoteId by note.live().metadata.map {
+        it.note.event?.id()
+    }.distinctUntilChanged().observeAsState(note.event?.id())
 
-    LaunchedEffect(key1 = noteState) {
-        if (noteState?.note?.event != null) {
+    LaunchedEffect(key1 = loadedNoteId) {
+        if (loadedNoteId != null) {
             launch(Dispatchers.IO) {
                 onRefresh()
             }
@@ -550,10 +430,12 @@ private fun ObserveNIP19User(
 
 @Composable
 private fun ObserveUser(user: User, onRefresh: () -> Unit) {
-    val userState by user.live().metadata.observeAsState()
+    val loadedUserMetaId by user.live().metadata.map {
+        it.user.info?.latestMetadata?.id
+    }.distinctUntilChanged().observeAsState(user.info?.latestMetadata?.id)
 
-    LaunchedEffect(key1 = userState) {
-        if (userState?.user?.info != null) {
+    LaunchedEffect(key1 = loadedUserMetaId) {
+        if (loadedUserMetaId != null) {
             launch(Dispatchers.IO) {
                 onRefresh()
             }
@@ -702,10 +584,6 @@ private fun returnMarkdownWithSpecialContent(content: String, tags: ImmutableLis
     return returnContent
 }
 
-private fun isArabic(text: String): Boolean {
-    return text.any { it in '\u0600'..'\u06FF' || it in '\u0750'..'\u077F' }
-}
-
 fun startsWithNIP19Scheme(word: String): Boolean {
     val cleaned = word.lowercase().removePrefix("@").removePrefix("nostr:").removePrefix("@")
 
@@ -719,45 +597,51 @@ data class LoadedBechLink(val baseNote: Note?, val nip19: Nip19.Return)
 fun BechLink(word: String, canPreview: Boolean, backgroundColor: MutableState<Color>, accountViewModel: AccountViewModel, nav: (String) -> Unit) {
     var loadedLink by remember { mutableStateOf<LoadedBechLink?>(null) }
 
-    LaunchedEffect(key1 = word) {
-        launch(Dispatchers.IO) {
-            Nip19.uriToRoute(word)?.let {
-                var returningNote: Note? = null
-                if (it.type == Nip19.Type.NOTE || it.type == Nip19.Type.EVENT || it.type == Nip19.Type.ADDRESS) {
-                    LocalCache.checkGetOrCreateNote(it.hex)?.let { note ->
-                        returningNote = note
+    if (loadedLink == null) {
+        LaunchedEffect(key1 = word) {
+            launch(Dispatchers.IO) {
+                Nip19.uriToRoute(word)?.let {
+                    var returningNote: Note? = null
+                    if (it.type == Nip19.Type.NOTE || it.type == Nip19.Type.EVENT || it.type == Nip19.Type.ADDRESS) {
+                        LocalCache.checkGetOrCreateNote(it.hex)?.let { note ->
+                            returningNote = note
+                        }
                     }
-                }
 
-                val newLink = LoadedBechLink(returningNote, it)
+                    val newLink = LoadedBechLink(returningNote, it)
 
-                launch(Dispatchers.Main) {
-                    loadedLink = newLink
+                    launch(Dispatchers.Main) {
+                        loadedLink = newLink
+                    }
                 }
             }
         }
     }
 
-    Crossfade(targetState = loadedLink) {
-        if (canPreview && it?.baseNote != null) {
-            Row() {
-                DisplayFullNote(it.baseNote, accountViewModel, backgroundColor, nav, it)
-            }
-        } else if (it?.nip19 != null) {
-            Row() {
-                ClickableRoute(it.nip19, nav)
-            }
-        } else {
-            val text = remember {
-                if (word.length > 16) {
-                    word.replaceRange(8, word.length - 8, ":")
-                } else {
-                    "$word "
-                }
-            }
-
-            Text(text = text, maxLines = 1)
+    if (canPreview && loadedLink?.baseNote != null) {
+        Row() {
+            DisplayFullNote(
+                loadedLink?.baseNote!!,
+                accountViewModel,
+                backgroundColor,
+                nav,
+                loadedLink!!
+            )
         }
+    } else if (loadedLink?.nip19 != null) {
+        Row() {
+            ClickableRoute(loadedLink?.nip19!!, nav)
+        }
+    } else {
+        val text = remember {
+            if (word.length > 16) {
+                word.replaceRange(8, word.length - 8, ":")
+            } else {
+                word
+            }
+        }
+
+        Text(text = text, maxLines = 1)
     }
 }
 
@@ -779,11 +663,7 @@ private fun DisplayFullNote(
     )
 
     val extraChars = remember(loadedLink) {
-        if (loadedLink.nip19.additionalChars.isNotBlank()) {
-            "${loadedLink.nip19.additionalChars} "
-        } else {
-            null
-        }
+        loadedLink.nip19.additionalChars.ifBlank { null }
     }
 
     extraChars?.let {
@@ -793,59 +673,29 @@ private fun DisplayFullNote(
     }
 }
 
-data class HashWordWithExtra(val hashtag: String, val extras: String?)
-
 @Composable
-fun HashTag(word: String, nav: (String) -> Unit) {
-    var tagSuffixPair by remember { mutableStateOf<HashWordWithExtra?>(null) }
-
-    LaunchedEffect(key1 = word) {
-        launch(Dispatchers.IO) {
-            val hashtagMatcher = hashTagsPattern.matcher(word)
-
-            val (myTag, mySuffix) = try {
-                hashtagMatcher.find()
-                Pair(hashtagMatcher.group(1), hashtagMatcher.group(2))
-            } catch (e: Exception) {
-                Log.e("Hashtag Parser", "Couldn't link hashtag $word", e)
-                Pair(null, null)
-            }
-
-            if (myTag != null) {
-                launch(Dispatchers.Main) {
-                    tagSuffixPair = HashWordWithExtra(myTag, mySuffix)
-                }
-            }
-        }
-    }
-
-    Crossfade(targetState = tagSuffixPair) {
-        if (it != null) {
-            Row() {
-                RenderHashtag(it, nav)
-            }
-        } else {
-            Text(text = remember { "$word " })
-        }
+fun HashTag(word: HashTagSegment, nav: (String) -> Unit) {
+    Row() {
+        RenderHashtag(word, nav)
     }
 }
 
 @Composable
 private fun RenderHashtag(
-    tagPair: HashWordWithExtra,
+    segment: HashTagSegment,
     nav: (String) -> Unit
 ) {
     val primary = MaterialTheme.colors.primary
-    val hashtagIcon = remember(tagPair.hashtag) { checkForHashtagWithIcon(tagPair.hashtag, primary) }
+    val hashtagIcon = remember(segment.hashtag) { checkForHashtagWithIcon(segment.hashtag, primary) }
     ClickableText(
         text = buildAnnotatedString {
             withStyle(
                 LocalTextStyle.current.copy(color = MaterialTheme.colors.primary).toSpanStyle()
             ) {
-                append("#${tagPair.hashtag}")
+                append("#${segment.hashtag}")
             }
         },
-        onClick = { nav("Hashtag/${tagPair.hashtag}") }
+        onClick = { nav("Hashtag/${segment.hashtag}") }
     )
 
     if (hashtagIcon != null) {
@@ -866,8 +716,8 @@ private fun RenderHashtag(
             )
         )
     }
-    tagPair.extras?.ifBlank { "" }?.let {
-        Text(text = "$it ")
+    segment.extras?.ifBlank { "" }?.let {
+        Text(text = it)
     }
 }
 
@@ -888,63 +738,46 @@ private fun InlineIcon(hashtagIcon: HashtagIcon) =
         )
     }
 
-data class LoadedTag(val user: User?, val note: Note?, val addedChars: String)
+@Composable
+fun TagLink(word: HashIndexUserSegment, nav: (String) -> Unit) {
+    LoadUser(baseUserHex = word.hex) {
+        if (it == null) {
+            Text(text = word.segmentText)
+        } else {
+            Row() {
+                DisplayUserFromTag(it, word.extras, nav)
+            }
+        }
+    }
+}
 
 @Composable
-fun TagLink(word: String, tags: ImmutableListOfLists<String>, canPreview: Boolean, backgroundColor: MutableState<Color>, accountViewModel: AccountViewModel, nav: (String) -> Unit) {
-    var loadedTag by remember { mutableStateOf<LoadedTag?>(null) }
+fun LoadNote(baseNoteHex: String, content: @Composable (Note?) -> Unit) {
+    var note by remember(baseNoteHex) {
+        mutableStateOf<Note?>(LocalCache.getNoteIfExists(baseNoteHex))
+    }
 
-    LaunchedEffect(key1 = word) {
-        if (loadedTag == null) {
+    if (note == null) {
+        LaunchedEffect(key1 = baseNoteHex) {
             launch(Dispatchers.IO) {
-                val matcher = tagIndex.matcher(word)
-                val (index, suffix) = try {
-                    matcher.find()
-                    Pair(matcher.group(1)?.toInt(), matcher.group(2) ?: "")
-                } catch (e: Exception) {
-                    Log.w("Tag Parser", "Couldn't link tag $word", e)
-                    Pair(null, "")
-                }
-
-                if (index != null && index >= 0 && index < tags.lists.size) {
-                    val tag = tags.lists[index]
-
-                    if (tag.size > 1) {
-                        if (tag[0] == "p") {
-                            LocalCache.checkGetOrCreateUser(tag[1])?.let {
-                                launch(Dispatchers.Main) {
-                                    loadedTag = LoadedTag(it, null, suffix)
-                                }
-                            }
-                        } else if (tag[0] == "e" || tag[0] == "a") {
-                            LocalCache.checkGetOrCreateNote(tag[1])?.let {
-                                launch(Dispatchers.Main) {
-                                    loadedTag = LoadedTag(null, it, suffix)
-                                }
-                            }
-                        }
-                    }
-                }
+                note = LocalCache.checkGetOrCreateNote(baseNoteHex)
             }
         }
     }
 
-    Crossfade(targetState = loadedTag) {
+    content(note)
+}
+
+@Composable
+fun TagLink(word: HashIndexEventSegment, canPreview: Boolean, backgroundColor: MutableState<Color>, accountViewModel: AccountViewModel, nav: (String) -> Unit) {
+    LoadNote(baseNoteHex = word.hex) {
         if (it == null) {
-            Text(
-                text = remember {
-                    "$word "
-                }
-            )
-        } else if (it.user != null) {
-            Row() {
-                DisplayUserFromTag(it.user, loadedTag?.addedChars ?: "", nav)
-            }
-        } else if (it.note != null) {
+            Text(text = remember { word.segmentText.toShortenHex() })
+        } else {
             Row() {
                 DisplayNoteFromTag(
-                    it.note,
-                    loadedTag?.addedChars ?: "",
+                    it,
+                    word.extras,
                     canPreview,
                     accountViewModel,
                     backgroundColor,
@@ -958,7 +791,7 @@ fun TagLink(word: String, tags: ImmutableListOfLists<String>, canPreview: Boolea
 @Composable
 private fun DisplayNoteFromTag(
     baseNote: Note,
-    addedChars: String,
+    addedChars: String?,
     canPreview: Boolean,
     accountViewModel: AccountViewModel,
     backgroundColor: MutableState<Color>,
@@ -973,23 +806,22 @@ private fun DisplayNoteFromTag(
             isQuotedNote = true,
             nav = nav
         )
-        addedChars.ifBlank { null }?.let {
-            Text(text = remember { "$it " })
-        }
     } else {
         ClickableNoteTag(baseNote, nav)
-        Text(text = remember { "$addedChars " })
+    }
+
+    addedChars?.ifBlank { null }?.let {
+        Text(text = it)
     }
 }
 
 @Composable
 private fun DisplayUserFromTag(
     baseUser: User,
-    addedChars: String,
+    addedChars: String?,
     nav: (String) -> Unit
 ) {
     val route = remember { "User/${baseUser.pubkeyHex}" }
-    val suffix = remember { "$addedChars " }
     val hex = remember { baseUser.pubkeyDisplayHex() }
 
     val meta by baseUser.live().metadata.map {
@@ -999,11 +831,11 @@ private fun DisplayUserFromTag(
     Crossfade(targetState = meta) {
         Row() {
             val displayName = remember(it) {
-                it?.bestDisplayName() ?: hex
+                it?.bestDisplayName() ?: it?.bestUsername() ?: hex
             }
             CreateClickableTextWithEmoji(
                 clickablePart = displayName,
-                suffix = suffix,
+                suffix = addedChars,
                 maxLines = 1,
                 route = route,
                 nav = nav,

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

@@ -14,7 +14,6 @@ import androidx.compose.foundation.layout.BoxWithConstraints
 import androidx.compose.foundation.layout.ExperimentalLayoutApi
 import androidx.compose.foundation.layout.FlowRow
 import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.aspectRatio
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
@@ -22,12 +21,10 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.heightIn
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.systemBars
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.layout.widthIn
 import androidx.compose.foundation.pager.PagerState
 import androidx.compose.foundation.pager.rememberPagerState
-import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.text.InlineTextContent
 import androidx.compose.foundation.text.appendInlineContent
 import androidx.compose.material.Icon
@@ -42,6 +39,7 @@ 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
@@ -49,7 +47,6 @@ 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
@@ -63,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
@@ -77,7 +74,7 @@ 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.hashVerified
+import com.vitorpamplona.amethyst.ui.theme.Font17SP
 import com.vitorpamplona.amethyst.ui.theme.imageModifier
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.toImmutableList
@@ -211,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)
@@ -310,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 {
@@ -347,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 -> {
+        }
     }
 }
 
@@ -382,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... ")
     }
@@ -401,8 +431,8 @@ private fun DisplayUrlWithLoadingSymbolWait(content: ZoomableContent) {
             myId,
             InlineTextContent(
                 Placeholder(
-                    width = 17.sp,
-                    height = 17.sp,
+                    width = Font17SP,
+                    height = Font17SP,
                     placeholderVerticalAlign = PlaceholderVerticalAlign.Center
                 )
             ) {
@@ -566,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 {
@@ -589,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/DiscoverFeedFilter.kt

@@ -0,0 +1,66 @@
+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.*
+import com.vitorpamplona.amethyst.service.model.LiveActivitiesEvent.Companion.STATUS_ENDED
+import com.vitorpamplona.amethyst.service.model.LiveActivitiesEvent.Companion.STATUS_LIVE
+import com.vitorpamplona.amethyst.service.model.LiveActivitiesEvent.Companion.STATUS_PLANNED
+
+class DiscoverFeedFilter(val account: Account) : AdditiveFeedFilter<Note>() {
+    override fun feedKey(): String {
+        return account.userProfile().pubkeyHex + "-" + account.defaultDiscoveryFollowList
+    }
+
+    override fun feed(): List<Note> {
+        val allChannelNotes = LocalCache.channels.values.mapNotNull { LocalCache.getNoteIfExists(it.idHex) }
+        val allMessageNotes = LocalCache.channels.values.map { it.notes.values }.flatten()
+
+        val notes = innerApplyFilter(allChannelNotes + allMessageNotes)
+
+        return sort(notes)
+    }
+
+    override fun applyFilter(collection: Set<Note>): Set<Note> {
+        return innerApplyFilter(collection)
+    }
+
+    private fun innerApplyFilter(collection: Collection<Note>): Set<Note> {
+        val now = System.currentTimeMillis() / 1000
+        val isGlobal = account.defaultDiscoveryFollowList == GLOBAL_FOLLOWS
+
+        val followingKeySet = account.selectedUsersFollowList(account.defaultDiscoveryFollowList) ?: emptySet()
+        val followingTagSet = account.selectedTagsFollowList(account.defaultDiscoveryFollowList) ?: emptySet()
+
+        val activities = collection
+            .asSequence()
+            .filter { it.event is LiveActivitiesEvent }
+            .filter { isGlobal || it.author?.pubkeyHex in followingKeySet }
+            .filter { account.isAcceptable(it) }
+            .filter { (it.createdAt() ?: 0) <= now }
+            .toSet()
+
+        return activities
+    }
+
+    override fun sort(collection: Set<Note>): List<Note> {
+        return collection.sortedWith(
+            compareBy(
+                { convertStatusToOrder((it.event as? LiveActivitiesEvent)?.status()) },
+                { it.createdAt() },
+                { it.idHex }
+            )
+        ).reversed()
+    }
+
+    fun convertStatusToOrder(status: String?): Int {
+        return when (status) {
+            STATUS_LIVE -> 2
+            STATUS_PLANNED -> 1
+            STATUS_ENDED -> 0
+            else -> 0
+        }
+    }
+}

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

@@ -1,53 +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 feedKey(): String {
-        return account.userProfile().pubkeyHex
-    }
-
-    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/HomeConversationsFeedFilter.kt

@@ -1,6 +1,7 @@
 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
@@ -23,6 +24,8 @@ 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()
 
@@ -32,7 +35,7 @@ class HomeConversationsFeedFilter(val account: Account) : AdditiveFeedFilter<Not
             .asSequence()
             .filter {
                 (it.event is TextNoteEvent || it.event is PollNoteEvent || it.event is ChannelMessageEvent || it.event is LiveActivitiesChatMessageEvent) &&
-                    (it.author?.pubkeyHex in followingKeySet || (it.event?.isTaggedHashes(followingTagSet) ?: false)) &&
+                    (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) &&

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

@@ -1,11 +1,13 @@
 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 com.vitorpamplona.amethyst.service.model.LiveActivitiesEvent.Companion.STATUS_LIVE
 import java.util.Date
 
 class HomeLiveActivitiesFeedFilter(val account: Account) : AdditiveFeedFilter<Note>() {
@@ -29,6 +31,8 @@ class HomeLiveActivitiesFeedFilter(val account: Account) : AdditiveFeedFilter<No
     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()
 
@@ -38,8 +42,8 @@ class HomeLiveActivitiesFeedFilter(val account: Account) : AdditiveFeedFilter<No
             .asSequence()
             .filter { it ->
                 val noteEvent = it.event
-                (noteEvent is LiveActivitiesEvent && noteEvent.createdAt > twoHrs && noteEvent.status() == "live" && OnlineChecker.isOnline(noteEvent.streaming())) &&
-                    (it.author?.pubkeyHex in followingKeySet || (noteEvent.isTaggedHashes(followingTagSet))) &&
+                (noteEvent is LiveActivitiesEvent && noteEvent.createdAt > twoHrs && noteEvent.status() == 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
             }

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

@@ -1,6 +1,7 @@
 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.AudioTrackEvent
@@ -29,6 +30,8 @@ class HomeNewThreadFeedFilter(val account: Account) : AdditiveFeedFilter<Note>()
     }
 
     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()
 
@@ -40,7 +43,7 @@ class HomeNewThreadFeedFilter(val account: Account) : AdditiveFeedFilter<Note>()
             .filter { it ->
                 val noteEvent = it.event
                 (noteEvent is TextNoteEvent || noteEvent is RepostEvent || noteEvent is GenericRepostEvent || noteEvent is LongTextNoteEvent || noteEvent is PollNoteEvent || noteEvent is HighlightEvent || noteEvent is AudioTrackEvent) &&
-                    (it.author?.pubkeyHex in followingKeySet || (noteEvent.isTaggedHashes(followingTagSet))) &&
+                    (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 &&
                     ((it.event?.createdAt() ?: 0) < oneMinuteInTheFuture) &&

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

@@ -48,7 +48,7 @@ val bottomNavigationItems = listOf(
     Route.Home,
     Route.Message,
     Route.Video,
-    Route.Search,
+    Route.Discover,
     Route.Notification
 )
 

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

@@ -12,7 +12,7 @@ import androidx.navigation.compose.composable
 import com.vitorpamplona.amethyst.ui.note.UserReactionsViewModel
 import com.vitorpamplona.amethyst.ui.screen.NostrChatroomListKnownFeedViewModel
 import com.vitorpamplona.amethyst.ui.screen.NostrChatroomListNewFeedViewModel
-import com.vitorpamplona.amethyst.ui.screen.NostrGlobalFeedViewModel
+import com.vitorpamplona.amethyst.ui.screen.NostrDiscoverFeedViewModel
 import com.vitorpamplona.amethyst.ui.screen.NostrHomeFeedLiveActivitiesViewModel
 import com.vitorpamplona.amethyst.ui.screen.NostrHomeFeedViewModel
 import com.vitorpamplona.amethyst.ui.screen.NostrHomeRepliesFeedViewModel
@@ -23,6 +23,7 @@ import com.vitorpamplona.amethyst.ui.screen.loggedIn.BookmarkListScreen
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.ChannelScreen
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.ChatroomListScreen
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.ChatroomScreen
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.DiscoverScreen
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.HashtagScreen
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.HiddenUsersScreen
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.HomeScreen
@@ -42,8 +43,8 @@ fun AppNavigation(
     liveActivitiesViewModel: NostrHomeFeedLiveActivitiesViewModel,
     knownFeedViewModel: NostrChatroomListKnownFeedViewModel,
     newFeedViewModel: NostrChatroomListNewFeedViewModel,
-    searchFeedViewModel: NostrGlobalFeedViewModel,
     videoFeedViewModel: NostrVideoFeedViewModel,
+    discoveryFeedViewModel: NostrDiscoverFeedViewModel,
     notifFeedViewModel: NotificationViewModel,
     userReactionsStatsModel: UserReactionsViewModel,
 
@@ -108,10 +109,19 @@ fun AppNavigation(
             })
         }
 
+        Route.Discover.let { route ->
+            composable(route.route, route.arguments, content = {
+                DiscoverScreen(
+                    discoveryFeedViewModel = discoveryFeedViewModel,
+                    accountViewModel = accountViewModel,
+                    nav = nav
+                )
+            })
+        }
+
         Route.Search.let { route ->
             composable(route.route, route.arguments, content = {
                 SearchScreen(
-                    searchFeedViewModel = searchFeedViewModel,
                     accountViewModel = accountViewModel,
                     nav = nav
                 )

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

@@ -48,7 +48,6 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.map
 import androidx.lifecycle.viewModelScope
-import androidx.lifecycle.viewmodel.compose.viewModel
 import androidx.navigation.NavBackStackEntry
 import androidx.navigation.NavHostController
 import coil.Coil
@@ -61,7 +60,6 @@ import com.vitorpamplona.amethyst.service.NostrAccountDataSource
 import com.vitorpamplona.amethyst.service.NostrChannelDataSource
 import com.vitorpamplona.amethyst.service.NostrChatroomDataSource
 import com.vitorpamplona.amethyst.service.NostrChatroomListDataSource
-import com.vitorpamplona.amethyst.service.NostrGlobalDataSource
 import com.vitorpamplona.amethyst.service.NostrHashtagDataSource
 import com.vitorpamplona.amethyst.service.NostrHomeDataSource
 import com.vitorpamplona.amethyst.service.NostrSearchEventOrUserDataSource
@@ -74,9 +72,7 @@ import com.vitorpamplona.amethyst.service.checkNotInMainThread
 import com.vitorpamplona.amethyst.service.model.PeopleListEvent
 import com.vitorpamplona.amethyst.service.relays.Client
 import com.vitorpamplona.amethyst.service.relays.RelayPool
-import com.vitorpamplona.amethyst.ui.actions.NewRelayListView
 import com.vitorpamplona.amethyst.ui.components.RobohashAsyncImageProxy
-import com.vitorpamplona.amethyst.ui.screen.RelayPoolViewModel
 import com.vitorpamplona.amethyst.ui.screen.equalImmutableLists
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.SpinnerSelectionDialog
@@ -122,6 +118,7 @@ private fun RenderTopRouteBar(
         // Route.Profile.route -> TopBarWithBackButton(nav)
         Route.Home.base -> HomeTopBar(followLists, scaffoldState, accountViewModel, nav)
         Route.Video.base -> StoriesTopBar(followLists, scaffoldState, accountViewModel, nav)
+        Route.Discover.base -> DiscoveryTopBar(followLists, scaffoldState, accountViewModel, nav)
         Route.Notification.base -> NotificationTopBar(followLists, scaffoldState, accountViewModel, nav)
         else -> MainTopBar(scaffoldState, accountViewModel, nav)
     }
@@ -158,7 +155,7 @@ fun HomeTopBar(followLists: FollowListViewModel, scaffoldState: ScaffoldState, a
         FollowList(
             followLists,
             list,
-            false
+            true
         ) { listName ->
             accountViewModel.account.changeDefaultHomeFollowList(listName)
         }
@@ -182,6 +179,23 @@ fun NotificationTopBar(followLists: FollowListViewModel, scaffoldState: Scaffold
     }
 }
 
+@Composable
+fun DiscoveryTopBar(followLists: FollowListViewModel, scaffoldState: ScaffoldState, accountViewModel: AccountViewModel, nav: (String) -> Unit) {
+    GenericTopBar(scaffoldState, accountViewModel, nav) { accountViewModel ->
+        val list by accountViewModel.accountLiveData.map {
+            it.account.defaultDiscoveryFollowList
+        }.observeAsState(GLOBAL_FOLLOWS)
+
+        FollowList(
+            followLists,
+            list,
+            true
+        ) { listName ->
+            accountViewModel.account.changeDefaultDiscoveryFollowList(listName)
+        }
+    }
+}
+
 @Composable
 fun MainTopBar(scaffoldState: ScaffoldState, accountViewModel: AccountViewModel, nav: (String) -> Unit) {
     GenericTopBar(scaffoldState, accountViewModel, nav) {
@@ -194,14 +208,6 @@ fun MainTopBar(scaffoldState: ScaffoldState, accountViewModel: AccountViewModel,
 fun GenericTopBar(scaffoldState: ScaffoldState, accountViewModel: AccountViewModel, nav: (String) -> Unit, content: @Composable (AccountViewModel) -> Unit) {
     val coroutineScope = rememberCoroutineScope()
 
-    var wantsToEditRelays by remember {
-        mutableStateOf(false)
-    }
-
-    if (wantsToEditRelays) {
-        NewRelayListView({ wantsToEditRelays = false }, accountViewModel, nav = nav)
-    }
-
     Column(modifier = Modifier.height(50.dp)) {
         TopAppBar(
             elevation = 0.dp,
@@ -222,10 +228,6 @@ fun GenericTopBar(scaffoldState: ScaffoldState, accountViewModel: AccountViewMod
                         ) {
                             content(accountViewModel)
                         }
-
-                        RelayStatus(
-                            { wantsToEditRelays = true }
-                        )
                     }
                 }
             },
@@ -237,7 +239,9 @@ fun GenericTopBar(scaffoldState: ScaffoldState, accountViewModel: AccountViewMod
                 }
             },
             actions = {
-                RelayIcon { wantsToEditRelays = true }
+                SearchIcon() {
+                    nav(Route.Search.route)
+                }
             }
         )
         Divider(thickness = 0.25.dp)
@@ -245,80 +249,14 @@ fun GenericTopBar(scaffoldState: ScaffoldState, accountViewModel: AccountViewMod
 }
 
 @Composable
-private fun RelayStatus(
-    onClick: () -> Unit
-) {
-    val relayViewModel: RelayPoolViewModel = viewModel { RelayPoolViewModel() }
-    Column(
-        modifier = Modifier
-            .fillMaxWidth()
-            .fillMaxHeight(),
-        horizontalAlignment = Alignment.End
-    ) {
-        Row(
-            modifier = Modifier.fillMaxHeight(),
-            verticalAlignment = Alignment.CenterVertically
-        ) {
-            RelayStatus(relayViewModel, onClick)
-        }
-    }
-}
-
-@Composable
-private fun RelayStatus(
-    relayViewModel: RelayPoolViewModel,
-    onClick: () -> Unit
-) {
-    val connectedRelaysLiveData = relayViewModel.connectedRelaysLiveData.observeAsState()
-    val availableRelaysLiveData = relayViewModel.availableRelaysLiveData.observeAsState()
-
-    val connectedRelaysText by remember(connectedRelaysLiveData, availableRelaysLiveData) {
-        derivedStateOf {
-            "${connectedRelaysLiveData.value ?: "--"}/${availableRelaysLiveData.value ?: "--"}"
-        }
-    }
-
-    val isConnected by remember(connectedRelaysLiveData) {
-        derivedStateOf {
-            (connectedRelaysLiveData.value ?: 0) > 0
-        }
-    }
-
-    RenderRelayStatus(connectedRelaysText, isConnected, onClick)
-}
-
-@Composable
-private fun RenderRelayStatus(
-    connectedRelaysText: String,
-    isConnected: Boolean,
-    onClick: () -> Unit
-) {
-    Text(
-        text = connectedRelaysText,
-        color = if (isConnected) {
-            MaterialTheme.colors.onSurface.copy(
-                alpha = 0.32f
-            )
-        } else {
-            Color.Red
-        },
-        style = MaterialTheme.typography.subtitle1,
-        modifier = Modifier.clickable(
-            onClick = onClick
-        )
-    )
-}
-
-@Composable
-private fun RelayIcon(onClick: () -> Unit) {
+private fun SearchIcon(onClick: () -> Unit) {
     IconButton(
-        onClick = onClick,
-        modifier = Modifier
+        onClick = onClick
     ) {
         Icon(
-            painter = painterResource(R.drawable.relays),
-            null,
-            modifier = Modifier.size(24.dp),
+            painter = painterResource(R.drawable.ic_search),
+            contentDescription = null,
+            modifier = Modifier.size(22.dp),
             tint = Color.Unspecified
         )
     }
@@ -534,7 +472,6 @@ fun AmethystIcon() {
             NostrChannelDataSource.printCounter()
             NostrChatroomDataSource.printCounter()
             NostrChatroomListDataSource.printCounter()
-            NostrGlobalDataSource.printCounter()
             NostrHashtagDataSource.printCounter()
             NostrHomeDataSource.printCounter()
             NostrSearchEventOrUserDataSource.printCounter()

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

@@ -34,6 +34,7 @@ import androidx.compose.material.TextButton
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.MutableState
+import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.livedata.observeAsState
 import androidx.compose.runtime.mutableStateOf
@@ -52,6 +53,7 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import androidx.lifecycle.viewmodel.compose.viewModel
 import coil.compose.AsyncImage
 import com.vitorpamplona.amethyst.BuildConfig
 import com.vitorpamplona.amethyst.LocalPreferences
@@ -60,13 +62,17 @@ import com.vitorpamplona.amethyst.ServiceManager
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.User
 import com.vitorpamplona.amethyst.service.HttpClient
+import com.vitorpamplona.amethyst.ui.actions.NewRelayListView
 import com.vitorpamplona.amethyst.ui.actions.toImmutableListOfLists
 import com.vitorpamplona.amethyst.ui.components.CreateTextWithEmoji
 import com.vitorpamplona.amethyst.ui.components.RobohashAsyncImageProxy
+import com.vitorpamplona.amethyst.ui.screen.RelayPoolViewModel
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountBackupDialog
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.ConnectOrbotDialog
 import com.vitorpamplona.amethyst.ui.theme.DoubleHorzSpacer
+import com.vitorpamplona.amethyst.ui.theme.Size16dp
+import com.vitorpamplona.amethyst.ui.theme.placeholderText
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 
@@ -301,6 +307,12 @@ fun ListContent(
     var conectOrbotDialogOpen by remember { mutableStateOf(false) }
     var proxyPort = remember { mutableStateOf(account.proxyPort.toString()) }
 
+    val relayViewModel: RelayPoolViewModel = viewModel { RelayPoolViewModel() }
+
+    var wantsToEditRelays by remember {
+        mutableStateOf(false)
+    }
+
     Column(
         modifier = modifier
             .fillMaxHeight()
@@ -324,6 +336,16 @@ fun ListContent(
             route = Route.Bookmarks.route
         )
 
+        IconRowRelays(
+            relayViewModel = relayViewModel,
+            onClick = {
+                coroutineScope.launch {
+                    scaffoldState.drawerState.close()
+                }
+                wantsToEditRelays = true
+            }
+        )
+
         NavigationRow(
             title = stringResource(R.string.security_filters),
             icon = Route.BlockedUsers.icon,
@@ -431,6 +453,10 @@ fun ListContent(
             }
         )
     }
+
+    if (wantsToEditRelays) {
+        NewRelayListView({ wantsToEditRelays = false }, accountViewModel, nav = nav)
+    }
 }
 
 private fun enableTor(
@@ -446,6 +472,44 @@ private fun enableTor(
     ServiceManager.start(context)
 }
 
+@Composable
+private fun RelayStatus(
+    relayViewModel: RelayPoolViewModel
+) {
+    val connectedRelaysLiveData = relayViewModel.connectedRelaysLiveData.observeAsState()
+    val availableRelaysLiveData = relayViewModel.availableRelaysLiveData.observeAsState()
+
+    val connectedRelaysText by remember(connectedRelaysLiveData, availableRelaysLiveData) {
+        derivedStateOf {
+            "${connectedRelaysLiveData.value ?: "--"}/${availableRelaysLiveData.value ?: "--"}"
+        }
+    }
+
+    val isConnected by remember(connectedRelaysLiveData) {
+        derivedStateOf {
+            (connectedRelaysLiveData.value ?: 0) > 0
+        }
+    }
+
+    RenderRelayStatus(connectedRelaysText, isConnected)
+}
+
+@Composable
+private fun RenderRelayStatus(
+    connectedRelaysText: String,
+    isConnected: Boolean
+) {
+    Text(
+        text = connectedRelaysText,
+        color = if (isConnected) {
+            MaterialTheme.colors.placeholderText
+        } else {
+            Color.Red
+        },
+        style = MaterialTheme.typography.subtitle1
+    )
+}
+
 @Composable
 fun NavigationRow(
     title: String,
@@ -496,6 +560,39 @@ fun IconRow(title: String, icon: Int, tint: Color, onClick: () -> Unit, onLongCl
     }
 }
 
+@Composable
+fun IconRowRelays(relayViewModel: RelayPoolViewModel, onClick: () -> Unit) {
+    Row(
+        modifier = Modifier
+            .fillMaxWidth()
+            .clickable { onClick() }
+    ) {
+        Row(
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(vertical = 15.dp, horizontal = 25.dp),
+            verticalAlignment = Alignment.CenterVertically
+        ) {
+            Icon(
+                painter = painterResource(R.drawable.relays),
+                null,
+                modifier = Modifier.size(22.dp),
+                tint = MaterialTheme.colors.onSurface
+            )
+
+            Text(
+                modifier = Modifier.padding(start = 16.dp),
+                text = stringResource(id = R.string.relays),
+                fontSize = 18.sp
+            )
+
+            Spacer(modifier = Modifier.width(Size16dp))
+
+            RelayStatus(relayViewModel = relayViewModel)
+        }
+    }
+}
+
 @Composable
 fun BottomContent(user: User, scaffoldState: ScaffoldState, nav: (String) -> Unit) {
     val coroutineScope = rememberCoroutineScope()

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

@@ -42,9 +42,14 @@ sealed class Route(
         hasNewItems = { accountViewModel, newNotes -> HomeLatestItem.hasNewItems(accountViewModel, newNotes) }
     )
 
+    object Global : Route(
+        route = "Global",
+        icon = R.drawable.ic_globe
+    )
+
     object Search : Route(
         route = "Search",
-        icon = R.drawable.ic_globe
+        icon = R.drawable.ic_search
     )
 
     object Video : Route(
@@ -52,6 +57,11 @@ sealed class Route(
         icon = R.drawable.ic_video
     )
 
+    object Discover : Route(
+        route = "Discover",
+        icon = R.drawable.ic_sensors
+    )
+
     object Notification : Route(
         route = "Notification",
         icon = R.drawable.ic_notifications,

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

@@ -1,6 +1,7 @@
 package com.vitorpamplona.amethyst.ui.note
 
 import androidx.compose.foundation.ExperimentalFoundationApi
+import androidx.compose.foundation.background
 import androidx.compose.foundation.combinedClickable
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
@@ -26,7 +27,6 @@ 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.drawBehind
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.compositeOver
 import androidx.compose.ui.platform.LocalContext
@@ -79,9 +79,7 @@ fun BadgeCompose(likeSetCard: BadgeCard, isInnerNote: Boolean = false, routeForL
 
         Column(
             modifier = Modifier
-                .drawBehind {
-                    drawRect(backgroundColor.value)
-                }
+                .background(backgroundColor.value)
                 .combinedClickable(
                     onClick = {
                         scope.launch {

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

@@ -0,0 +1,480 @@
+package com.vitorpamplona.amethyst.ui.note
+
+import androidx.compose.animation.Crossfade
+import androidx.compose.foundation.ExperimentalFoundationApi
+import androidx.compose.foundation.combinedClickable
+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.aspectRatio
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material.MaterialTheme
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.MutableState
+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.runtime.setValue
+import androidx.compose.ui.Alignment.Companion.BottomStart
+import androidx.compose.ui.Alignment.Companion.TopEnd
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.compositeOver
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.unit.dp
+import androidx.lifecycle.distinctUntilChanged
+import androidx.lifecycle.map
+import coil.compose.AsyncImage
+import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.model.User
+import com.vitorpamplona.amethyst.service.OnlineChecker
+import com.vitorpamplona.amethyst.service.model.LiveActivitiesEvent
+import com.vitorpamplona.amethyst.service.model.LiveActivitiesEvent.Companion.STATUS_ENDED
+import com.vitorpamplona.amethyst.service.model.LiveActivitiesEvent.Companion.STATUS_LIVE
+import com.vitorpamplona.amethyst.service.model.LiveActivitiesEvent.Companion.STATUS_PLANNED
+import com.vitorpamplona.amethyst.ui.screen.equalImmutableLists
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.ChannelHeader
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.EndedFlag
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.LiveFlag
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.OfflineFlag
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.ScheduledFlag
+import com.vitorpamplona.amethyst.ui.theme.QuoteBorder
+import com.vitorpamplona.amethyst.ui.theme.Size35dp
+import com.vitorpamplona.amethyst.ui.theme.newItemBackgroundColor
+import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.persistentListOf
+import kotlinx.collections.immutable.persistentSetOf
+import kotlinx.collections.immutable.toImmutableList
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+
+@OptIn(ExperimentalFoundationApi::class)
+@Composable
+fun ChannelCardCompose(
+    baseNote: Note,
+    routeForLastRead: String? = null,
+    modifier: Modifier = Modifier,
+    parentBackgroundColor: MutableState<Color>? = null,
+    accountViewModel: AccountViewModel,
+    nav: (String) -> Unit
+) {
+    val isBlank by baseNote.live().metadata.map {
+        it.note.event == null
+    }.distinctUntilChanged().observeAsState(baseNote.event == null)
+
+    Crossfade(targetState = isBlank) {
+        if (it) {
+            LongPressToQuickAction(baseNote = baseNote, accountViewModel = accountViewModel) { showPopup ->
+                BlankNote(
+                    remember {
+                        modifier.combinedClickable(
+                            onClick = { },
+                            onLongClick = showPopup
+                        )
+                    },
+                    false
+                )
+            }
+        } else {
+            CheckHiddenChannelCardCompose(
+                baseNote,
+                routeForLastRead,
+                modifier,
+                parentBackgroundColor,
+                accountViewModel,
+                nav
+            )
+        }
+    }
+}
+
+@Composable
+fun CheckHiddenChannelCardCompose(
+    note: Note,
+    routeForLastRead: String? = null,
+    modifier: Modifier = Modifier,
+    parentBackgroundColor: MutableState<Color>? = null,
+    accountViewModel: AccountViewModel,
+    nav: (String) -> Unit
+) {
+    val isHidden by accountViewModel.accountLiveData.map {
+        accountViewModel.isNoteHidden(note)
+    }.distinctUntilChanged().observeAsState(accountViewModel.isNoteHidden(note))
+
+    Crossfade(targetState = isHidden) {
+        if (!it) {
+            LoadedChannelCardCompose(
+                note,
+                routeForLastRead,
+                modifier,
+                parentBackgroundColor,
+                accountViewModel,
+                nav
+            )
+        }
+    }
+}
+
+@Composable
+fun LoadedChannelCardCompose(
+    note: Note,
+    routeForLastRead: String? = null,
+    modifier: Modifier = Modifier,
+    parentBackgroundColor: MutableState<Color>? = null,
+    accountViewModel: AccountViewModel,
+    nav: (String) -> Unit
+) {
+    var state by remember {
+        mutableStateOf(
+            NoteComposeReportState(
+                isAcceptable = true,
+                canPreview = true,
+                relevantReports = persistentSetOf()
+            )
+        )
+    }
+
+    val scope = rememberCoroutineScope()
+
+    WatchForReports(note, accountViewModel) { newIsAcceptable, newCanPreview, newRelevantReports ->
+        if (newIsAcceptable != state.isAcceptable || newCanPreview != state.canPreview) {
+            val newState = NoteComposeReportState(newIsAcceptable, newCanPreview, newRelevantReports)
+            scope.launch(Dispatchers.Main) {
+                state = newState
+            }
+        }
+    }
+
+    Crossfade(targetState = state) {
+        RenderChannelCardReportState(
+            it,
+            note,
+            routeForLastRead,
+            modifier,
+            parentBackgroundColor,
+            accountViewModel,
+            nav
+        )
+    }
+}
+
+@Composable
+fun RenderChannelCardReportState(
+    state: NoteComposeReportState,
+    note: Note,
+    routeForLastRead: String? = null,
+    modifier: Modifier = Modifier,
+    parentBackgroundColor: MutableState<Color>? = null,
+    accountViewModel: AccountViewModel,
+    nav: (String) -> Unit
+) {
+    var showReportedNote by remember { mutableStateOf(false) }
+
+    Crossfade(targetState = !state.isAcceptable && !showReportedNote) { showHiddenNote ->
+        if (showHiddenNote) {
+            HiddenNote(
+                state.relevantReports,
+                accountViewModel,
+                modifier,
+                false,
+                nav,
+                onClick = { showReportedNote = true }
+            )
+        } else {
+            NormalChannelCard(
+                note,
+                routeForLastRead,
+                modifier,
+                parentBackgroundColor,
+                accountViewModel,
+                nav
+            )
+        }
+    }
+}
+
+@Composable
+fun NormalChannelCard(
+    baseNote: Note,
+    routeForLastRead: String? = null,
+    modifier: Modifier = Modifier,
+    parentBackgroundColor: MutableState<Color>? = null,
+    accountViewModel: AccountViewModel,
+    nav: (String) -> Unit
+) {
+    LongPressToQuickAction(baseNote = baseNote, accountViewModel = accountViewModel) { showPopup ->
+        CheckNewAndRenderChannelCard(
+            baseNote,
+            routeForLastRead,
+            modifier,
+            parentBackgroundColor,
+            accountViewModel,
+            showPopup,
+            nav
+        )
+    }
+}
+
+@Composable
+private fun CheckNewAndRenderChannelCard(
+    baseNote: Note,
+    routeForLastRead: String? = null,
+    modifier: Modifier = Modifier,
+    parentBackgroundColor: MutableState<Color>? = null,
+    accountViewModel: AccountViewModel,
+    showPopup: () -> Unit,
+    nav: (String) -> Unit
+) {
+    val newItemColor = MaterialTheme.colors.newItemBackgroundColor
+    val defaultBackgroundColor = MaterialTheme.colors.background
+    val backgroundColor = remember { mutableStateOf<Color>(defaultBackgroundColor) }
+
+    LaunchedEffect(key1 = routeForLastRead, key2 = parentBackgroundColor?.value) {
+        launch(Dispatchers.IO) {
+            routeForLastRead?.let {
+                val lastTime = accountViewModel.account.loadLastRead(it)
+
+                val createdAt = baseNote.createdAt()
+                if (createdAt != null) {
+                    accountViewModel.account.markAsRead(it, createdAt)
+
+                    val isNew = createdAt > lastTime
+
+                    val newBackgroundColor = if (isNew) {
+                        if (parentBackgroundColor != null) {
+                            newItemColor.compositeOver(parentBackgroundColor.value)
+                        } else {
+                            newItemColor.compositeOver(defaultBackgroundColor)
+                        }
+                    } else {
+                        parentBackgroundColor?.value ?: defaultBackgroundColor
+                    }
+
+                    if (newBackgroundColor != backgroundColor.value) {
+                        launch(Dispatchers.Main) {
+                            backgroundColor.value = newBackgroundColor
+                        }
+                    }
+                }
+            } ?: run {
+                val newBackgroundColor = parentBackgroundColor?.value ?: defaultBackgroundColor
+
+                if (newBackgroundColor != backgroundColor.value) {
+                    launch(Dispatchers.Main) {
+                        backgroundColor.value = newBackgroundColor
+                    }
+                }
+            }
+        }
+    }
+
+    ClickableNote(
+        baseNote = baseNote,
+        backgroundColor = backgroundColor,
+        modifier = modifier,
+        accountViewModel = accountViewModel,
+        showPopup = showPopup,
+        nav = nav
+    ) {
+        InnerChannelCardWithReactions(
+            baseNote = baseNote,
+            accountViewModel = accountViewModel,
+            nav = nav
+        )
+    }
+}
+
+@Composable
+fun InnerChannelCardWithReactions(
+    baseNote: Note,
+    accountViewModel: AccountViewModel,
+    nav: (String) -> Unit
+) {
+    Column() {
+        RenderNoteRow(
+            baseNote,
+            accountViewModel,
+            nav
+        )
+    }
+}
+
+@Composable
+private fun RenderNoteRow(
+    baseNote: Note,
+    accountViewModel: AccountViewModel,
+    nav: (String) -> Unit
+) {
+    when (remember { baseNote.event }) {
+        is LiveActivitiesEvent -> {
+            RenderLiveActivityThumb(baseNote, accountViewModel, nav)
+        }
+    }
+}
+
+@OptIn(ExperimentalLayoutApi::class)
+@Composable
+fun RenderLiveActivityThumb(baseNote: Note, accountViewModel: AccountViewModel, nav: (String) -> Unit) {
+    val noteEvent = baseNote.event as? LiveActivitiesEvent ?: return
+
+    val eventUpdates by baseNote.live().metadata.observeAsState()
+
+    val media = remember(eventUpdates) { noteEvent.streaming() }
+    val cover by remember(eventUpdates) {
+        derivedStateOf {
+            noteEvent.image()?.ifBlank { null }
+        }
+    }
+    val subject = remember(eventUpdates) { noteEvent.title()?.ifBlank { null } }
+    val content = remember(eventUpdates) { noteEvent.summary() }
+    val participants = remember(eventUpdates) { noteEvent.participants() }
+    val status = remember(eventUpdates) { noteEvent.status() }
+
+    var isOnline by remember { mutableStateOf(false) }
+
+    LaunchedEffect(key1 = media) {
+        launch(Dispatchers.IO) {
+            val newIsOnline = OnlineChecker.isOnline(media)
+            if (isOnline != newIsOnline) {
+                isOnline = newIsOnline
+            }
+        }
+    }
+
+    var participantUsers by remember {
+        mutableStateOf<ImmutableList<User>>(
+            persistentListOf()
+        )
+    }
+
+    LaunchedEffect(key1 = eventUpdates) {
+        launch(Dispatchers.IO) {
+            val channel = LocalCache.getChannelIfExists(baseNote.idHex)
+            val repliesByFollows = channel?.notes?.mapNotNull { it.value.author?.pubkeyHex }?.toSet() ?: emptySet()
+
+            val zappers = baseNote.publicZapAuthors()
+            val likeAuthors = baseNote.reactionAuthors()
+
+            val allParticipants = (repliesByFollows + zappers + likeAuthors).filter { accountViewModel.isFollowing(it) }
+
+            val newParticipantUsers = (
+                participants.mapNotNull { part ->
+                    if (part.key != baseNote.author?.pubkeyHex) {
+                        LocalCache.checkGetOrCreateUser(part.key)
+                    } else {
+                        null
+                    }
+                } + allParticipants.mapNotNull {
+                    if (it != baseNote.author?.pubkeyHex) {
+                        LocalCache.checkGetOrCreateUser(it)
+                    } else {
+                        null
+                    }
+                }
+                ).toImmutableList()
+
+            if (!equalImmutableLists(newParticipantUsers, participantUsers)) {
+                participantUsers = newParticipantUsers
+            }
+        }
+    }
+
+    Column(
+        modifier = Modifier.fillMaxWidth()
+    ) {
+        Box(
+            contentAlignment = TopEnd,
+            modifier = Modifier
+                .aspectRatio(ratio = 16f / 9f)
+                .fillMaxWidth()
+        ) {
+            cover?.let {
+                AsyncImage(
+                    model = it,
+                    contentDescription = null,
+                    contentScale = ContentScale.Crop,
+                    modifier = Modifier
+                        .fillMaxSize()
+                        .clip(QuoteBorder)
+                )
+            } ?: run {
+                baseNote.author?.let {
+                    DisplayAuthorBanner(it)
+                }
+            }
+
+            Box(Modifier.padding(10.dp)) {
+                Crossfade(targetState = status) {
+                    when (it) {
+                        STATUS_LIVE -> {
+                            if (media.isNullOrBlank()) {
+                                LiveFlag()
+                            } else if (isOnline) {
+                                LiveFlag()
+                            } else {
+                                OfflineFlag()
+                            }
+                        }
+                        STATUS_ENDED -> {
+                            EndedFlag()
+                        }
+                        STATUS_PLANNED -> {
+                            ScheduledFlag()
+                        }
+                        else -> {
+                            EndedFlag()
+                        }
+                    }
+                }
+            }
+
+            Box(Modifier.padding(10.dp).align(BottomStart)) {
+                if (participantUsers.isNotEmpty()) {
+                    FlowRow() {
+                        participantUsers.forEach {
+                            ClickableUserPicture(it, Size35dp, accountViewModel)
+                        }
+                    }
+                }
+            }
+        }
+
+        ChannelHeader(
+            channelHex = remember { baseNote.idHex },
+            showVideo = false,
+            showBottomDiviser = false,
+            showFlag = false,
+            modifier = remember {
+                Modifier.padding(start = 0.dp, end = 0.dp, top = 5.dp, bottom = 5.dp)
+            },
+            accountViewModel = accountViewModel,
+            nav = nav
+        )
+    }
+}
+
+@Composable
+fun DisplayAuthorBanner(author: User) {
+    val picture by author.live().metadata.map {
+        it.user.info?.banner?.ifBlank { null } ?: it.user.info?.picture?.ifBlank { null }
+    }.observeAsState()
+
+    AsyncImage(
+        model = picture,
+        contentDescription = null,
+        contentScale = ContentScale.Crop,
+        modifier = Modifier
+            .fillMaxSize()
+            .clip(QuoteBorder)
+    )
+}

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

@@ -150,19 +150,19 @@ private fun ChannelRoomCompose(
     nav: (String) -> Unit
 ) {
     val authorState by note.author!!.live().metadata.observeAsState()
-    val authorName = remember(authorState) {
+    val authorName = remember(note, authorState) {
         authorState?.user?.toBestDisplayName()
     }
 
     val chanHex = remember { channel.idHex }
 
     val channelState by channel.live.observeAsState()
-    val channelPicture by remember(channelState) {
+    val channelPicture by remember(note, channelState) {
         derivedStateOf {
             channel.profilePicture()
         }
     }
-    val channelName by remember(channelState) {
+    val channelName by remember(note, channelState) {
         derivedStateOf {
             channel.toBestDisplayName()
         }
@@ -182,7 +182,7 @@ private fun ChannelRoomCompose(
         noteEvent?.content()
     }
 
-    var hasNewMessages = remember { mutableStateOf<Boolean>(false) }
+    val hasNewMessages = remember { mutableStateOf<Boolean>(false) }
 
     WatchNotificationChanges(note, route, accountViewModel) { newHasNewMessages ->
         if (hasNewMessages.value != newHasNewMessages) {

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

@@ -2,6 +2,7 @@ package com.vitorpamplona.amethyst.ui.note
 
 import androidx.compose.animation.Crossfade
 import androidx.compose.foundation.ExperimentalFoundationApi
+import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.combinedClickable
 import androidx.compose.foundation.interaction.MutableInteractionSource
@@ -40,7 +41,6 @@ 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.draw.drawBehind
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.Shape
 import androidx.compose.ui.graphics.compositeOver
@@ -923,7 +923,7 @@ private fun RenderRelayIcon(iconUrl: String) {
         Modifier
             .size(Size13dp)
             .clip(shape = CircleShape)
-            .drawBehind { drawRect(backgroundColor) }
+            .background(backgroundColor)
     }
 
     RobohashFallbackAsyncImage(

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

@@ -22,7 +22,6 @@ 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.drawBehind
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.compositeOver
 import androidx.compose.ui.res.painterResource
@@ -70,11 +69,7 @@ fun MessageSetCompose(messageSetCard: MessageSetCard, routeForLastRead: String,
 
     val columnModifier = remember(backgroundColor.value) {
         Modifier
-            .drawBehind {
-                drawRect(
-                    backgroundColor.value
-                )
-            }
+            .background(backgroundColor.value)
             .padding(
                 start = 12.dp,
                 end = 12.dp,

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

@@ -3,6 +3,7 @@ package com.vitorpamplona.amethyst.ui.note
 import android.util.Log
 import androidx.compose.animation.Crossfade
 import androidx.compose.foundation.ExperimentalFoundationApi
+import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.combinedClickable
 import androidx.compose.foundation.layout.Box
@@ -35,7 +36,6 @@ 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.draw.drawBehind
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.compositeOver
 import androidx.compose.ui.layout.ContentScale
@@ -114,9 +114,7 @@ fun MultiSetCompose(multiSetCard: MultiSetCard, routeForLastRead: String, accoun
 
     val columnModifier = remember(backgroundColor.value) {
         Modifier
-            .drawBehind {
-                drawRect(backgroundColor.value)
-            }
+            .background(backgroundColor.value)
             .padding(
                 start = 12.dp,
                 end = 12.dp,
@@ -440,7 +438,7 @@ fun CrossfadeToDisplayAmount(authorComment: MutableState<ZapAmountCommentNotific
                     modifier = remember {
                         Modifier
                             .width(Size35dp)
-                            .drawBehind { drawRect(backgroundColor) }
+                            .background(backgroundColor)
                     },
                     contentAlignment = Alignment.BottomCenter
                 ) {

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

@@ -117,10 +117,7 @@ fun ObserveDisplayNip05Status(baseUser: User, columnModifier: Modifier = Modifie
 
     Crossfade(targetState = nip05, modifier = columnModifier) {
         if (it != null) {
-            val isValid = it.split("@").size == 2
-            if (isValid) {
-                DisplayNIP05Line(it, baseUser, columnModifier)
-            }
+            DisplayNIP05Line(it, baseUser, columnModifier)
         }
     }
 }
@@ -144,7 +141,12 @@ private fun DisplayNIP05(
 ) {
     val uri = LocalUriHandler.current
     val (user, domain) = remember(nip05) {
-        nip05.split("@")
+        val parts = nip05.split("@")
+        if (parts.size == 1) {
+            listOf("_", parts[0])
+        } else {
+            listOf(parts[0], parts[1])
+        }
     }
 
     if (user != "_") {
@@ -180,7 +182,7 @@ private fun NIP05VerifiedSymbol(nip05Verified: MutableState<Boolean?>) {
         )
     } else if (nip05Verified.value == true) {
         Icon(
-            painter = painterResource(R.drawable.ic_verified),
+            painter = painterResource(R.drawable.ic_verified_transparent),
             "NIP-05 Verified",
             tint = Nip05.copy(0.52f),
             modifier = Modifier
@@ -204,7 +206,7 @@ fun DisplayNip05ProfileStatus(user: User) {
     val uri = LocalUriHandler.current
 
     user.nip05()?.let { nip05 ->
-        if (nip05.split("@").size == 2) {
+        if (nip05.split("@").size <= 2) {
             val nip05Verified by nip05VerificationAsAState(user.info!!, user.pubkeyHex)
             Row(verticalAlignment = Alignment.CenterVertically) {
                 if (nip05Verified == null) {
@@ -216,7 +218,7 @@ fun DisplayNip05ProfileStatus(user: User) {
                     )
                 } else if (nip05Verified == true) {
                     Icon(
-                        painter = painterResource(R.drawable.ic_verified),
+                        painter = painterResource(R.drawable.ic_verified_transparent),
                         "NIP-05 Verified",
                         tint = Nip05,
                         modifier = Modifier.size(16.dp)
@@ -232,9 +234,18 @@ fun DisplayNip05ProfileStatus(user: User) {
 
                 var domainPadStart = 5.dp
 
-                if (nip05.split("@")[0] != "_") {
+                val (user, domain) = remember(nip05) {
+                    val parts = nip05.split("@")
+                    if (parts.size == 1) {
+                        listOf("_", parts[0])
+                    } else {
+                        listOf(parts[0], parts[1])
+                    }
+                }
+
+                if (user != "_") {
                     Text(
-                        text = AnnotatedString(nip05.split("@")[0] + "@"),
+                        text = remember { AnnotatedString(user + "@") },
                         modifier = Modifier.padding(top = 1.dp, bottom = 1.dp, start = 5.dp),
                         maxLines = 1,
                         overflow = TextOverflow.Ellipsis
@@ -243,7 +254,7 @@ fun DisplayNip05ProfileStatus(user: User) {
                 }
 
                 ClickableText(
-                    text = AnnotatedString(nip05.split("@")[1]),
+                    text = AnnotatedString(domain),
                     onClick = { nip05.let { runCatching { uri.openUri("https://${it.split("@")[1]}") } } },
                     style = LocalTextStyle.current.copy(color = MaterialTheme.colors.primary),
                     modifier = Modifier.padding(top = 1.dp, bottom = 1.dp, start = domainPadStart),

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

@@ -61,7 +61,6 @@ import androidx.compose.ui.Alignment.Companion.CenterVertically
 import androidx.compose.ui.Alignment.Companion.TopEnd
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
-import androidx.compose.ui.draw.drawBehind
 import androidx.compose.ui.graphics.Brush
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.compositeOver
@@ -109,6 +108,8 @@ 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.LiveActivitiesEvent.Companion.STATUS_LIVE
+import com.vitorpamplona.amethyst.service.model.LiveActivitiesEvent.Companion.STATUS_PLANNED
 import com.vitorpamplona.amethyst.service.model.LongTextNoteEvent
 import com.vitorpamplona.amethyst.service.model.Participant
 import com.vitorpamplona.amethyst.service.model.PeopleListEvent
@@ -153,7 +154,6 @@ import com.vitorpamplona.amethyst.ui.theme.BitcoinOrange
 import com.vitorpamplona.amethyst.ui.theme.DividerThickness
 import com.vitorpamplona.amethyst.ui.theme.DoubleHorzSpacer
 import com.vitorpamplona.amethyst.ui.theme.DoubleVertSpacer
-import com.vitorpamplona.amethyst.ui.theme.Following
 import com.vitorpamplona.amethyst.ui.theme.Font14SP
 import com.vitorpamplona.amethyst.ui.theme.HalfPadding
 import com.vitorpamplona.amethyst.ui.theme.HalfVertSpacer
@@ -540,7 +540,7 @@ private fun CheckNewAndRenderNote(
 
 @Composable
 @OptIn(ExperimentalFoundationApi::class)
-private fun ClickableNote(
+fun ClickableNote(
     baseNote: Note,
     modifier: Modifier,
     backgroundColor: MutableState<Color>,
@@ -551,7 +551,7 @@ private fun ClickableNote(
 ) {
     val scope = rememberCoroutineScope()
 
-    val updatedModifier = remember(backgroundColor) {
+    val updatedModifier = remember(baseNote, backgroundColor.value) {
         modifier
             .combinedClickable(
                 onClick = {
@@ -563,9 +563,7 @@ private fun ClickableNote(
                 },
                 onLongClick = showPopup
             )
-            .drawBehind {
-                drawRect(backgroundColor.value)
-            }
+            .background(backgroundColor.value)
     }
 
     Column(modifier = updatedModifier) {
@@ -1293,16 +1291,7 @@ fun DisplayRelaySet(
                 modifier = Modifier
                     .align(Alignment.BottomCenter)
                     .fillMaxWidth()
-                    .drawBehind {
-                        drawRect(
-                            Brush.verticalGradient(
-                                colors = listOf(
-                                    backgroundColor.value.copy(alpha = 0f),
-                                    backgroundColor.value
-                                )
-                            )
-                        )
-                    }
+                    .background(getGradient(backgroundColor))
             ) {
                 ShowMoreButton {
                     expanded = !expanded
@@ -1409,16 +1398,7 @@ fun DisplayPeopleList(
                 modifier = Modifier
                     .align(Alignment.BottomCenter)
                     .fillMaxWidth()
-                    .drawBehind {
-                        drawRect(
-                            Brush.verticalGradient(
-                                colors = listOf(
-                                    backgroundColor.value.copy(alpha = 0f),
-                                    backgroundColor.value
-                                )
-                            )
-                        )
-                    }
+                    .background(getGradient(backgroundColor))
             ) {
                 ShowMoreButton {
                     expanded = !expanded
@@ -1618,16 +1598,7 @@ fun PinListHeader(
                 modifier = Modifier
                     .align(Alignment.BottomCenter)
                     .fillMaxWidth()
-                    .drawBehind {
-                        drawRect(
-                            Brush.verticalGradient(
-                                colors = listOf(
-                                    backgroundColor.value.copy(alpha = 0f),
-                                    backgroundColor.value
-                                )
-                            )
-                        )
-                    }
+                    .background(getGradient(backgroundColor))
             ) {
                 ShowMoreButton {
                     expanded = !expanded
@@ -1637,6 +1608,15 @@ fun PinListHeader(
     }
 }
 
+fun getGradient(backgroundColor: MutableState<Color>): Brush {
+    return Brush.verticalGradient(
+        colors = listOf(
+            backgroundColor.value.copy(alpha = 0f),
+            backgroundColor.value
+        )
+    )
+}
+
 @Composable
 private fun RenderAudioTrack(
     note: Note,
@@ -1807,7 +1787,7 @@ private fun ReplyNoteComposition(
 }
 
 @Composable
-private fun SecondUserInfoRow(
+fun SecondUserInfoRow(
     note: Note,
     accountViewModel: AccountViewModel,
     nav: (String) -> Unit
@@ -1831,7 +1811,7 @@ private fun SecondUserInfoRow(
 }
 
 @Composable
-private fun FirstUserInfoRow(
+fun FirstUserInfoRow(
     baseNote: Note,
     showAuthorPicture: Boolean,
     accountViewModel: AccountViewModel,
@@ -1876,7 +1856,7 @@ private fun BoostedMark() {
 }
 
 @Composable
-private fun MoreOptionsButton(
+fun MoreOptionsButton(
     baseNote: Note,
     accountViewModel: AccountViewModel
 ) {
@@ -2017,7 +1997,7 @@ private fun ChannelNotePicture(baseChannel: Channel) {
             .width(30.dp)
             .height(30.dp)
             .clip(shape = CircleShape)
-            .drawBehind { drawRect(backgroundColor) }
+            .background(backgroundColor)
             .border(
                 2.dp,
                 backgroundColor,
@@ -2712,12 +2692,12 @@ fun RenderLiveActivityEventInner(baseNote: Note, accountViewModel: AccountViewMo
 
         Crossfade(targetState = status) {
             when (it) {
-                "live" -> {
+                STATUS_LIVE -> {
                     if (isOnline) {
                         LiveFlag()
                     }
                 }
-                "planned" -> {
+                STATUS_PLANNED -> {
                     ScheduledFlag()
                 }
             }
@@ -2766,7 +2746,7 @@ fun RenderLiveActivityEventInner(baseNote: Note, accountViewModel: AccountViewMo
     }
 
     media?.let { media ->
-        if (status == "live") {
+        if (status == STATUS_LIVE) {
             if (isOnline) {
                 Row(
                     verticalAlignment = Alignment.CenterVertically,
@@ -2863,7 +2843,7 @@ private fun LongFormHeader(noteEvent: LongTextNoteEvent, note: Note, accountView
 }
 
 @Composable
-private fun CreateImageHeader(
+fun CreateImageHeader(
     note: Note,
     accountViewModel: AccountViewModel
 ) {
@@ -3049,7 +3029,7 @@ fun DisplayBlankAuthor(size: Dp, modifier: Modifier = Modifier) {
         modifier
             .size(size)
             .clip(shape = CircleShape)
-            .drawBehind { drawRect(backgroundColor) }
+            .background(backgroundColor)
     }
 
     RobohashAsyncImage(
@@ -3191,7 +3171,7 @@ fun PictureAndFollowingMark(
         modifier
             .size(size)
             .clip(shape = CircleShape)
-            .drawBehind { drawRect(backgroundColor) }
+            .background(backgroundColor)
     }
 
     RobohashAsyncImageProxy(
@@ -3240,30 +3220,12 @@ fun FollowingIcon(iconSize: Dp) {
         Modifier.size(iconSize)
     }
 
-    val backgroundColor = MaterialTheme.colors.background
-
-    val myIconBackgroundModifier = remember {
-        Modifier
-            .clip(CircleShape)
-            .size(iconSize.times(0.6f))
-            .drawBehind { drawRect(backgroundColor) }
-    }
-
-    FollowingIcon(modifier, myIconBackgroundModifier)
-}
-
-@Composable
-fun FollowingIcon(modifier: Modifier, myIconBackgroundModifier: Modifier) {
-    Box(modifier = modifier, contentAlignment = Alignment.Center) {
-        Box(myIconBackgroundModifier)
-
-        Icon(
-            painter = painterResource(R.drawable.ic_verified),
-            stringResource(id = R.string.following),
-            modifier = modifier,
-            tint = Following
-        )
-    }
+    Icon(
+        painter = painterResource(R.drawable.verified_follow_shield),
+        contentDescription = stringResource(id = R.string.following),
+        modifier = modifier,
+        tint = Color.Unspecified
+    )
 }
 
 @Immutable

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

@@ -7,5 +7,6 @@ fun ByteArray.toShortenHex(): String {
 }
 
 fun String.toShortenHex(): String {
+    if (length <= 16) return this
     return replaceRange(8, length - 8, ":")
 }

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

@@ -1,11 +1,17 @@
 package com.vitorpamplona.amethyst.ui.note
 
 import android.content.Context
+import android.util.Log
 import android.widget.Toast
 import androidx.compose.animation.AnimatedContent
+import androidx.compose.animation.AnimatedContentScope
+import androidx.compose.animation.ContentTransform
 import androidx.compose.animation.Crossfade
 import androidx.compose.animation.ExperimentalAnimationApi
 import androidx.compose.animation.core.animateFloatAsState
+import androidx.compose.animation.core.tween
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
 import androidx.compose.animation.slideInVertically
 import androidx.compose.animation.slideOutVertically
 import androidx.compose.animation.with
@@ -112,6 +118,8 @@ import kotlinx.coroutines.launch
 import java.math.BigDecimal
 import java.math.RoundingMode
 import kotlin.math.roundToInt
+import kotlin.time.ExperimentalTime
+import kotlin.time.measureTimedValue
 
 @Composable
 fun ReactionsRow(
@@ -137,6 +145,7 @@ fun ReactionsRow(
     Spacer(modifier = HalfDoubleVertSpacer)
 }
 
+@OptIn(ExperimentalTime::class)
 @Composable
 private fun InnerReactionRow(
     baseNote: Note,
@@ -163,49 +172,69 @@ private fun InnerReactionRow(
             verticalArrangement = Arrangement.Center,
             modifier = remember { Modifier.weight(1f) }
         ) {
-            Row(verticalAlignment = CenterVertically) {
-                ReplyReactionWithDialog(baseNote, MaterialTheme.colors.placeholderText, accountViewModel, nav)
+            val (value, elapsed) = measureTimedValue {
+                Row(verticalAlignment = CenterVertically) {
+                    ReplyReactionWithDialog(baseNote, MaterialTheme.colors.placeholderText, accountViewModel, nav)
+                }
             }
+            Log.d("Rendering Metrics", "Reaction Reply: ${baseNote.event?.content()?.split("\n")?.getOrNull(0)?.take(15)}.. $elapsed")
         }
 
         Column(
             verticalArrangement = Arrangement.Center,
             modifier = remember { Modifier.weight(1f) }
         ) {
-            Row(verticalAlignment = CenterVertically) {
-                BoostWithDialog(baseNote, MaterialTheme.colors.placeholderText, accountViewModel, nav)
+            val (value, elapsed) = measureTimedValue {
+                Row(verticalAlignment = CenterVertically) {
+                    BoostWithDialog(
+                        baseNote,
+                        MaterialTheme.colors.placeholderText,
+                        accountViewModel,
+                        nav
+                    )
+                }
             }
+            Log.d("Rendering Metrics", "Reaction Boost: ${baseNote.event?.content()?.split("\n")?.getOrNull(0)?.take(15)}.. $elapsed")
         }
 
         Column(
             verticalArrangement = Arrangement.Center,
             modifier = remember { Modifier.weight(1f) }
         ) {
-            Row(verticalAlignment = CenterVertically) {
-                LikeReaction(baseNote, MaterialTheme.colors.placeholderText, accountViewModel)
+            val (value, elapsed) = measureTimedValue {
+                Row(verticalAlignment = CenterVertically) {
+                    LikeReaction(baseNote, MaterialTheme.colors.placeholderText, accountViewModel)
+                }
             }
+            Log.d("Rendering Metrics", "Reaction Likes: ${baseNote.event?.content()?.split("\n")?.getOrNull(0)?.take(15)}.. $elapsed")
         }
 
         Column(
             verticalArrangement = Arrangement.Center,
             modifier = remember { Modifier.weight(1f) }
         ) {
-            Row(verticalAlignment = CenterVertically) {
-                ZapReaction(baseNote, MaterialTheme.colors.placeholderText, accountViewModel)
+            val (value, elapsed) = measureTimedValue {
+                Row(verticalAlignment = CenterVertically) {
+                    ZapReaction(baseNote, MaterialTheme.colors.placeholderText, accountViewModel)
+                }
             }
+            Log.d("Rendering Metrics", "Reaction Zaps:  ${baseNote.event?.content()?.split("\n")?.getOrNull(0)?.take(15)}.. $elapsed")
         }
 
         Column(
             verticalArrangement = Arrangement.Center,
             modifier = remember { Modifier.weight(1f) }
         ) {
-            Row(verticalAlignment = CenterVertically) {
-                ViewCountReaction(
-                    note = baseNote,
-                    grayTint = MaterialTheme.colors.placeholderText,
-                    viewCountColorFilter = MaterialTheme.colors.placeholderTextColorFilter
-                )
+            val (value, elapsed) = measureTimedValue {
+                Row(verticalAlignment = CenterVertically) {
+                    ViewCountReaction(
+                        note = baseNote,
+                        grayTint = MaterialTheme.colors.placeholderText,
+                        viewCountColorFilter = MaterialTheme.colors.placeholderTextColorFilter
+                    )
+                }
             }
+            Log.d("Rendering Metrics", "Reaction Views: ${baseNote.event?.content()?.split("\n")?.getOrNull(0)?.take(15)}.. $elapsed")
         }
     }
 }
@@ -492,16 +521,10 @@ fun ReplyReaction(
     val context = LocalContext.current
     val scope = rememberCoroutineScope()
 
-    val iconButtonModifier = remember {
-        Modifier.size(iconSize)
-    }
-
-    val iconModifier = remember {
-        Modifier.size(iconSize)
-    }
-
     IconButton(
-        modifier = iconButtonModifier,
+        modifier = remember {
+            Modifier.size(iconSize)
+        },
         onClick = {
             if (accountViewModel.isWriteable()) {
                 onPress()
@@ -518,8 +541,8 @@ fun ReplyReaction(
     ) {
         Icon(
             painter = painterResource(R.drawable.ic_comment),
-            null,
-            modifier = iconModifier,
+            contentDescription = null,
+            modifier = remember { Modifier.size(iconSize) },
             tint = grayTint
         )
     }
@@ -538,23 +561,29 @@ fun ReplyCounter(baseNote: Note, textColor: Color) {
     SlidingAnimation(repliesState, textColor)
 }
 
-@Composable
 @OptIn(ExperimentalAnimationApi::class)
+@Composable
 private fun SlidingAnimation(baseCount: Int, textColor: Color) {
     AnimatedContent<Int>(
         targetState = baseCount,
-        transitionSpec = {
-            if (targetState > initialState) {
-                slideInVertically { -it } with slideOutVertically { it }
-            } else {
-                slideInVertically { it } with slideOutVertically { -it }
-            }
-        }
+        transitionSpec = AnimatedContentScope<Int>::transitionSpec
     ) { count ->
         TextCount(count, textColor)
     }
 }
 
+@OptIn(ExperimentalAnimationApi::class)
+private fun <S> AnimatedContentScope<S>.transitionSpec(): ContentTransform {
+    return slideAnimation
+}
+
+@ExperimentalAnimationApi
+val slideAnimation: ContentTransform = slideInVertically(animationSpec = tween(durationMillis = 100)) { height -> height } + fadeIn(
+    animationSpec = tween(durationMillis = 100)
+) with slideOutVertically(animationSpec = tween(durationMillis = 100)) { height -> -height } + fadeOut(
+    animationSpec = tween(durationMillis = 100)
+)
+
 @Composable
 private fun TextCount(count: Int, textColor: Color) {
     Text(
@@ -569,15 +598,9 @@ private fun TextCount(count: Int, textColor: Color) {
 @Composable
 @OptIn(ExperimentalAnimationApi::class)
 private fun SlidingAnimation(amount: String, textColor: Color) {
-    AnimatedContent<String>(
+    AnimatedContent(
         targetState = amount,
-        transitionSpec = {
-            if (targetState > initialState) {
-                slideInVertically { -it } with slideOutVertically { it }
-            } else {
-                slideInVertically { it } with slideOutVertically { -it }
-            }
-        }
+        transitionSpec = AnimatedContentScope<String>::transitionSpec
     ) { count ->
         Text(
             text = count,

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

@@ -5,7 +5,6 @@ import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
 import androidx.compose.material.Icon
 import androidx.compose.material.MaterialTheme
@@ -50,6 +49,9 @@ import com.vitorpamplona.amethyst.ui.components.BundledInsert
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.showAmountAxis
 import com.vitorpamplona.amethyst.ui.theme.BitcoinOrange
 import com.vitorpamplona.amethyst.ui.theme.RoyalBlue
+import com.vitorpamplona.amethyst.ui.theme.Size20Modifier
+import com.vitorpamplona.amethyst.ui.theme.Size24Modifier
+import com.vitorpamplona.amethyst.ui.theme.StdHorzSpacer
 import com.vitorpamplona.amethyst.ui.theme.placeholderText
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
@@ -82,7 +84,7 @@ fun UserReactionsRow(
             Icon(
                 imageVector = Icons.Default.ExpandMore,
                 null,
-                modifier = Modifier.size(20.dp),
+                modifier = Size20Modifier,
                 tint = MaterialTheme.colors.placeholderText
             )
         }
@@ -163,6 +165,8 @@ class UserReactionsViewModel(val account: Account) : ViewModel() {
     fun today() = sdf.format(LocalDateTime.now())
 
     private suspend fun initializeSuspend() {
+        checkNotInMainThread()
+
         val currentUser = user.pubkeyHex
 
         val reactions = mutableMapOf<String, Int>()
@@ -212,6 +216,8 @@ class UserReactionsViewModel(val account: Account) : ViewModel() {
     }
 
     suspend fun addToStatsSuspend(newNotes: Set<Note>) {
+        checkNotInMainThread()
+
         val currentUser = user.pubkeyHex
 
         val reactions = this._reactions.value.toMutableMap()
@@ -268,6 +274,8 @@ class UserReactionsViewModel(val account: Account) : ViewModel() {
     }
 
     private suspend fun refreshChartModel() {
+        checkNotInMainThread()
+
         val day = 24 * 60 * 60L
         val now = LocalDateTime.now()
         val displayAxisFormatter = DateTimeFormatter.ofPattern("EEE")
@@ -337,11 +345,11 @@ fun UserReplyReaction(
     Icon(
         painter = painterResource(R.drawable.ic_comment),
         null,
-        modifier = Modifier.size(20.dp),
+        modifier = Size20Modifier,
         tint = RoyalBlue
     )
 
-    Spacer(modifier = Modifier.width(10.dp))
+    Spacer(modifier = StdHorzSpacer)
 
     Text(
         showCounts,
@@ -359,11 +367,11 @@ fun UserBoostReaction(
     Icon(
         painter = painterResource(R.drawable.ic_retweeted),
         null,
-        modifier = Modifier.size(24.dp),
+        modifier = Size24Modifier,
         tint = Color.Unspecified
     )
 
-    Spacer(modifier = Modifier.width(10.dp))
+    Spacer(modifier = StdHorzSpacer)
 
     Text(
         showCounts,
@@ -381,14 +389,14 @@ fun UserLikeReaction(
     Icon(
         painter = painterResource(R.drawable.ic_liked),
         null,
-        modifier = Modifier.size(20.dp),
+        modifier = Size20Modifier,
         tint = Color.Unspecified
     )
 
-    Spacer(modifier = Modifier.width(10.dp))
+    Spacer(modifier = StdHorzSpacer)
 
     Text(
-        showCounts,
+        text = showCounts,
         fontWeight = FontWeight.Bold,
         fontSize = 18.sp
     )
@@ -401,7 +409,7 @@ fun UserZapReaction(
     Icon(
         imageVector = Icons.Default.Bolt,
         contentDescription = stringResource(R.string.zaps),
-        modifier = Modifier.size(24.dp),
+        modifier = Size24Modifier,
         tint = BitcoinOrange
     )
 

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

@@ -16,6 +16,7 @@ import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.livedata.observeAsState
 import androidx.compose.runtime.remember
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalLifecycleOwner
@@ -33,20 +34,20 @@ import com.vitorpamplona.amethyst.ui.theme.StdHorzSpacer
 import com.vitorpamplona.amethyst.ui.theme.placeholderText
 
 @Composable
-fun NoteUsernameDisplay(baseNote: Note, weight: Modifier = Modifier) {
+fun NoteUsernameDisplay(baseNote: Note, weight: Modifier = Modifier, showPlayButton: Boolean = true) {
     val authorState by baseNote.live().metadata.map {
         it.note.author
     }.observeAsState(baseNote.author)
 
     Crossfade(targetState = authorState, modifier = weight) {
         it?.let {
-            UsernameDisplay(it, weight)
+            UsernameDisplay(it, weight, showPlayButton)
         }
     }
 }
 
 @Composable
-fun UsernameDisplay(baseUser: User, weight: Modifier = Modifier) {
+fun UsernameDisplay(baseUser: User, weight: Modifier = Modifier, showPlayButton: Boolean = true) {
     val npubDisplay by remember {
         derivedStateOf {
             baseUser.pubkeyDisplayHex()
@@ -59,7 +60,7 @@ fun UsernameDisplay(baseUser: User, weight: Modifier = Modifier) {
 
     Crossfade(targetState = userMetadata, modifier = weight) {
         if (it != null) {
-            UserNameDisplay(it.bestUsername(), it.bestDisplayName(), npubDisplay, it.tags, weight)
+            UserNameDisplay(it.bestUsername(), it.bestDisplayName(), npubDisplay, it.tags, weight, showPlayButton)
         } else {
             NPubDisplay(npubDisplay, weight)
         }
@@ -72,14 +73,15 @@ private fun UserNameDisplay(
     bestDisplayName: String?,
     npubDisplay: String,
     tags: ImmutableListOfLists<String>?,
-    modifier: Modifier
+    modifier: Modifier,
+    showPlayButton: Boolean = true
 ) {
     if (bestUserName != null && bestDisplayName != null && bestDisplayName != bestUserName) {
-        UserAndUsernameDisplay(bestDisplayName, tags, bestUserName, modifier)
+        UserAndUsernameDisplay(bestDisplayName, tags, bestUserName, modifier, showPlayButton)
     } else if (bestDisplayName != null) {
-        UserDisplay(bestDisplayName, tags, modifier)
+        UserDisplay(bestDisplayName, tags, modifier, showPlayButton)
     } else if (bestUserName != null) {
-        UserDisplay(bestUserName, tags, modifier)
+        UserDisplay(bestUserName, tags, modifier, showPlayButton)
     } else {
         NPubDisplay(npubDisplay, modifier)
     }
@@ -100,9 +102,10 @@ private fun NPubDisplay(npubDisplay: String, modifier: Modifier) {
 private fun UserDisplay(
     bestDisplayName: String,
     tags: ImmutableListOfLists<String>?,
-    modifier: Modifier
+    modifier: Modifier,
+    showPlayButton: Boolean = true
 ) {
-    Row(modifier = modifier) {
+    Row(modifier = modifier, verticalAlignment = Alignment.CenterVertically) {
         CreateTextWithEmoji(
             text = bestDisplayName,
             tags = tags,
@@ -111,8 +114,10 @@ private fun UserDisplay(
             overflow = TextOverflow.Ellipsis,
             modifier = modifier
         )
-        Spacer(StdHorzSpacer)
-        DrawPlayName(bestDisplayName)
+        if (showPlayButton) {
+            Spacer(StdHorzSpacer)
+            DrawPlayName(bestDisplayName)
+        }
     }
 }
 
@@ -121,9 +126,10 @@ private fun UserAndUsernameDisplay(
     bestDisplayName: String,
     tags: ImmutableListOfLists<String>?,
     bestUserName: String,
-    modifier: Modifier
+    modifier: Modifier,
+    showPlayButton: Boolean = true
 ) {
-    Row(modifier = modifier) {
+    Row(modifier = modifier, verticalAlignment = Alignment.CenterVertically) {
         CreateTextWithEmoji(
             text = bestDisplayName,
             tags = tags,
@@ -138,8 +144,10 @@ private fun UserAndUsernameDisplay(
             overflow = TextOverflow.Ellipsis,
             modifier = modifier
         )
-        Spacer(StdHorzSpacer)
-        DrawPlayName(bestDisplayName)
+        if (showPlayButton) {
+            Spacer(StdHorzSpacer)
+            DrawPlayName(bestDisplayName)
+        }
     }
 }
 

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

@@ -1,5 +1,6 @@
 package com.vitorpamplona.amethyst.ui.note
 
+import android.widget.Toast
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
@@ -19,10 +20,12 @@ import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.model.User
@@ -194,6 +197,7 @@ fun ShowFollowingOrUnfollowingButton(
     accountViewModel: AccountViewModel
 ) {
     val scope = rememberCoroutineScope()
+    val context = LocalContext.current
 
     var isFollowing by remember { mutableStateOf(false) }
     val accountFollowsState by accountViewModel.account.userProfile().live().follows.observeAsState()
@@ -210,9 +214,41 @@ fun ShowFollowingOrUnfollowingButton(
     }
 
     if (isFollowing) {
-        UnfollowButton { scope.launch(Dispatchers.IO) { accountViewModel.unfollow(baseAuthor) } }
+        UnfollowButton {
+            if (!accountViewModel.isWriteable()) {
+                scope.launch {
+                    Toast
+                        .makeText(
+                            context,
+                            context.getString(R.string.login_with_a_private_key_to_be_able_to_unfollow),
+                            Toast.LENGTH_SHORT
+                        )
+                        .show()
+                }
+            } else {
+                scope.launch(Dispatchers.IO) {
+                    accountViewModel.unfollow(baseAuthor)
+                }
+            }
+        }
     } else {
-        FollowButton({ scope.launch(Dispatchers.IO) { accountViewModel.follow(baseAuthor) } })
+        FollowButton {
+            if (!accountViewModel.isWriteable()) {
+                scope.launch {
+                    Toast
+                        .makeText(
+                            context,
+                            context.getString(R.string.login_with_a_private_key_to_be_able_to_follow),
+                            Toast.LENGTH_SHORT
+                        )
+                        .show()
+                }
+            } else {
+                scope.launch(Dispatchers.IO) {
+                    accountViewModel.follow(baseAuthor)
+                }
+            }
+        }
     }
 }
 

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

@@ -21,7 +21,6 @@ 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.Color
 import androidx.compose.ui.graphics.compositeOver
 import androidx.compose.ui.res.stringResource
@@ -60,9 +59,7 @@ fun ZapUserSetCompose(zapSetCard: ZapUserSetCard, isInnerNote: Boolean = false,
 
     Column(
         modifier = Modifier
-            .drawBehind {
-                drawRect(backgroundColor.value)
-            }
+            .background(backgroundColor.value)
             .clickable {
                 nav("User/${zapSetCard.user.pubkeyHex}")
             }

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

@@ -184,7 +184,7 @@ open class CardFeedViewModel(val localFilter: FeedFilter<Note>) : ViewModel() {
                 .sortedWith(compareBy({ it.createdAt() }, { it.idHex }))
                 .reversed()
 
-            singleList.chunked(50).map { chunk ->
+            singleList.chunked(30).map { chunk ->
                 MultiSetCard(
                     baseNote,
                     boostsInCard.filter { it in chunk }.toImmutableList(),
@@ -235,9 +235,7 @@ open class CardFeedViewModel(val localFilter: FeedFilter<Note>) : ViewModel() {
         val thisAccount = (localFilter as? NotificationFeedFilter)?.account
         val lastNotesCopy = if (thisAccount == lastAccount) lastNotes else null
 
-        if (lastNotesCopy != null && localFilter is AdditiveFeedFilter && oldNotesState is CardFeedState.Loaded) {
-            lastFeedKey = localFilter.feedKey()
-
+        if (lastNotesCopy != null && localFilter is AdditiveFeedFilter && oldNotesState is CardFeedState.Loaded && lastFeedKey == localFilter.feedKey()) {
             val filteredNewList = localFilter.applyFilter(newItems)
 
             if (filteredNewList.isEmpty()) return

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

@@ -21,8 +21,8 @@ import com.vitorpamplona.amethyst.ui.dal.ChannelFeedFilter
 import com.vitorpamplona.amethyst.ui.dal.ChatroomFeedFilter
 import com.vitorpamplona.amethyst.ui.dal.ChatroomListKnownFeedFilter
 import com.vitorpamplona.amethyst.ui.dal.ChatroomListNewFeedFilter
+import com.vitorpamplona.amethyst.ui.dal.DiscoverFeedFilter
 import com.vitorpamplona.amethyst.ui.dal.FeedFilter
-import com.vitorpamplona.amethyst.ui.dal.GlobalFeedFilter
 import com.vitorpamplona.amethyst.ui.dal.HashtagFeedFilter
 import com.vitorpamplona.amethyst.ui.dal.HomeConversationsFeedFilter
 import com.vitorpamplona.amethyst.ui.dal.HomeLiveActivitiesFeedFilter
@@ -59,13 +59,6 @@ class NostrChatroomFeedViewModel(val user: User, val account: Account) : FeedVie
     }
 }
 
-class NostrGlobalFeedViewModel(val account: Account) : FeedViewModel(GlobalFeedFilter(account)) {
-    class Factory(val account: Account) : ViewModelProvider.Factory {
-        override fun <NostrGlobalFeedViewModel : ViewModel> create(modelClass: Class<NostrGlobalFeedViewModel>): NostrGlobalFeedViewModel {
-            return NostrGlobalFeedViewModel(account) as NostrGlobalFeedViewModel
-        }
-    }
-}
 class NostrVideoFeedViewModel(val account: Account) : FeedViewModel(VideoFeedFilter(account)) {
     class Factory(val account: Account) : ViewModelProvider.Factory {
         override fun <NostrVideoFeedViewModel : ViewModel> create(modelClass: Class<NostrVideoFeedViewModel>): NostrVideoFeedViewModel {
@@ -73,6 +66,15 @@ class NostrVideoFeedViewModel(val account: Account) : FeedViewModel(VideoFeedFil
         }
     }
 }
+
+class NostrDiscoverFeedViewModel(val account: Account) : FeedViewModel(DiscoverFeedFilter(account)) {
+    class Factory(val account: Account) : ViewModelProvider.Factory {
+        override fun <NostrDiscoverFeedViewModel : ViewModel> create(modelClass: Class<NostrDiscoverFeedViewModel>): NostrDiscoverFeedViewModel {
+            return NostrDiscoverFeedViewModel(account) as NostrDiscoverFeedViewModel
+        }
+    }
+}
+
 class NostrThreadFeedViewModel(val noteId: String) : FeedViewModel(ThreadFeedFilter(noteId)) {
     class Factory(val noteId: String) : ViewModelProvider.Factory {
         override fun <NostrThreadFeedViewModel : ViewModel> create(modelClass: Class<NostrThreadFeedViewModel>): NostrThreadFeedViewModel {
@@ -201,8 +203,8 @@ abstract class FeedViewModel(val localFilter: FeedFilter<Note>) : ViewModel(), I
     fun refreshSuspended() {
         checkNotInMainThread()
 
-        val notes = localFilter.loadTop().toImmutableList()
         lastFeedKey = localFilter.feedKey()
+        val notes = localFilter.loadTop().toImmutableList()
 
         val oldNotesState = _feedContent.value
         if (oldNotesState is FeedState.Loaded) {
@@ -231,16 +233,14 @@ abstract class FeedViewModel(val localFilter: FeedFilter<Note>) : ViewModel(), I
 
     fun refreshFromOldState(newItems: Set<Note>) {
         val oldNotesState = _feedContent.value
-        if (localFilter is AdditiveFeedFilter) {
+        if (localFilter is AdditiveFeedFilter && lastFeedKey == localFilter.feedKey()) {
             if (oldNotesState is FeedState.Loaded) {
                 val newList = localFilter.updateListWith(oldNotesState.feed.value, newItems.toSet()).toImmutableList()
-                lastFeedKey = localFilter.feedKey()
                 if (!equalImmutableLists(newList, oldNotesState.feed.value)) {
                     updateFeed(newList)
                 }
             } else if (oldNotesState is FeedState.Empty) {
                 val newList = localFilter.updateListWith(emptyList(), newItems.toSet()).toImmutableList()
-                lastFeedKey = localFilter.feedKey()
                 if (newList.isNotEmpty()) {
                     updateFeed(newList)
                 }

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

@@ -17,6 +17,7 @@ object ScrollStateKeys {
     const val GLOBAL_SCREEN = "Global"
     const val NOTIFICATION_SCREEN = "Notifications"
     const val VIDEO_SCREEN = "Video"
+    const val DISCOVER_SCREEN = "Discover"
     val HOME_FOLLOWS = Route.Home.base + "Follows"
     val HOME_REPLIES = Route.Home.base + "FollowsReplies"
 }

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

@@ -13,6 +13,7 @@ import androidx.lifecycle.viewModelScope
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.AccountState
+import com.vitorpamplona.amethyst.model.HexKey
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.model.User
 import com.vitorpamplona.amethyst.model.UserState
@@ -241,6 +242,10 @@ class AccountViewModel(val account: Account) : ViewModel() {
         return account.userProfile().isFollowingCached(user)
     }
 
+    fun isFollowing(user: HexKey): Boolean {
+        return account.userProfile().isFollowingCached(user)
+    }
+
     val hideDeleteRequestDialog: Boolean
         get() = account.hideDeleteRequestDialog
 

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

@@ -18,6 +18,7 @@ import androidx.compose.foundation.layout.heightIn
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.text.BasicTextField
 import androidx.compose.foundation.text.KeyboardActions
@@ -53,11 +54,11 @@ 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.draw.drawBehind
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.Shape
 import androidx.compose.ui.graphics.SolidColor
 import androidx.compose.ui.graphics.takeOrElse
+import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalClipboardManager
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalLifecycleOwner
@@ -82,12 +83,14 @@ import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.model.PublicChatChannel
 import com.vitorpamplona.amethyst.service.NostrChannelDataSource
+import com.vitorpamplona.amethyst.service.model.LiveActivitiesEvent.Companion.STATUS_LIVE
 import com.vitorpamplona.amethyst.ui.actions.NewChannelView
 import com.vitorpamplona.amethyst.ui.actions.NewMessageTagger
 import com.vitorpamplona.amethyst.ui.actions.NewPostViewModel
 import com.vitorpamplona.amethyst.ui.actions.PostButton
 import com.vitorpamplona.amethyst.ui.actions.ServersAvailable
 import com.vitorpamplona.amethyst.ui.actions.UploadFromGallery
+import com.vitorpamplona.amethyst.ui.components.RobohashAsyncImageProxy
 import com.vitorpamplona.amethyst.ui.components.ZoomableContentView
 import com.vitorpamplona.amethyst.ui.components.ZoomableUrlVideo
 import com.vitorpamplona.amethyst.ui.navigation.Route
@@ -514,6 +517,7 @@ fun ChannelHeader(
     channelHex: String,
     showVideo: Boolean,
     showBottomDiviser: Boolean,
+    showFlag: Boolean = true,
     modifier: Modifier = StdPadding,
     accountViewModel: AccountViewModel,
     nav: (String) -> Unit
@@ -533,6 +537,7 @@ fun ChannelHeader(
             it,
             showVideo,
             showBottomDiviser,
+            showFlag,
             modifier,
             accountViewModel,
             nav
@@ -545,6 +550,7 @@ fun ChannelHeader(
     baseChannel: Channel,
     showVideo: Boolean,
     showBottomDiviser: Boolean,
+    showFlag: Boolean = true,
     modifier: Modifier = StdPadding,
     accountViewModel: AccountViewModel,
     nav: (String) -> Unit
@@ -562,53 +568,59 @@ fun ChannelHeader(
         val channelState by baseChannel.live.observeAsState()
         val channel = remember(channelState) { channelState?.channel } ?: return
 
-        val streamingUrl by remember(channelState) {
-            derivedStateOf {
-                val activity = channel as? LiveActivitiesChannel
-                val description = activity?.info?.title()
-                val url = activity?.info?.streaming()
-                if (url != null) {
-                    ZoomableUrlVideo(url, description = description)
-                } else {
-                    null
+        if (showVideo) {
+            val streamingUrl by remember(channelState) {
+                derivedStateOf {
+                    val activity = channel as? LiveActivitiesChannel
+                    val description = activity?.info?.title()
+                    val url = activity?.info?.streaming()
+                    if (url != null) {
+                        ZoomableUrlVideo(url, description = description)
+                    } else {
+                        null
+                    }
+                }
+            }
+
+            streamingUrl?.let {
+                CheckIfUrlIsOnline(it.url) {
+                    Row(
+                        verticalAlignment = Alignment.CenterVertically,
+                        modifier = remember { Modifier.heightIn(max = 300.dp) }
+                    ) {
+                        ZoomableContentView(
+                            content = it
+                        )
+                    }
                 }
             }
         }
-
-        if (streamingUrl != null && showVideo) {
-            Row(verticalAlignment = Alignment.CenterVertically, modifier = remember { Modifier.heightIn(max = 300.dp) }) {
-                ZoomableContentView(
-                    content = streamingUrl!!
-                )
-            }
-        }
-
         Column(modifier = modifier) {
             Row(verticalAlignment = Alignment.CenterVertically) {
-                channel.creator?.let {
-                    UserPicture(
-                        user = it,
-                        size = Size35dp,
-                        accountViewModel = accountViewModel,
-                        nav = nav
-                    )
+                if (channel is LiveActivitiesChannel) {
+                    channel.creator?.let {
+                        UserPicture(
+                            user = it,
+                            size = Size35dp,
+                            accountViewModel = accountViewModel,
+                            nav = nav
+                        )
+                    }
+                } else {
+                    channel.profilePicture()?.let {
+                        RobohashAsyncImageProxy(
+                            robot = channel.idHex,
+                            model = it,
+                            contentDescription = stringResource(R.string.profile_image),
+                            contentScale = ContentScale.Crop,
+                            modifier = Modifier.padding(start = 10.dp)
+                                .width(Size35dp)
+                                .height(Size35dp)
+                                .clip(shape = CircleShape)
+                        )
+                    }
                 }
 
-                /*
-                channel.profilePicture()?.let {
-                    RobohashAsyncImageProxy(
-                        robot = channel.idHex,
-                        model = it,
-                        contentDescription = stringResource(R.string.profile_image),
-                        contentScale = ContentScale.Crop,
-                        modifier = Modifier.padding(start = 10.dp)
-                            .width(Size35dp)
-                            .height(Size35dp)
-                            .clip(shape = CircleShape)
-                    )
-                }
-                 */
-
                 Column(
                     modifier = Modifier
                         .padding(start = 10.dp)
@@ -633,7 +645,7 @@ fun ChannelHeader(
                             Text(
                                 text = summary,
                                 color = MaterialTheme.colors.placeholderText,
-                                maxLines = 2,
+                                maxLines = 1,
                                 overflow = TextOverflow.Ellipsis,
                                 fontSize = 12.sp
                             )
@@ -651,7 +663,7 @@ fun ChannelHeader(
                         ChannelActionOptions(channel, accountViewModel, nav)
                     }
                     if (channel is LiveActivitiesChannel) {
-                        LiveChannelActionOptions(channel, accountViewModel, nav)
+                        LiveChannelActionOptions(channel, showFlag, accountViewModel, nav)
                     }
                 }
             }
@@ -700,12 +712,13 @@ private fun ChannelActionOptions(
 @Composable
 private fun LiveChannelActionOptions(
     channel: LiveActivitiesChannel,
+    showFlag: Boolean = true,
     accountViewModel: AccountViewModel,
     nav: (String) -> Unit
 ) {
     val isLive by remember(channel) {
         derivedStateOf {
-            channel.info?.status() == "live"
+            channel.info?.status() == STATUS_LIVE
         }
     }
 
@@ -714,7 +727,7 @@ private fun LiveChannelActionOptions(
     }
 
     note?.let {
-        if (isLive) {
+        if (showFlag && isLive) {
             LiveFlag()
             Spacer(modifier = StdHorzSpacer)
         }
@@ -734,7 +747,7 @@ fun LiveFlag() {
         modifier = remember {
             Modifier
                 .clip(SmallBorder)
-                .drawBehind { drawRect(Color.Red) }
+                .background(Color.Red)
                 .padding(horizontal = 5.dp)
         }
     )
@@ -749,7 +762,7 @@ fun EndedFlag() {
         modifier = remember {
             Modifier
                 .clip(SmallBorder)
-                .drawBehind { drawRect(Color.Black) }
+                .background(Color.Black)
                 .padding(horizontal = 5.dp)
         }
     )
@@ -764,7 +777,7 @@ fun OfflineFlag() {
         modifier = remember {
             Modifier
                 .clip(SmallBorder)
-                .drawBehind { drawRect(Color.Black) }
+                .background(Color.Black)
                 .padding(horizontal = 5.dp)
         }
     )
@@ -779,7 +792,7 @@ fun ScheduledFlag() {
         modifier = remember {
             Modifier
                 .clip(SmallBorder)
-                .drawBehind { drawRect(Color.Black) }
+                .background(Color.Black)
                 .padding(horizontal = 5.dp)
         }
     )

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

@@ -0,0 +1,160 @@
+package com.vitorpamplona.amethyst.ui.screen.loggedIn
+
+import androidx.compose.animation.Crossfade
+import androidx.compose.animation.core.tween
+import androidx.compose.foundation.ExperimentalFoundationApi
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.LazyListState
+import androidx.compose.foundation.lazy.itemsIndexed
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.DisposableEffect
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.livedata.observeAsState
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalLifecycleOwner
+import androidx.compose.ui.unit.dp
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleEventObserver
+import androidx.lifecycle.viewmodel.compose.viewModel
+import com.vitorpamplona.amethyst.service.NostrDiscoveryDataSource
+import com.vitorpamplona.amethyst.ui.note.ChannelCardCompose
+import com.vitorpamplona.amethyst.ui.screen.FeedEmpty
+import com.vitorpamplona.amethyst.ui.screen.FeedError
+import com.vitorpamplona.amethyst.ui.screen.FeedState
+import com.vitorpamplona.amethyst.ui.screen.FeedViewModel
+import com.vitorpamplona.amethyst.ui.screen.LoadingFeed
+import com.vitorpamplona.amethyst.ui.screen.NostrDiscoverFeedViewModel
+import com.vitorpamplona.amethyst.ui.screen.RefresheableView
+import com.vitorpamplona.amethyst.ui.screen.SaveableFeedState
+import com.vitorpamplona.amethyst.ui.screen.ScrollStateKeys
+
+@Composable
+fun DiscoverScreen(
+    discoveryFeedViewModel: NostrDiscoverFeedViewModel,
+    accountViewModel: AccountViewModel,
+    nav: (String) -> Unit
+) {
+    val lifeCycleOwner = LocalLifecycleOwner.current
+
+    WatchAccountForDiscoveryScreen(discoveryViewModel = discoveryFeedViewModel, accountViewModel = accountViewModel)
+
+    DisposableEffect(accountViewModel) {
+        val observer = LifecycleEventObserver { _, event ->
+            if (event == Lifecycle.Event.ON_RESUME) {
+                println("Discovery Start")
+                NostrDiscoveryDataSource.start()
+            }
+            if (event == Lifecycle.Event.ON_PAUSE) {
+                println("Discovery Stop")
+                NostrDiscoveryDataSource.stop()
+            }
+        }
+
+        lifeCycleOwner.lifecycle.addObserver(observer)
+        onDispose {
+            lifeCycleOwner.lifecycle.removeObserver(observer)
+        }
+    }
+
+    Column(Modifier.fillMaxHeight()) {
+        Column(
+            modifier = Modifier.padding(vertical = 0.dp)
+        ) {
+            RefresheableView(discoveryFeedViewModel, true) {
+                SaveableFeedState(discoveryFeedViewModel, scrollStateKey = ScrollStateKeys.DISCOVER_SCREEN) { listState ->
+                    RenderDiscoverFeed(discoveryFeedViewModel, accountViewModel, listState, nav)
+                }
+            }
+        }
+    }
+}
+
+@Composable
+private fun RenderDiscoverFeed(
+    viewModel: FeedViewModel,
+    accountViewModel: AccountViewModel,
+    listState: LazyListState,
+    nav: (String) -> Unit
+) {
+    val feedState by viewModel.feedContent.collectAsState()
+
+    Crossfade(
+        targetState = feedState,
+        animationSpec = tween(durationMillis = 100)
+    ) { state ->
+        when (state) {
+            is FeedState.Empty -> {
+                FeedEmpty {
+                    viewModel.invalidateData()
+                }
+            }
+
+            is FeedState.FeedError -> {
+                FeedError(state.errorMessage) {
+                    viewModel.invalidateData()
+                }
+            }
+
+            is FeedState.Loaded -> {
+                DiscoverFeedLoaded(
+                    state,
+                    listState,
+                    accountViewModel,
+                    nav
+                )
+            }
+
+            is FeedState.Loading -> {
+                LoadingFeed()
+            }
+        }
+    }
+}
+
+@Composable
+fun WatchAccountForDiscoveryScreen(discoveryViewModel: NostrDiscoverFeedViewModel, accountViewModel: AccountViewModel) {
+    val accountState by accountViewModel.accountLiveData.observeAsState()
+
+    LaunchedEffect(accountViewModel, accountState?.account?.defaultDiscoveryFollowList) {
+        NostrDiscoveryDataSource.resetFilters()
+        discoveryViewModel.checkKeysInvalidateDataAndSendToTop()
+    }
+}
+
+@OptIn(ExperimentalFoundationApi::class)
+@Composable
+private fun DiscoverFeedLoaded(
+    state: FeedState.Loaded,
+    listState: LazyListState,
+    accountViewModel: AccountViewModel,
+    nav: (String) -> Unit
+) {
+    LazyColumn(
+        contentPadding = PaddingValues(
+            top = 10.dp,
+            bottom = 10.dp
+        ),
+        state = listState
+    ) {
+        itemsIndexed(state.feed.value, key = { _, item -> item.idHex }) { _, item ->
+            val defaultModifier = remember {
+                Modifier.padding(10.dp).animateItemPlacement()
+            }
+
+            ChannelCardCompose(
+                item,
+                modifier = defaultModifier,
+                accountViewModel = accountViewModel,
+                nav = nav
+            )
+        }
+    }
+}

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

@@ -1,5 +1,6 @@
 package com.vitorpamplona.amethyst.ui.screen.loggedIn
 
+import android.widget.Toast
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
@@ -19,12 +20,14 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalLifecycleOwner
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleEventObserver
 import androidx.lifecycle.viewmodel.compose.viewModel
+import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.service.NostrHashtagDataSource
 import com.vitorpamplona.amethyst.ui.dal.HashtagFeedFilter
 import com.vitorpamplona.amethyst.ui.screen.NostrHashtagFeedViewModel
@@ -126,7 +129,8 @@ private fun HashtagActionOptions(
     tag: String,
     accountViewModel: AccountViewModel
 ) {
-    val coroutineScope = rememberCoroutineScope()
+    val scope = rememberCoroutineScope()
+    val context = LocalContext.current
 
     val userState by accountViewModel.userProfile().live().follows.observeAsState()
     val isFollowingTag by remember(userState) {
@@ -136,8 +140,40 @@ private fun HashtagActionOptions(
     }
 
     if (isFollowingTag) {
-        UnfollowButton { coroutineScope.launch(Dispatchers.IO) { accountViewModel.account.unfollow(tag) } }
+        UnfollowButton {
+            if (!accountViewModel.isWriteable()) {
+                scope.launch {
+                    Toast
+                        .makeText(
+                            context,
+                            context.getString(R.string.login_with_a_private_key_to_be_able_to_unfollow),
+                            Toast.LENGTH_SHORT
+                        )
+                        .show()
+                }
+            } else {
+                scope.launch(Dispatchers.IO) {
+                    accountViewModel.account.unfollow(tag)
+                }
+            }
+        }
     } else {
-        FollowButton({ coroutineScope.launch(Dispatchers.IO) { accountViewModel.account.follow(tag) } })
+        FollowButton {
+            if (!accountViewModel.isWriteable()) {
+                scope.launch {
+                    Toast
+                        .makeText(
+                            context,
+                            context.getString(R.string.login_with_a_private_key_to_be_able_to_follow),
+                            Toast.LENGTH_SHORT
+                        )
+                        .show()
+                }
+            } else {
+                scope.launch(Dispatchers.IO) {
+                    accountViewModel.account.follow(tag)
+                }
+            }
+        }
     }
 }

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

@@ -33,6 +33,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleEventObserver
+import androidx.lifecycle.map
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.service.NostrHomeDataSource
@@ -211,12 +212,22 @@ private fun FeedLoaded(
 
 @Composable
 fun CheckIfLiveActivityIsOnline(note: Note, whenOnline: @Composable () -> Unit) {
-    val noteState by note.live().metadata.observeAsState()
+    val url by note.live().metadata.map {
+        (note.event as? LiveActivitiesEvent)?.streaming()
+    }.observeAsState()
+
+    url?.let {
+        CheckIfUrlIsOnline(it, whenOnline)
+    }
+}
+
+@Composable
+fun CheckIfUrlIsOnline(url: String, whenOnline: @Composable () -> Unit) {
     var online by remember { mutableStateOf(false) }
 
-    LaunchedEffect(key1 = noteState) {
+    LaunchedEffect(key1 = url) {
         launch(Dispatchers.IO) {
-            online = OnlineChecker.isOnline((note.event as? LiveActivitiesEvent)?.streaming())
+            online = OnlineChecker.isOnline(url)
         }
     }
 

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

@@ -38,13 +38,12 @@ import com.vitorpamplona.amethyst.ui.navigation.AppNavigation
 import com.vitorpamplona.amethyst.ui.navigation.AppTopBar
 import com.vitorpamplona.amethyst.ui.navigation.DrawerContent
 import com.vitorpamplona.amethyst.ui.navigation.Route
-import com.vitorpamplona.amethyst.ui.navigation.currentRoute
 import com.vitorpamplona.amethyst.ui.note.UserReactionsViewModel
 import com.vitorpamplona.amethyst.ui.screen.AccountState
 import com.vitorpamplona.amethyst.ui.screen.AccountStateViewModel
 import com.vitorpamplona.amethyst.ui.screen.NostrChatroomListKnownFeedViewModel
 import com.vitorpamplona.amethyst.ui.screen.NostrChatroomListNewFeedViewModel
-import com.vitorpamplona.amethyst.ui.screen.NostrGlobalFeedViewModel
+import com.vitorpamplona.amethyst.ui.screen.NostrDiscoverFeedViewModel
 import com.vitorpamplona.amethyst.ui.screen.NostrHomeFeedLiveActivitiesViewModel
 import com.vitorpamplona.amethyst.ui.screen.NostrHomeFeedViewModel
 import com.vitorpamplona.amethyst.ui.screen.NostrHomeRepliesFeedViewModel
@@ -95,16 +94,16 @@ fun MainScreen(accountViewModel: AccountViewModel, accountStateViewModel: Accoun
         factory = NostrHomeFeedLiveActivitiesViewModel.Factory(accountViewModel.account)
     )
 
-    val searchFeedViewModel: NostrGlobalFeedViewModel = viewModel(
-        key = accountViewModel.userProfile().pubkeyHex + "NostrGlobalFeedViewModel",
-        factory = NostrGlobalFeedViewModel.Factory(accountViewModel.account)
-    )
-
     val videoFeedViewModel: NostrVideoFeedViewModel = viewModel(
         key = accountViewModel.userProfile().pubkeyHex + "NostrVideoFeedViewModel",
         factory = NostrVideoFeedViewModel.Factory(accountViewModel.account)
     )
 
+    val discoveryFeedViewModel: NostrDiscoverFeedViewModel = viewModel(
+        key = accountViewModel.userProfile().pubkeyHex + "NostrDiscoveryFeedViewModel",
+        factory = NostrDiscoverFeedViewModel.Factory(accountViewModel.account)
+    )
+
     val notifFeedViewModel: NotificationViewModel = viewModel(
         key = accountViewModel.userProfile().pubkeyHex + "NotificationViewModel",
         factory = NotificationViewModel.Factory(accountViewModel.account)
@@ -140,12 +139,12 @@ fun MainScreen(accountViewModel: AccountViewModel, accountStateViewModel: Accoun
                         homeFeedViewModel.sendToTop()
                         repliesFeedViewModel.sendToTop()
                     }
-                    Route.Search.base -> {
-                        searchFeedViewModel.sendToTop()
-                    }
                     Route.Video.base -> {
                         videoFeedViewModel.sendToTop()
                     }
+                    Route.Discover.base -> {
+                        discoveryFeedViewModel.sendToTop()
+                    }
                     Route.Notification.base -> {
                         notifFeedViewModel.invalidateDataAndSendToTop()
                     }
@@ -193,8 +192,8 @@ fun MainScreen(accountViewModel: AccountViewModel, accountStateViewModel: Accoun
                     liveActivitiesViewModel,
                     knownFeedViewModel,
                     newFeedViewModel,
-                    searchFeedViewModel,
                     videoFeedViewModel,
+                    discoveryFeedViewModel,
                     notifFeedViewModel,
                     userReactionsStatsModel,
                     navController,

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

@@ -25,7 +25,6 @@ import androidx.compose.runtime.livedata.observeAsState
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
-import androidx.compose.ui.draw.drawBehind
 import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.input.nestedscroll.NestedScrollConnection
@@ -384,7 +383,7 @@ private fun RenderScreen(
             CreateAndRenderTabs(baseUser, pagerState)
         }
         HorizontalPager(
-            pageCount = 8,
+            pageCount = 9,
             state = pagerState,
             modifier = pagerModifier
         ) { page ->
@@ -699,6 +698,7 @@ private fun ProfileActions(
     accountViewModel: AccountViewModel
 ) {
     val scope = rememberCoroutineScope()
+    val context = LocalContext.current
 
     val accountLocalUserState by accountViewModel.accountLiveData.observeAsState()
     val account = remember(accountLocalUserState) { accountLocalUserState?.account } ?: return
@@ -735,18 +735,60 @@ private fun ProfileActions(
             account.showUser(baseUser.pubkeyHex)
         }
     } else if (isLoggedInFollowingUser) {
-        UnfollowButton { scope.launch(Dispatchers.IO) { account.unfollow(baseUser) } }
+        UnfollowButton {
+            if (!accountViewModel.isWriteable()) {
+                scope.launch {
+                    Toast
+                        .makeText(
+                            context,
+                            context.getString(R.string.login_with_a_private_key_to_be_able_to_unfollow),
+                            Toast.LENGTH_SHORT
+                        )
+                        .show()
+                }
+            } else {
+                scope.launch(Dispatchers.IO) {
+                    account.unfollow(baseUser)
+                }
+            }
+        }
     } else {
         if (isUserFollowingLoggedIn) {
-            FollowButton(
-                { scope.launch(Dispatchers.IO) { account.follow(baseUser) } },
-                R.string.follow_back
-            )
+            FollowButton(R.string.follow_back) {
+                if (!accountViewModel.isWriteable()) {
+                    scope.launch {
+                        Toast
+                            .makeText(
+                                context,
+                                context.getString(R.string.login_with_a_private_key_to_be_able_to_follow),
+                                Toast.LENGTH_SHORT
+                            )
+                            .show()
+                    }
+                } else {
+                    scope.launch(Dispatchers.IO) {
+                        account.follow(baseUser)
+                    }
+                }
+            }
         } else {
-            FollowButton(
-                { scope.launch(Dispatchers.IO) { account.follow(baseUser) } },
-                R.string.follow
-            )
+            FollowButton(R.string.follow) {
+                if (!accountViewModel.isWriteable()) {
+                    scope.launch {
+                        Toast
+                            .makeText(
+                                context,
+                                context.getString(R.string.login_with_a_private_key_to_be_able_to_follow),
+                                Toast.LENGTH_SHORT
+                            )
+                            .show()
+                    }
+                } else {
+                    scope.launch(Dispatchers.IO) {
+                        account.follow(baseUser)
+                    }
+                }
+            }
         }
     }
 }
@@ -1189,7 +1231,7 @@ private fun WatchAndRenderBadgeImage(
                 pictureModifier
                     .width(size)
                     .height(size)
-                    .drawBehind { drawRect(bgColor) }
+                    .background(bgColor)
             }
         )
     } else {
@@ -1202,7 +1244,7 @@ private fun WatchAndRenderBadgeImage(
                     .width(size)
                     .height(size)
                     .clip(shape = CircleShape)
-                    .drawBehind { drawRect(bgColor) }
+                    .background(bgColor)
                     .run {
                         if (onClick != null) {
                             this.clickable(onClick = { onClick(eventId) })
@@ -1540,7 +1582,7 @@ fun UnfollowButton(onClick: () -> Unit) {
 }
 
 @Composable
-fun FollowButton(onClick: () -> Unit, text: Int = R.string.follow) {
+fun FollowButton(text: Int = R.string.follow, onClick: () -> Unit) {
     Button(
         modifier = Modifier.padding(start = 3.dp),
         onClick = onClick,

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

@@ -7,6 +7,7 @@ import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.defaultMinSize
 import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
@@ -56,7 +57,6 @@ import com.vitorpamplona.amethyst.model.Channel
 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.model.User
-import com.vitorpamplona.amethyst.service.NostrGlobalDataSource
 import com.vitorpamplona.amethyst.service.NostrSearchEventOrUserDataSource
 import com.vitorpamplona.amethyst.service.checkNotInMainThread
 import com.vitorpamplona.amethyst.ui.components.BundledUpdate
@@ -66,9 +66,6 @@ import com.vitorpamplona.amethyst.ui.note.ClickableUserPicture
 import com.vitorpamplona.amethyst.ui.note.NoteCompose
 import com.vitorpamplona.amethyst.ui.note.UserCompose
 import com.vitorpamplona.amethyst.ui.note.UsernameDisplay
-import com.vitorpamplona.amethyst.ui.screen.NostrGlobalFeedViewModel
-import com.vitorpamplona.amethyst.ui.screen.RefresheableFeedView
-import com.vitorpamplona.amethyst.ui.screen.ScrollStateKeys
 import com.vitorpamplona.amethyst.ui.theme.placeholderText
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.FlowPreview
@@ -86,7 +83,6 @@ import kotlinx.coroutines.channels.Channel as CoroutineChannel
 
 @Composable
 fun SearchScreen(
-    searchFeedViewModel: NostrGlobalFeedViewModel,
     accountViewModel: AccountViewModel,
     nav: (String) -> Unit
 ) {
@@ -97,33 +93,29 @@ fun SearchScreen(
         )
     )
 
-    SearchScreen(searchFeedViewModel, searchBarViewModel, accountViewModel, nav)
+    SearchScreen(searchBarViewModel, accountViewModel, nav)
 }
 
 @Composable
 fun SearchScreen(
-    searchFeedViewModel: NostrGlobalFeedViewModel,
     searchBarViewModel: SearchBarViewModel,
     accountViewModel: AccountViewModel,
     nav: (String) -> Unit
 ) {
     val lifeCycleOwner = LocalLifecycleOwner.current
 
-    WatchAccountForSearchScreen(searchFeedViewModel, accountViewModel)
+    WatchAccountForSearchScreen(accountViewModel)
 
     DisposableEffect(accountViewModel) {
         val observer = LifecycleEventObserver { _, event ->
             if (event == Lifecycle.Event.ON_RESUME) {
-                println("Global Start")
-                NostrGlobalDataSource.start()
+                println("Search Start")
                 NostrSearchEventOrUserDataSource.start()
-                searchFeedViewModel.invalidateData()
             }
             if (event == Lifecycle.Event.ON_PAUSE) {
-                println("Global Stop")
+                println("Search Stop")
                 NostrSearchEventOrUserDataSource.clear()
                 NostrSearchEventOrUserDataSource.stop()
-                NostrGlobalDataSource.stop()
             }
         }
 
@@ -133,29 +125,19 @@ fun SearchScreen(
         }
     }
 
-    Column(Modifier.fillMaxHeight()) {
-        Column(
-            modifier = Modifier.padding(vertical = 0.dp)
-        ) {
-            SearchBar(searchBarViewModel, accountViewModel, nav)
-            RefresheableFeedView(
-                searchFeedViewModel,
-                null,
-                scrollStateKey = ScrollStateKeys.GLOBAL_SCREEN,
-                accountViewModel = accountViewModel,
-                nav = nav
-            )
-        }
+    val listState = rememberLazyListState()
+
+    Column(Modifier.fillMaxSize()) {
+        SearchBar(searchBarViewModel, listState)
+        DisplaySearchResults(searchBarViewModel, listState, nav, accountViewModel)
     }
 }
 
 @Composable
-fun WatchAccountForSearchScreen(searchFeedViewModel: NostrGlobalFeedViewModel, accountViewModel: AccountViewModel) {
+fun WatchAccountForSearchScreen(accountViewModel: AccountViewModel) {
     LaunchedEffect(accountViewModel) {
         launch(Dispatchers.IO) {
-            NostrGlobalDataSource.resetFilters()
             NostrSearchEventOrUserDataSource.start()
-            searchFeedViewModel.invalidateData(true)
         }
     }
 }
@@ -228,11 +210,9 @@ class SearchBarViewModel(val account: Account) : ViewModel() {
 @Composable
 private fun SearchBar(
     searchBarViewModel: SearchBarViewModel,
-    accountViewModel: AccountViewModel,
-    nav: (String) -> Unit
+    listState: LazyListState
 ) {
     val scope = rememberCoroutineScope()
-    val listState = rememberLazyListState()
 
     // Create a channel for processing search queries.
     val searchTextChanges = remember {
@@ -283,8 +263,6 @@ private fun SearchBar(
             searchTextChanges.trySend(it)
         }
     }
-
-    DisplaySearchResults(listState, searchBarViewModel, nav, accountViewModel)
 }
 
 @Composable
@@ -352,8 +330,8 @@ private fun SearchTextField(
 
 @Composable
 private fun DisplaySearchResults(
-    listState: LazyListState,
     searchBarViewModel: SearchBarViewModel,
+    listState: LazyListState,
     nav: (String) -> Unit,
     accountViewModel: AccountViewModel
 ) {

app/src/main/java/com/vitorpamplona/amethyst/ui/theme/Shape.kt

@@ -51,6 +51,7 @@ val Size17dp = 17.dp
 val Size18dp = 18.dp
 val Size19dp = 19.dp
 val Size20dp = 20.dp
+val Size22dp = 22.dp
 val Size24dp = 24.dp
 val Size25dp = 25.dp
 val Size30dp = 30.dp

app/src/main/java/com/vitorpamplona/amethyst/ui/theme/Theme.kt

@@ -1,6 +1,7 @@
 package com.vitorpamplona.amethyst.ui.theme
 
 import android.app.Activity
+import androidx.compose.foundation.background
 import androidx.compose.foundation.border
 import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.foundation.layout.fillMaxWidth
@@ -15,7 +16,6 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.SideEffect
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
-import androidx.compose.ui.draw.drawBehind
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.ColorFilter
 import androidx.compose.ui.graphics.compositeOver
@@ -123,12 +123,10 @@ val LightImageModifier = Modifier
 val DarkProfile35dpModifier = Modifier
     .size(Size35dp)
     .clip(shape = CircleShape)
-    .drawBehind { drawRect(DarkColorPalette.background) }
 
 val LightProfile35dpModifier = Modifier
     .fillMaxWidth()
     .clip(shape = CircleShape)
-    .drawBehind { drawRect(LightColorPalette.background) }
 
 val DarkReplyBorderModifier = Modifier
     .padding(top = 5.dp)
@@ -189,9 +187,7 @@ val MarkDownStyleOnDark = RichTextDefaults.copy(
                 DarkSubtleBorder,
                 QuoteBorder
             )
-            .drawBehind {
-                drawRect(DarkColorPalette.onSurface.copy(alpha = 0.05f))
-            }
+            .background(DarkColorPalette.onSurface.copy(alpha = 0.05f))
     ),
     stringStyle = RichTextDefaults.stringStyle?.copy(
         linkStyle = SpanStyle(
@@ -222,9 +218,7 @@ val MarkDownStyleOnLight = RichTextDefaults.copy(
                 LightSubtleBorder,
                 QuoteBorder
             )
-            .drawBehind {
-                drawRect(LightColorPalette.onSurface.copy(alpha = 0.05f))
-            }
+            .background(DarkColorPalette.onSurface.copy(alpha = 0.05f))
     ),
     stringStyle = RichTextDefaults.stringStyle?.copy(
         linkStyle = SpanStyle(

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

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+  <path
+      android:fillColor="#9c9c9c"
+      android:pathData="M142.11,817.89Q77.63,753.42 40.02,666.86 2.41,580.29 2.41,480q0,-100.29 37.61,-186.86 37.61,-86.56 102.08,-151.04l51.34,51.34q-54.92,54.92 -87.16,128.35 -32.24,73.43 -32.24,158.2 0,84.77 31.64,157.6 31.64,72.83 87.76,128.95zM277.03,682.97q-38.21,-38.21 -60.89,-90.14 -22.69,-51.94 -22.69,-112.83 0,-60.89 22.69,-112.83 22.69,-51.94 60.89,-90.14l51.34,51.34q-28.66,28.66 -45.97,67.46 -17.31,38.8 -17.31,84.17 0,45.37 16.72,83.58 16.72,38.21 46.56,68.06zM480,575.52q-39.4,0 -67.46,-28.06 -28.06,-28.06 -28.06,-67.46 0,-39.4 28.06,-67.46 28.06,-28.06 67.46,-28.06 39.4,0 67.46,28.06 28.06,28.06 28.06,67.46 0,39.4 -28.06,67.46 -28.06,28.06 -67.46,28.06zM682.97,682.97 L631.63,631.63q28.66,-28.66 45.97,-67.46 17.31,-38.8 17.31,-84.17 0,-45.37 -16.72,-83.58 -16.72,-38.21 -46.56,-68.06l51.34,-51.34q38.21,38.21 60.89,90.14 22.69,51.94 22.69,112.83 0,59.7 -22.69,111.64 -22.69,51.94 -60.89,91.34zM817.89,817.89 L766.55,766.55q54.92,-54.92 87.16,-128.35 32.24,-73.43 32.24,-158.2 0,-84.77 -31.64,-157.6 -31.64,-72.83 -87.76,-128.95l51.34,-51.34q64.47,65.67 102.08,152.23 37.61,86.56 37.61,185.66 0,99.1 -37.61,185.66 -37.61,86.56 -102.08,152.23z"
+      android:strokeWidth="1.19396"/>
+</vector>

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

@@ -23,7 +23,7 @@
     <string name="copy_note_id">குறிப்பின் IDஐ நகலெடுக்கவும்</string>
     <string name="broadcast">ஒளிபரப்பு</string>
     <string name="request_deletion">நீக்குவதற்கு கோரிக்கை செய்</string>
-    <string name="block_hide_user">பயனரை முடக்கு + மறை</string>
+    <string name="block_hide_user">யூஸரை முடக்கு + மறை</string>
     <string name="report_spam_scam">ஸ்பேம் / மோசடி என்று புகாரளிக்கவும்</string>
     <string name="report_impersonation">ஆள்மாறாட்டத்தைப் புகாரளிக்கவும்</string>
     <string name="report_explicit_content">வெளிப்படையான உள்ளடக்கத்தைப் புகாரளிக்கவும்</string>
@@ -83,8 +83,8 @@
     <string name="add_a_relay">ஒரு ரிலேவை சேர்</string>
     <string name="display_name">காட்சிப் பெயர்</string>
     <string name="my_display_name">எனது காட்சிப் பெயர்</string>
-    <string name="username">பயனர் பெயர்</string>
-    <string name="my_username">எனது பயனர் பெயர்</string>
+    <string name="username">யூஸர் பெயர்</string>
+    <string name="my_username">எனது யூஸர் பெயர்</string>
     <string name="about_me">என்னைப் பற்றி</string>
     <string name="avatar_url">சுயவிவரப் படம் URL</string>
     <string name="banner_url">பேனர் URL</string>
@@ -95,7 +95,7 @@
     <string name="failed_to_save_the_image">படத்தை சேமிப்பது தோல்வியடைந்தது</string>
     <string name="upload_image">படத்தை பதிவேற்று</string>
     <string name="uploading">பதிவேற்றம்...</string>
-    <string name="user_does_not_have_a_lightning_address_setup_to_receive_sats">பயனர் ஸாட்கள் பெறுவதற்கு லைட்னிங் முகவரி அமைக்கவில்லை</string>
+    <string name="user_does_not_have_a_lightning_address_setup_to_receive_sats">யூஸர் ஸாட்கள் பெறுவதற்கு லைட்னிங் முகவரி அமைக்கவில்லை</string>
     <string name="reply_here">"இங்கு பதிலளிக்கவும்.. "</string>
     <string name="copies_the_note_id_to_the_clipboard_for_sharing">குறிப்பு ID ஐ கிளிப்போர்டில் பிரதி எடுக்கும்</string>
     <string name="copy_channel_id_note_to_the_clipboard">அலைவரிசை ID ஐ கிளிப்போர்டில் பிரதி எடு</string>
@@ -103,7 +103,7 @@
     <string name="join">சேர்</string>
     <string name="known">தெரிந்த</string>
     <string name="new_requests">புதிய கோரிக்கைகள்</string>
-    <string name="blocked_users">முடக்கப்பட்ட பயனர்கள்</string>
+    <string name="blocked_users">முடக்கப்பட்ட யூஸர்கள்</string>
     <string name="new_threads">புதிய நூல்கள்</string>
     <string name="conversations">உரையாடல்கள்</string>
     <string name="notes">குறிப்புகள்</string>
@@ -119,13 +119,13 @@
     <string name="copies_the_public_key_to_the_clipboard_for_sharing">பகிர்வுக்காக கிளிப்போர்டுக்கு பொதுசாவியை நகலெடுக்கிறது</string>
     <string name="copy_public_key_npub_to_the_clipboard">கிளிப்போர்டுக்கு பொதுசாவியை (NPUB) நகலெடுக்கவும்</string>
     <string name="send_a_direct_message">நேரடி செய்தியை அனுப்பவும்</string>
-    <string name="edits_the_user_s_metadata">பயனரின்தகவலை திருத்துகிறது</string>
+    <string name="edits_the_user_s_metadata">யூஸரின்தகவலை திருத்துகிறது</string>
     <string name="follow">பின்தொடர்</string>
     <string name="follow_back">பதிலுக்கு பின்தொடரவும்</string>
     <string name="unblock">தடையை நீக்கு</string>
-    <string name="copy_user_id">பயனர் IDயை நகலெடுக்கவும்</string>
-    <string name="unblock_user">பயனரைத் தடைசெய்க</string>
-    <string name="npub_hex_username">"npub, hex, பயனர்பெயர் "</string>
+    <string name="copy_user_id">யூஸர் IDயை நகலெடுக்கவும்</string>
+    <string name="unblock_user">யூஸர் தடையை நீக்கு</string>
+    <string name="npub_hex_username">"npub, hex, யூஸர்பெயர் "</string>
     <string name="clear">அழி</string>
     <string name="app_logo">பயன்பாட்டு லோகோ</string>
     <string name="nsec_npub_hex_private_key">nsec / npub / hex தனிப்பட்ட சாவி</string>
@@ -226,8 +226,8 @@
     <string name="report_dialog_impersonation">தீங்கிழைக்கும் ஆள்மாறாட்டம்</string>
     <string name="report_dialog_nudity">நிர்வாணம் அல்லது கிராஃபிக் உள்ளடக்கம்</string>
     <string name="report_dialog_illegal">சட்டவிரோத நடத்தை</string>
-    <string name="report_dialog_blocking_a_user">ஒரு பயனரைத் தடுப்பது உங்கள் பயன்பாட்டில் அவர்களின் உள்ளடக்கத்தை மறைக்கும். நீங்கள் தடுக்கும் நபர்கள் உட்பட உங்கள் குறிப்புகள் இன்னும் பகிரங்கமாகக் காணப்படுகின்றன. தடுக்கப்பட்ட பயனர்கள் பாதுகாப்பு வடிப்பான்கள் திரையில் பட்டியலிடப்பட்டுள்ளனர்.</string>
-    <string name="report_dialog_block_hide_user_btn">பயனரைத் தடுத்து மறைக்கவும்</string>
+    <string name="report_dialog_blocking_a_user">ஒரு யூஸரைத் தடுப்பது உங்கள் பயன்பாட்டில் அவர்களின் உள்ளடக்கத்தை மறைக்கும். நீங்கள் தடுக்கும் நபர்கள் உட்பட உங்கள் குறிப்புகள் இன்னும் பகிரங்கமாகக் காணப்படுகின்றன. தடுக்கப்பட்ட யூஸர்கள் பாதுகாப்பு வடிப்பான்கள் திரையில் பட்டியலிடப்பட்டுள்ளனர்.</string>
+    <string name="report_dialog_block_hide_user_btn">யூஸரைத் தடுத்து மறைக்கவும்</string>
     <string name="report_dialog_report_btn">தகாதது என பதிவுசெய்</string>
     <string name="report_dialog_reminder_public">இடுகையிடப்பட்ட அனைத்து அறிக்கைகளும் பகிரங்கமாக தெரியும்.</string>
     <string name="report_dialog_additional_reason_placeholder">உங்கள் அறிக்கையைப் பற்றிய கூடுதல் சூழலை விருப்பமாக வழங்கவும்…</string>
@@ -267,7 +267,7 @@
     <string name="poll_closing_time_days">நாட்களில்</string>
     <string name="poll_is_closed">புதிய வாக்குகளுக்கு வாக்கெடுப்பு மூடப்பட்டுள்ளது</string>
     <string name="poll_zap_amount">ஜாப் தொகை</string>
-    <string name="one_vote_per_user_on_atomic_votes">இந்த வகை வாக்கெடுப்பில் ஒரு பயனருக்கு ஒரு வாக்கு மட்டுமே அனுமதிக்கப்படுகிறது</string>
+    <string name="one_vote_per_user_on_atomic_votes">இந்த வகை வாக்கெடுப்பில் ஒரு யூஸருக்கு ஒரு வாக்கு மட்டுமே அனுமதிக்கப்படுகிறது</string>
     <string name="looking_for_event">"நிகழ்வு %1$s ஐத் தேடி"</string>
     <string name="custom_zaps_add_a_message">ஒரு பொது செய்தியைச் சேர்க்கவும்</string>
     <string name="custom_zaps_add_a_message_private">ஒரு தனிப்பட்ட செய்தியைச் சேர்க்கவும்</string>
@@ -283,4 +283,163 @@
     <string name="add_content">உருவாக்கி சேர்க்கவும்</string>
     <string name="content_description">உள்ளடக்கங்களின் விளக்கம்</string>
     <string name="content_description_example">சூரியன் மறையும் வேளையில் வெள்ளை மண் நிறைந்த கடற்கரையில் ஒரு நீலப் படகு</string>
+    <string name="zap_type">ஜாப் டைப்</string>
+	<string name="zap_type_explainer">அனைத்து வகைகளுக்கான ஜாப் டைப்</string>
+
+	<string name="zap_type_public">பொது</string>
+	<string name="zap_type_public_explainer">அனைவரும் ஜாப் பரிவர்த்தனையையும் செய்தியையும் பார்க்கமுடியும்</string>
+
+	<string name="zap_type_private">தனிப்பட்ட</string>
+	<string name="zap_type_private_explainer">பெறுபவரும் அனுப்புபவரும் மட்டும் ஒருவரை ஒருவர் மற்றும் ஜாப் செய்தியை பார்க்கமுடியும்</string>
+
+	<string name="zap_type_anonymous">பெயர் ரகசியமாக</string>
+	<string name="zap_type_anonymous_explainer">பெறுபவருக்கும் மற்றவருக்கும் ஜாப் அனுப்புபவர் யார் என்று தெரியாது</string>
+
+	<string name="zap_type_nonzap">அல்லாத-ஜாப்</string>
+	<string name="zap_type_nonzap_explainer">நாஸ்டரில் எந்த சுவடும் இன்றி, லைட்நிங்கில் மட்டும் உள்ளது</string>
+
+
+	<string name="file_server">ஃபைல் சர்வர்</string>
+	<string name="zap_forward_lnAddress">LN முகவரி அல்லது @யூஸர்</string>
+
+	<string name="upload_server_imgur">imgur.com - நம்பகமானது</string>
+	<string name="upload_server_imgur_explainer">imgur ஃபைலை மாற்றமுடியும்</string>
+
+	<string name="upload_server_nostrimg">nostrimg.com - நம்பகமானது</string>
+	<string name="upload_server_nostrimg_explainer">NostrImg ஃபைலை மாற்றமுடியும்</string>
+
+	<string name="upload_server_nostrbuild">nostr.build - நம்பகமானது</string>
+	<string name="upload_server_nostrbuild_explainer">nostr.build ஃபைலை மாற்றமுடியும்</string>
+
+	<string name="upload_server_nostrfilesdev">nostrfiles.dev - நம்பகமானது</string>
+	<string name="upload_server_nostrfilesdev_explainer">nostrfiles.dev ஃபைலை மாற்றமுடியும்</string>
+
+	<string name="upload_server_nostrcheckme">nostrcheck.me - நம்பகமானது</string>
+	<string name="upload_server_nostrcheckme_explainer">nostrcheck.me ஃபைலை மாற்றமுடியும்</string>
+
+
+	<string name="upload_server_imgur_nip94">சரிபார்க்கக்கூடிய Imgur (NIP-94)</string>
+	<string name="upload_server_imgur_nip94_explainer">Imgur ஃபைலை மாற்றியிருக்கிறதா என்று சரிபார்க்கப்படும். புதிய NIP: பிற கிளயண்ட்டுகளில் இதை பார்க்க முடியாமல் இருக்கலாம்.</string>
+
+	<string name="upload_server_nostrimg_nip94">சரிபார்க்கக்கூடிய NostrImg (NIP-94)</string>
+	<string name="upload_server_nostrimg_nip94_explainer">NostrImg ஃபைலை மாற்றியிருக்கிறதா என்று சரிபார்க்கப்படும். புதிய NIP: பிற கிளயண்ட்டுகளில் இதை பார்க்க முடியாமல் இருக்கலாம்.</string>
+
+	<string name="upload_server_nostrbuild_nip94">சரிபார்க்கக்கூடிய Nostr.build (NIP-94)</string>
+	<string name="upload_server_nostrbuild_nip94_explainer">Nostr.build ஃபைலை மாற்றியிருக்கிறதா என்று சரிபார்க்கப்படும். புதிய NIP: பிற கிளயண்ட்டுகளில் இதை பார்க்க முடியாமல் இருக்கலாம்.</string>
+
+	<string name="upload_server_nostrfilesdev_nip94">சரிபார்க்கக்கூடிய Nostrfiles.dev (NIP-94)</string>
+	<string name="upload_server_nostrfilesdev_nip94_explainer">Nostrfiles.dev ஃபைலை மாற்றியிருக்கிறதா என்று சரிபார்க்கப்படும். புதிய NIP: பிற கிளயண்ட்டுகளில் இதை பார்க்க முடியாமல் இருக்கலாம்.</string>
+
+	<string name="upload_server_nostrcheckme_nip94">சரிபார்க்கக்கூடிய Nostrcheck.me (NIP-94)</string>
+	<string name="upload_server_nostrcheckme_nip94_explainer">Nostrcheck.me ஃபைலை மாற்றியிருக்கிறதா என்று சரிபார்க்கப்படும். புதிய NIP: பிற கிளயண்ட்டுகளில் இதை பார்க்க முடியாமல் இருக்கலாம்.</string>
+
+
+
+
+	<string name="upload_server_relays_nip95">உங்கள் ரிலே (NIP-95)</string>
+	<string name="upload_server_relays_nip95_explainer">ஃபைல்ஸ் உங்கள் ரிலேக்களில் ஹோஸ்ட் செய்யப்படும். புதிய NIP: ரிலேயில் இச்சேவை உள்ளதா என சரிபார்க்கவும்</string>
+
+	<string name="connect_via_tor_short">Tor/Orbot அமைப்பு முறை</string>
+	<string name="connect_via_tor">Orbot அமைப்பு மூலம் இணைக்கவும்</string>
+
+	<string name="do_you_really_want_to_disable_tor_title">Tor/Orbot இணைப்பை துண்டிக்கவும்?</string>
+	<string name="do_you_really_want_to_disable_tor_text">உங்கள் டேட்டா உடனே வழக்கமான நெட்வொர்க்கிற்கு மாற்றப்படும்</string>
+	<string name="yes">ஆம்</string>
+	<string name="no">இல்லை</string>
+
+
+	<string name="follow_list_selection">பின்பற்றப் படுவோர் பட்டியல்</string>
+	<string name="follow_list_kind3follows">எல்லா பின்பற்றப் படுவோர்</string>
+	<string name="follow_list_global">முழுதளாவிய</string>
+	<string name="connect_through_your_orbot_setup_markdown">
+	## Tor மூலம் Orbot உடன் இணைக்க
+	\n\n1. [Orbot](https://play.google.com/store/apps/details?id=org.torproject.android) இன்ஸ்டால் செய்க 
+	\n2. Orbot-ஐ தொடங்குங்கள் 
+	\n3. Orbot-இல் Socks போர்ட்டை செக் செய்க. இயல்புநிலையில் அது 9050
+	\n4. வேண்டுமானால் Orbot-இல் போர்ட்டை மாற்றுங்கள் 
+	\n5. இந்த திரையில் Socks போர்டை கட்டமைக்க 
+	\n6. ஆக்டிவேட் பொத்தானை அழுத்தி Orbot-ஐ proxy-ஆக பயன்படுத்துங்கள் 
+	</string>
+	<string name="orbot_socks_port">Orbot Socks போர்ட்</string>
+	<string name="invalid_port_number">செல்லாத போர்ட் நம்பர்</string>
+	<string name="use_orbot">Orbot-ஐ பயன்படுத்துங்கள்</string>
+	<string name="disconnect_from_your_orbot_setup">Orbot இணைப்பது துண்டிக்க</string>
+
+	<string name="app_notification_dms_channel_name">தனிப்பட்ட செய்திகள்</string>
+	<string name="app_notification_dms_channel_description">தனிப்பட்ட செய்தி வருகையில் தெரிவிக்கவும்</string>
+
+	<string name="app_notification_zaps_channel_name">ஜாப் பெறப்பட்டது</string>
+	<string name="app_notification_zaps_channel_description">யாரேனும் உங்களுக்கு ஜாப் அனுப்பும்போது தெரிவிக்கவும்</string>
+	<string name="app_notification_zaps_channel_message">%1$s ஸாட்ஸ்</string>
+	<string name="app_notification_zaps_channel_message_from">%1$s -இடமிருந்து</string>
+	<string name="app_notification_zaps_channel_message_for">%1$s -க்கு</string>
+
+	<string name="reply_notify">தெரிவிக்க</string>
+
+	<string name="channel_list_join_conversation">உரையாடலில் இணைக</string>
+	<string name="channel_list_user_or_group_id">யூஸர் அல்லது குழுவின் ID</string>
+	<string name="channel_list_user_or_group_id_demo">npub, nevent அல்லது hex</string>
+	<string name="channel_list_create_channel">உருவாக்குக</string>
+	<string name="channel_list_join_channel">இணைக</string>
+
+	<string name="today">இன்று</string>
+
+	<string name="content_warning">உள்ளடக்க எச்சரிக்கை</string>
+	<string name="content_warning_explanation">இந்த குறிப்பின் உள்ளடக்கம் சிலருக்கு அவமதிப்பாகவோ அருவெறுப்பாகவோ இருக்கலாம்</string>
+	<string name="content_warning_hide_all_sensitive_content">எப்போதும் உணர்ச்சிபூர்வமான உள்ளடக்கத்தை மறைக்க</string>
+	<string name="content_warning_show_all_sensitive_content">எப்போதும் உணர்ச்சிபூர்வமான உள்ளடக்கத்தை காண்பிக்க</string>
+	<string name="content_warning_see_warnings">எப்போதும் உள்ளடக்க எச்சரிக்கையை காண்பிக்க</string>
+
+	<string name="recommended_apps">பரிந்துரைகள்</string>
+	<string name="filter_spam_from_strangers">தெரியாதவர்களிடமிருந்து ஸ்பேம்-மை வடிகட்டுக</string>
+	<string name="warn_when_posts_have_reports_from_your_follows">குறிப்புகளில் நீங்கள் பின்பற்றுபவரின் புகார் இருந்தால் எச்சரிக்க</string>
+
+	<string name="new_reaction_symbol">புதிய ரியாக்ஷன் குறி</string>
+	<string name="no_reaction_type_setup_long_press_to_change">எந்த ரியாக்ஷனும் தேர்ந்தெடுக்கவில்லை. மாற்ற நீண்ட நேரம் அழுத்தவும்</string>
+
+	<string name="zapraiser">ஜாப்-திரட்டுதல்</string>
+	<string name="zapraiser_explainer">இந்த குறிப்புடன் திரட்டுவதற்கான ஸாட்ஸ் இலக்குத் தொகை சேர்க்கப்படும். இப்பயன்பாட்டுள்ள கிளயண்ட்டுகள் ஜாப்-களை ஊக்குவிக்க ப்ரோக்ரேஸ் பார் மூலம் காண்பிக்கலாம்</string>
+	<string name="zapraiser_target_amount_in_sats">ஸாட்ஸ் இலக்குத் தொகை</string>
+
+	<string name="sats_to_complete">ஜாப்-திரட்டுதல் %1$s. இலக்கை அடைய %2$s</string>
+	<string name="read_from_relay">படிப்பதற்கான ரிலே</string>
+	<string name="write_to_relay">போஸ்ட் செய்வதற்கான ரிலே</string>
+	<string name="an_error_ocurred_trying_to_get_relay_information">%1$s ரிலே விவரங்கள் பெறுகையில் பிழை</string>
+	<string name="owner">உரிமையாளர்</string>
+	<string name="version">பதிப்பு</string>
+	<string name="software">மென்பொருள்</string>
+	<string name="contact">தொடர்புக்கு</string>
+	<string name="supports">ஆதரிக்கப்படும் NIPகள்</string>
+	<string name="admission_fees">அனுமதி கட்டணம்</string>
+	<string name="payments_url">கட்டண URL</string>
+	<string name="limitations">வரம்புகள்</string>
+	<string name="countries">நாடுகள்</string>
+	<string name="languages">மொழிகள்</string>
+	<string name="tags">டாகுகள்</string>
+	<string name="posting_policy">போஸ்ட் செய்வதற்கான கொள்கை</string>
+	<string name="message_length">குறிப்பு நீளம்</string>
+	<string name="subscriptions">சப்ஸ்க்ரிப்ஷன்கள்</string>
+	<string name="filters">வடிப்பான்கள்</string>
+	<string name="subscription_id_length">சப்ஸ்க்ரிப்ஷன் ID நீளம்</string>
+	<string name="minimum_prefix">குறைந்தபட்ச முன்னீடு</string>
+	<string name="maximum_event_tags">அதிகபட்ச நிகழ்வு டாகுகள்</string>
+	<string name="content_length">உள்ளடக்க நீளம்</string>
+	<string name="minimum_pow">குறைந்தபட்ச PoW</string>
+	<string name="auth">சான்றளிப்பு</string>
+	<string name="payment">கட்டணம்</string>
+	<string name="cashu">Cashu டோக்கன்</string>
+	<string name="cashu_redeem">மீட்க</string>
+
+	<string name="live_stream_live_tag">நேரலை</string>
+	<string name="live_stream_offline_tag">ஆஃப்லைன்</string>
+	<string name="live_stream_ended_tag">முடிந்தது</string>
+	<string name="live_stream_planned_tag">வரவிருக்கிறது</string>
+
+	<string name="live_stream_is_offline">லைவ்ஸ்ட்ரீம் ஆஃப்லைனில் உள்ளது</string>
+	<string name="live_stream_has_ended">லைவ்ஸ்ட்ரீம் முடிந்துவிட்டது</string>
+	<string name="are_you_sure_you_want_to_log_out">வெளியேறு உங்கள் அனைத்து லோக்கல் விவரங்களையும் நீக்கிவிடும். வெளியேறும் முன் உங்கள் அக்கவுண்ட் தொலையாமல் இருக்க ரகசியசாவியை பத்திரமாக பிரதி செய்து சேமிக்கப்பட்டுள்ளதா என்று சரிபார்க்கவும். வெளியேற்றம் தொடர வேண்டுமா?</string>
+	<string name="followed_tags">பின்பற்றப்படும் டாகுகள்</string>
+
+	<string name="relay_setup">ரிலேகள்</string>
+ 
 </resources>

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

@@ -34,6 +34,8 @@
     <string name="login_with_a_private_key_to_like_posts">Login with a Private key to like Posts</string>
     <string name="no_zap_amount_setup_long_press_to_change">No Zap Amount Setup. Long Press to change</string>
     <string name="login_with_a_private_key_to_be_able_to_send_zaps">Login with a Private key to be able to send Zaps</string>
+    <string name="login_with_a_private_key_to_be_able_to_follow">Login with a Private key to be able to Follow</string>
+    <string name="login_with_a_private_key_to_be_able_to_unfollow">Login with a Private key to be able to Unfollow</string>
     <string name="zaps">Zaps</string>
     <string name="view_count">View count</string>
     <string name="boost">Boost</string>
@@ -126,10 +128,10 @@
     <string name="unblock">Unblock</string>
     <string name="copy_user_id">Copy User ID</string>
     <string name="unblock_user">Unblock User</string>
-    <string name="npub_hex_username">"npub, hex, username "</string>
+    <string name="npub_hex_username">"npub, username, text"</string>
     <string name="clear">Clear</string>
     <string name="app_logo">App Logo</string>
-    <string name="nsec_npub_hex_private_key">nsec / npub / hex private key</string>
+    <string name="nsec_npub_hex_private_key">nsec.. or npub..</string>
     <string name="show_password">Show Password</string>
     <string name="hide_password">Hide Password</string>
     <string name="invalid_key">Invalid key</string>
@@ -468,4 +470,6 @@
     <string name="live_stream_has_ended">Livestream Ended</string>
     <string name="are_you_sure_you_want_to_log_out">Logging out deletes all your local information. Make sure to have your private keys backed up to avoid losing your account. Do you want to continue?</string>
     <string name="followed_tags">Followed Tags</string>
+
+    <string name="relay_setup">Relays</string>
 </resources>