Version 0.9

.gitignore

@@ -7,6 +7,7 @@
 /.idea/workspace.xml
 /.idea/navEditor.xml
 /.idea/assetWizardSettings.xml
+/.idea/androidTestResultsUserPreferences.xml
 .DS_Store
 /build
 /captures

README.md

@@ -11,13 +11,22 @@ Amethyst brings the best social network to your Android phone. Just insert your
 - [x] Notifications Feed
 - [x] Global Feed
 - [x] Reactions (like, boost, reply)
-- [x] Image Preview
+- [x] Image Preview (gifs, svgs)
 - [x] Url Preview
 - [x] View Threads
-- [ ] Private Messages
-- [ ] Communities
+- [x] Private Messages (NIP-04)
+- [x] User Profiles (follow/unfollow)
+- [x] Public Chats (NIP-28)
+- [ ] Notification Bubbles
+- [ ] Infinity Scroll 
+- [ ] Dropdown to Link Users/Posts when writting
+- [ ] Identity Verification (NIP-05)
+- [ ] Event Delegation (NIP-09)
+- [ ] Filter messages from Unknown People
 - [ ] Profile Edit
 - [ ] Relay Edit
+- [ ] Account Creation / Backup Guidance
+- [ ] Message Sent feedback
 
 # Development Overview
 

app/build.gradle

@@ -11,8 +11,8 @@ android {
         applicationId "com.vitorpamplona.amethyst"
         minSdk 26
         targetSdk 33
-        versionCode 6
-        versionName "0.6"
+        versionCode 11
+        versionName "0.9"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {
@@ -48,7 +48,7 @@ android {
 
 dependencies {
     implementation 'androidx.core:core-ktx:1.9.0'
-    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.5.1'
+    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.0-alpha04'
     implementation 'androidx.activity:activity-compose:1.6.1'
     implementation "androidx.compose.ui:ui:$compose_ui_version"
     implementation "androidx.compose.ui:ui-tooling-preview:$compose_ui_version"
@@ -61,7 +61,7 @@ dependencies {
     implementation "androidx.compose.material:material-icons-extended:1.3.1"
 
     // Input
-    implementation 'androidx.lifecycle:lifecycle-viewmodel-compose:2.5.1'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-compose:2.6.0-alpha04'
 
     // Swipe Refresh
     implementation 'com.google.accompanist:accompanist-swiperefresh:0.24.13-rc'
@@ -81,7 +81,7 @@ dependencies {
 
     implementation 'com.squareup.retrofit2:converter-gson:2.8.1'
     // Websockets API
-    implementation 'com.squareup.okhttp3:okhttp:4.10.0'
+    implementation 'com.squareup.okhttp3:okhttp:5.0.0-alpha.11'
 
     // Json Serialization
     implementation 'com.fasterxml.jackson.module:jackson-module-kotlin:2.14.1'
@@ -99,9 +99,14 @@ dependencies {
     // view videos
     implementation 'com.google.android.exoplayer:exoplayer:2.18.2'
 
+    // view gifs
+    implementation "io.coil-kt:coil-gif:2.2.2"
+    // view svgs
+    implementation("io.coil-kt:coil-svg:2.2.2")
+
     // tabs for user profiles
     implementation "com.google.accompanist:accompanist-pager:$accompanist_version" // Pager
-    implementation "com.google.accompanist:accompanist-pager-indicators:$accompanist_version" // Pager Indicators
+    implementation "com.google.accompanist:accompanist-pager-indicators:$accompanist_version"
 
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'

app/src/androidTest/java/com/vitorpamplona/amethyst/ExampleInstrumentedTest.kt

@@ -1,22 +0,0 @@
-package com.vitorpamplona.amethyst
-
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import androidx.test.platform.app.InstrumentationRegistry
-import org.junit.Assert.*
-import org.junit.Test
-import org.junit.runner.RunWith
-
-/**
- * Instrumented test, which will execute on an Android device.
- *
- * See [testing documentation](http://d.android.com/tools/testing).
- */
-@RunWith(AndroidJUnit4::class)
-class ExampleInstrumentedTest {
-  @Test
-  fun useAppContext() {
-    // Context of the app under test.
-    val appContext = InstrumentationRegistry.getInstrumentation().targetContext
-    assertEquals("com.vitorpamplona.amethyst", appContext.packageName)
-  }
-}

app/src/androidTest/java/com/vitorpamplona/amethyst/UrlUserTagTransformationTest.kt

@@ -0,0 +1,96 @@
+package com.vitorpamplona.amethyst
+
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.text.AnnotatedString
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.platform.app.InstrumentationRegistry
+import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.model.decodePublicKey
+import com.vitorpamplona.amethyst.ui.actions.buildAnnotatedStringWithUrlHighlighting
+import org.junit.Assert.*
+import org.junit.Test
+import org.junit.runner.RunWith
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+@RunWith(AndroidJUnit4::class)
+class EUrlUserTagTransformationTest {
+  @Test
+  fun useAppContext() {
+    // Context of the app under test.
+    val appContext = InstrumentationRegistry.getInstrumentation().targetContext
+    assertEquals("com.vitorpamplona.amethyst", appContext.packageName)
+  }
+
+  @Test
+  fun transformationText() {
+    val user = LocalCache.getOrCreateUser(decodePublicKey("npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z"))
+    user.info.displayName = "Vitor Pamplona"
+
+    var transformedText = buildAnnotatedStringWithUrlHighlighting(
+      AnnotatedString("New Hey @npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z"),
+      Color.Red
+    )
+
+    assertEquals("New Hey @Vitor Pamplona", transformedText.text.text)
+
+    assertEquals(0, transformedText.offsetMapping.originalToTransformed(0)) // Before N
+    assertEquals(4, transformedText.offsetMapping.originalToTransformed(4)) // Before H
+    assertEquals(8, transformedText.offsetMapping.originalToTransformed(8)) // Before @
+    assertEquals(8, transformedText.offsetMapping.originalToTransformed(9)) // Before n
+    assertEquals(8, transformedText.offsetMapping.originalToTransformed(10)) // Before p
+    assertEquals(9, transformedText.offsetMapping.originalToTransformed(11)) // Before u
+    assertEquals(9, transformedText.offsetMapping.originalToTransformed(12)) // Before b
+    assertEquals(9, transformedText.offsetMapping.originalToTransformed(13)) // Before 1
+
+    assertEquals(23, transformedText.offsetMapping.originalToTransformed(71))
+    assertEquals(23, transformedText.offsetMapping.originalToTransformed(72))
+
+
+    assertEquals(0, transformedText.offsetMapping.transformedToOriginal(0))
+    assertEquals(4, transformedText.offsetMapping.transformedToOriginal(4))
+    assertEquals(8, transformedText.offsetMapping.transformedToOriginal(8))
+    assertEquals(12, transformedText.offsetMapping.transformedToOriginal(9))
+
+    assertEquals(72, transformedText.offsetMapping.transformedToOriginal(23))
+    assertEquals(73, transformedText.offsetMapping.transformedToOriginal(24))
+  }
+
+  @Test
+  fun transformationTextTwoKeys() {
+    val user = LocalCache.getOrCreateUser(decodePublicKey("npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z"))
+    user.info.displayName = "Vitor Pamplona"
+
+    var transformedText = buildAnnotatedStringWithUrlHighlighting(
+      AnnotatedString("New Hey @npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z and @npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z"),
+      Color.Red
+    )
+
+    assertEquals("New Hey @Vitor Pamplona and @Vitor Pamplona", transformedText.text.text)
+
+    assertEquals(9, transformedText.offsetMapping.originalToTransformed(11))
+    assertEquals(9, transformedText.offsetMapping.originalToTransformed(12))
+    assertEquals(9, transformedText.offsetMapping.originalToTransformed(13))
+
+    assertEquals(23, transformedText.offsetMapping.originalToTransformed(70)) // Before 5
+    assertEquals(23, transformedText.offsetMapping.originalToTransformed(71)) // Before z
+    assertEquals(23, transformedText.offsetMapping.originalToTransformed(72)) // Before <space>
+    assertEquals(24, transformedText.offsetMapping.originalToTransformed(73)) // Before a
+    assertEquals(25, transformedText.offsetMapping.originalToTransformed(74)) // Before n
+    assertEquals(26, transformedText.offsetMapping.originalToTransformed(75)) // Before d
+    assertEquals(27, transformedText.offsetMapping.originalToTransformed(76)) // Before <space>
+    assertEquals(28, transformedText.offsetMapping.originalToTransformed(77)) // Before @
+    assertEquals(28, transformedText.offsetMapping.originalToTransformed(78)) // Before n
+
+    assertEquals(68, transformedText.offsetMapping.transformedToOriginal(22)) // Before a
+    assertEquals(72, transformedText.offsetMapping.transformedToOriginal(23)) // Before <space>
+    assertEquals(73, transformedText.offsetMapping.transformedToOriginal(24)) // Before a
+    assertEquals(74, transformedText.offsetMapping.transformedToOriginal(25)) // Before n
+    assertEquals(75, transformedText.offsetMapping.transformedToOriginal(26)) // Before d
+    assertEquals(76, transformedText.offsetMapping.transformedToOriginal(27)) // Before <space>
+    assertEquals(77, transformedText.offsetMapping.transformedToOriginal(28)) // Before @
+  }
+}

app/src/main/AndroidManifest.xml

@@ -9,9 +9,8 @@
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
-        android:icon="@drawable/amethyst_logo"
+        android:icon="@drawable/amethyst"
         android:label="@string/app_name"
-        android:roundIcon="@drawable/amethyst_logo"
         android:enableOnBackInvokedCallback="true"
         android:supportsRtl="true"
         android:theme="@style/Theme.Amethyst"
@@ -19,7 +18,6 @@
         <activity
             android:name=".ui.MainActivity"
             android:exported="true"
-            android:label="@string/app_name"
             android:theme="@style/Theme.Amethyst">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

app/src/main/java/com/vitorpamplona/amethyst/lnurl/LnInvoiceUtil.kt

@@ -1,4 +1,4 @@
-package com.vitorpamplona.amethyst.ui.components
+package com.vitorpamplona.amethyst.lnurl
 
 import java.math.BigDecimal
 import java.util.Locale
@@ -6,7 +6,7 @@ import java.util.regex.Pattern
 
 /** based on litecoinj */
 object LnInvoiceUtil {
-  private val invoicePattern = Pattern.compile("lnbc((?<amount>\\d+)(?<multiplier>[munp])?)?1[^1\\s]+")
+  private val invoicePattern = Pattern.compile("lnbc((?<amount>\\d+)(?<multiplier>[munp])?)?1[^1\\s]+", Pattern.CASE_INSENSITIVE)
 
   /** The Bech32 character set for encoding.  */
   private const val CHARSET = "qpzry9x8gf2tvdw0s3jn54khce6mua7l"

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

@@ -2,9 +2,14 @@ package com.vitorpamplona.amethyst.model
 
 import androidx.lifecycle.LiveData
 import com.vitorpamplona.amethyst.service.Constants
+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.ReactionEvent
 import com.vitorpamplona.amethyst.service.model.RepostEvent
 import com.vitorpamplona.amethyst.service.relays.Client
+import com.vitorpamplona.amethyst.ui.screen.AccountStateViewModel
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import nostr.postr.Contact
 import nostr.postr.Persona
 import nostr.postr.Utils
@@ -13,13 +18,22 @@ import nostr.postr.events.PrivateDmEvent
 import nostr.postr.events.TextNoteEvent
 import nostr.postr.toHex
 
-class Account(val loggedIn: Persona) {
+val DefaultChannels = setOf(
+  "25e5c82273a271cb1a840d0060391a0bf4965cafeb029d5ab55350b418953fbb", // -> Anigma's Nostr
+  "42224859763652914db53052103f0b744df79dfc4efef7e950fc0802fc3df3c5"  // -> Amethyst's Group
+)
+
+class Account(val loggedIn: Persona, val followingChannels: MutableSet<String> = DefaultChannels.toMutableSet()) {
   var seeReplies: Boolean = true
 
   fun userProfile(): User {
     return LocalCache.getOrCreateUser(loggedIn.pubKey)
   }
 
+  fun followingChannels(): List<Channel> {
+    return followingChannels.map { LocalCache.getOrCreateChannel(it) }
+  }
+
   fun isWriteable(): Boolean {
     return loggedIn.privKey != null
   }
@@ -33,7 +47,7 @@ class Account(val loggedIn: Persona) {
     }
 
     note.event?.let {
-      val event = ReactionEvent.create(it, loggedIn.privKey!!)
+      val event = ReactionEvent.createLike(it, loggedIn.privKey!!)
       Client.send(event)
       LocalCache.consume(event)
     }
@@ -81,13 +95,17 @@ class Account(val loggedIn: Persona) {
     }
   }
 
-  fun sendPost(message: String, replyingTo: Note?) {
+  fun sendPost(message: String, originalNote: Note?, modifiedMentions: List<User>?) {
     if (!isWriteable()) return
 
-    val replyToEvent = replyingTo?.event
+    val replyToEvent = originalNote?.event
     if (replyToEvent is TextNoteEvent) {
+      val modifiedMentionsHex = modifiedMentions?.map { it.pubkeyHex }?.toSet() ?: emptySet()
+
       val repliesTo = replyToEvent.replyTos.plus(replyToEvent.id.toHex())
-      val mentions = replyToEvent.mentions.plus(replyToEvent.pubKey.toHex())
+      val mentions = replyToEvent.mentions.plus(replyToEvent.pubKey.toHex()).plus(modifiedMentionsHex).filter {
+        it in modifiedMentionsHex
+      }
 
       val signedEvent = TextNoteEvent.create(
         msg = message,
@@ -101,7 +119,7 @@ class Account(val loggedIn: Persona) {
       val signedEvent = TextNoteEvent.create(
         msg = message,
         replyTos = null,
-        mentions = null,
+        mentions = modifiedMentions?.map { it.pubkeyHex } ?: emptyList(),
         privateKey = loggedIn.privKey!!
       )
       Client.send(signedEvent)
@@ -109,6 +127,18 @@ class Account(val loggedIn: Persona) {
     }
   }
 
+  fun sendChannelMeesage(message: String, toChannel: String, replyingTo: Note? = null) {
+    if (!isWriteable()) return
+
+    val signedEvent = ChannelMessageEvent.create(
+      message = message,
+      channel = toChannel,
+      privateKey = loggedIn.privKey!!
+    )
+    Client.send(signedEvent)
+    LocalCache.consume(signedEvent)
+  }
+
   fun sendPrivateMeesage(message: String, toUser: String, replyingTo: Note? = null) {
     if (!isWriteable()) return
     val user = LocalCache.users[toUser] ?: return
@@ -124,6 +154,53 @@ class Account(val loggedIn: Persona) {
     LocalCache.consume(signedEvent)
   }
 
+  fun sendCreateNewChannel(name: String, about: String, picture: String, accountStateViewModel: AccountStateViewModel) {
+    if (!isWriteable()) return
+
+    val metadata = ChannelCreateEvent.ChannelData(
+      name, about, picture
+    )
+
+    val event = ChannelCreateEvent.create(
+      channelInfo = metadata,
+      privateKey = loggedIn.privKey!!
+    )
+
+    Client.send(event)
+    LocalCache.consume(event)
+
+    joinChannel(event.id.toHex(), accountStateViewModel)
+  }
+
+  fun joinChannel(idHex: String, accountStateViewModel: AccountStateViewModel) {
+    followingChannels.add(idHex)
+    accountStateViewModel.saveToEncryptedStorage(this)
+  }
+
+  fun leaveChannel(idHex: String, accountStateViewModel: AccountStateViewModel) {
+    followingChannels.remove(idHex)
+    accountStateViewModel.saveToEncryptedStorage(this)
+  }
+
+  fun sendChangeChannel(name: String, about: String, picture: String, channel: Channel) {
+    if (!isWriteable()) return
+
+    val metadata = ChannelCreateEvent.ChannelData(
+      name, about, picture
+    )
+
+    val event = ChannelMetadataEvent.create(
+      newChannelInfo = metadata,
+      originalChannelIdHex = channel.idHex,
+      privateKey = loggedIn.privKey!!
+    )
+
+    Client.send(event)
+    LocalCache.consume(event)
+
+    followingChannels.add(event.id.toHex())
+  }
+
   fun decryptContent(note: Note): String? {
     val event = note.event
     return if (event is PrivateDmEvent && loggedIn.privKey != null) {

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

@@ -0,0 +1,65 @@
+package com.vitorpamplona.amethyst.model
+
+import androidx.lifecycle.LiveData
+import com.vitorpamplona.amethyst.service.NostrSingleUserDataSource
+import com.vitorpamplona.amethyst.service.model.ChannelCreateEvent
+import com.vitorpamplona.amethyst.service.model.ChannelMetadataEvent
+import com.vitorpamplona.amethyst.ui.note.toShortenHex
+import java.util.Collections
+import java.util.concurrent.ConcurrentHashMap
+import nostr.postr.events.ContactListEvent
+
+class Channel(val id: ByteArray) {
+    val idHex = id.toHexKey()
+    val idDisplayHex = id.toShortenHex()
+
+    var creator: User? = null
+    var info = ChannelCreateEvent.ChannelData(null, null, null)
+
+    var updatedMetadataAt: Long = 0;
+
+    val notes = ConcurrentHashMap<HexKey, Note>()
+
+    @Synchronized
+    fun getOrCreateNote(idHex: String): Note {
+        return notes[idHex] ?: run {
+            val answer = Note(idHex)
+            notes.put(idHex, answer)
+            answer
+        }
+    }
+
+    fun updateChannelInfo(creator: User, channelInfo: ChannelCreateEvent.ChannelData, updatedAt: Long) {
+        this.creator = creator
+        this.info = channelInfo
+        this.updatedMetadataAt = updatedAt
+
+        live.refresh()
+    }
+
+    fun profilePicture(): String {
+        if (info.picture.isNullOrBlank()) info.picture = null
+        return info.picture ?: "https://robohash.org/${idHex}.png"
+    }
+
+    fun anyNameStartsWith(prefix: String): Boolean {
+        return listOfNotNull(info.name, info.about)
+            .filter { it.startsWith(prefix, true) }.isNotEmpty()
+    }
+
+    // Observers line up here.
+    val live: ChannelLiveData = ChannelLiveData(this)
+
+    private fun refreshObservers() {
+        live.refresh()
+    }
+}
+
+
+class ChannelLiveData(val channel: Channel): LiveData<ChannelState>(ChannelState(channel)) {
+    fun refresh() {
+        postValue(ChannelState(channel))
+    }
+}
+
+class ChannelState(val channel: Channel)

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

@@ -1,6 +1,6 @@
 package com.vitorpamplona.amethyst.model
 
-import com.vitorpamplona.amethyst.ui.note.toDisplayHex
+import com.vitorpamplona.amethyst.ui.note.toShortenHex
 import fr.acinq.secp256k1.Hex
 import java.util.regex.Pattern
 import nostr.postr.Bech32
@@ -22,7 +22,7 @@ fun HexKey.toByteArray(): ByteArray {
 }
 
 fun HexKey.toDisplayHexKey(): String {
-  return this.toDisplayHex()
+  return this.toShortenHex()
 }
 
 fun decodePublicKey(key: String): ByteArray {

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

@@ -4,6 +4,11 @@ import android.util.Log
 import androidx.lifecycle.LiveData
 import com.fasterxml.jackson.databind.DeserializationFeature
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
+import com.vitorpamplona.amethyst.service.model.ChannelCreateEvent
+import com.vitorpamplona.amethyst.service.model.ChannelHideMessageEvent
+import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
+import com.vitorpamplona.amethyst.service.model.ChannelMetadataEvent
+import com.vitorpamplona.amethyst.service.model.ChannelMuteUserEvent
 import com.vitorpamplona.amethyst.service.model.ReactionEvent
 import com.vitorpamplona.amethyst.service.model.RepostEvent
 import java.io.ByteArrayInputStream
@@ -19,6 +24,7 @@ import nostr.postr.events.PrivateDmEvent
 import nostr.postr.events.RecommendRelayEvent
 import nostr.postr.events.TextNoteEvent
 import nostr.postr.toHex
+import nostr.postr.toNpub
 
 
 object LocalCache {
@@ -28,6 +34,7 @@ object LocalCache {
 
   val users = ConcurrentHashMap<HexKey, User>()
   val notes = ConcurrentHashMap<HexKey, Note>()
+  val channels = ConcurrentHashMap<HexKey, Channel>()
 
   @Synchronized
   fun getOrCreateUser(pubkey: ByteArray): User {
@@ -48,12 +55,22 @@ object LocalCache {
     }
   }
 
-  fun consume(event: MetadataEvent) {
-    //Log.d("MT", "New User ${users.size} ${event.contactMetaData.name}")
+  @Synchronized
+  fun getOrCreateChannel(key: String): Channel {
+    return channels[key] ?: run {
+      val answer = Channel(key.toByteArray())
+      channels.put(key, answer)
+      answer
+    }
+  }
 
+
+  fun consume(event: MetadataEvent) {
     // new event
     val oldUser = getOrCreateUser(event.pubKey)
     if (event.createdAt > oldUser.updatedMetadataAt) {
+      //Log.d("MT", "New User ${users.size} ${event.contactMetaData.name}")
+
       val newUser = try {
         metadataParser.readValue<UserMetadata>(ByteArrayInputStream(event.content.toByteArray(Charsets.UTF_8)), UserMetadata::class.java)
       } catch (e: Exception) {
@@ -85,7 +102,7 @@ object LocalCache {
 
     note.loadEvent(event, author, mentions, replyTo)
 
-    //Log.d("TN", "New Note (${notes.size},${users.size}) ${note.author?.toBestDisplayName()} ${note.event?.content} ${formattedDateTime(event.createdAt)}")
+    //Log.d("TN", "New Note (${notes.size},${users.size}) ${note.author?.toBestDisplayName()} ${note.event?.content?.take(100)} ${formattedDateTime(event.createdAt)}")
 
     // Prepares user's profile view.
     author.notes.add(note)
@@ -103,8 +120,6 @@ object LocalCache {
       it.addReply(note)
     }
 
-    UrlCachedPreviewer.preloadPreviewsFor(note)
-
     refreshObservers()
   }
 
@@ -116,7 +131,7 @@ object LocalCache {
     val user = getOrCreateUser(event.pubKey)
 
     if (event.createdAt > user.updatedFollowsAt) {
-      Log.d("CL", "AAA ${user.toBestDisplayName()} ${event.follows.size}")
+      //Log.d("CL", "AAA ${user.toBestDisplayName()} ${event.follows.size}")
       user.updateFollows(
         event.follows.map {
           try {
@@ -172,7 +187,7 @@ object LocalCache {
     // Already processed this event.
     if (note.event != null) return
 
-    //Log.d("TN", "New Boost (${notes.size},${users.size}) ${note.author.toBestDisplayName()} ${formattedDateTime(event.createdAt)}")
+    //Log.d("TN", "New Boost (${notes.size},${users.size}) ${note.author?.toBestDisplayName()} ${formattedDateTime(event.createdAt)}")
 
     val author = getOrCreateUser(event.pubKey)
     val mentions = event.originalAuthor.map { getOrCreateUser(decodePublicKey(it)) }.toList()
@@ -229,6 +244,114 @@ object LocalCache {
     }
   }
 
+  fun consume(event: ChannelCreateEvent) {
+    Log.d("MT", "New Event ${event.content} ${event.id.toHex()}")
+    // new event
+    val oldChannel = getOrCreateChannel(event.id.toHex())
+    val author = getOrCreateUser(event.pubKey)
+    if (event.createdAt > oldChannel.updatedMetadataAt) {
+      if (oldChannel.creator == null || oldChannel.creator == author) {
+        oldChannel.updateChannelInfo(author, event.channelInfo, event.createdAt)
+
+        val note = oldChannel.getOrCreateNote(event.id.toHex())
+        note.channel = oldChannel
+        note.loadEvent(event, author, emptyList(), mutableListOf())
+      }
+    } else {
+      // older data, does nothing
+    }
+
+    refreshObservers()
+  }
+  fun consume(event: ChannelMetadataEvent) {
+    //Log.d("MT", "New User ${users.size} ${event.contactMetaData.name}")
+    if (event.channel.isNullOrBlank()) return
+
+    // new event
+    val oldChannel = getOrCreateChannel(event.channel)
+    val author = getOrCreateUser(event.pubKey)
+    if (event.createdAt > oldChannel.updatedMetadataAt) {
+      if (oldChannel.creator == null || oldChannel.creator == author) {
+        oldChannel.updateChannelInfo(author, event.channelInfo, event.createdAt)
+
+        val note = oldChannel.getOrCreateNote(event.id.toHex())
+        note.channel = oldChannel
+        note.loadEvent(event, author, emptyList(), mutableListOf())
+      }
+    } else {
+      //Log.d("MT","Relay sent a previous Metadata Event ${oldUser.toBestDisplayName()} ${formattedDateTime(event.createdAt)} > ${formattedDateTime(oldUser.updatedAt)}")
+    }
+
+    refreshObservers()
+  }
+
+  fun consume(event: ChannelMessageEvent) {
+    if (event.channel.isNullOrBlank()) return
+
+    val channel = getOrCreateChannel(event.channel)
+
+    val note = channel.getOrCreateNote(event.id.toHex())
+
+    // Already processed this event.
+    if (note.event != null) return
+
+    val author = getOrCreateUser(event.pubKey)
+    val mentions = Collections.synchronizedList(event.mentions.map { getOrCreateUser(decodePublicKey(it)) })
+    val replyTo = Collections.synchronizedList(event.replyTos.map { channel.getOrCreateNote(it) }.toMutableList())
+
+    note.channel = channel
+    note.loadEvent(event, author, mentions, replyTo)
+
+    //Log.d("CM", "New Note (${notes.size},${users.size}) ${note.author?.toBestDisplayName()} ${note.event?.content} ${formattedDateTime(event.createdAt)}")
+
+    // Adds notifications to users.
+    mentions.forEach {
+      it.taggedPosts.add(note)
+    }
+    replyTo.forEach {
+      it.author?.taggedPosts?.add(note)
+    }
+
+    // Counts the replies
+    replyTo.forEach {
+      it.addReply(note)
+    }
+
+    refreshObservers()
+  }
+
+  fun consume(event: ChannelHideMessageEvent) {
+
+  }
+
+  fun consume(event: ChannelMuteUserEvent) {
+
+  }
+
+  fun findUsersStartingWith(username: String): List<User> {
+    return users.values.filter {
+           it.info.anyNameStartsWith(username)
+        || it.pubkeyHex.startsWith(username, true)
+        || it.pubkey.toNpub().startsWith(username, true)
+    }
+  }
+
+  fun findNotesStartingWith(text: String): List<Note> {
+    return notes.values.filter {
+      (it.event is TextNoteEvent && it.event?.content?.contains(text) ?: false)
+        || it.idHex.startsWith(text, true)
+        || it.id.toNote().startsWith(text, true)
+    }
+  }
+
+  fun findChannelsStartingWith(text: String): List<Channel> {
+    return channels.values.filter {
+      it.anyNameStartsWith(text)
+        || it.idHex.startsWith(text, true)
+        || it.id.toNote().startsWith(text, true)
+    }
+  }
+
   // Observers line up here.
   val live: LocalCacheLiveData = LocalCacheLiveData(this)
 

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

@@ -1,8 +1,10 @@
 package com.vitorpamplona.amethyst.model
 
+import android.os.Handler
+import android.os.Looper
 import androidx.lifecycle.LiveData
 import com.vitorpamplona.amethyst.service.NostrSingleEventDataSource
-import com.vitorpamplona.amethyst.ui.note.toDisplayHex
+import com.vitorpamplona.amethyst.ui.note.toShortenHex
 import fr.acinq.secp256k1.Hex
 import java.time.Instant
 import java.time.ZoneId
@@ -11,6 +13,7 @@ import java.util.Collections
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import nostr.postr.events.Event
 
@@ -18,7 +21,7 @@ class Note(val idHex: String) {
     // These fields are always available.
     // They are immutable
     val id = Hex.decode(idHex)
-    val idDisplayHex = id.toDisplayHex()
+    val idDisplayHex = id.toShortenHex()
 
     // These fields are only available after the Text Note event is received.
     // They are immutable after that.
@@ -32,13 +35,15 @@ class Note(val idHex: String) {
     val reactions = Collections.synchronizedSet(mutableSetOf<Note>())
     val boosts = Collections.synchronizedSet(mutableSetOf<Note>())
 
+    var channel: Channel? = null
+
     fun loadEvent(event: Event, author: User, mentions: List<User>, replyTo: MutableList<Note>) {
         this.event = event
         this.author = author
         this.mentions = mentions
         this.replyTo = replyTo
 
-        refreshObservers()
+        invalidateData()
     }
 
     fun formattedDateTime(timestamp: Long): String {
@@ -70,17 +75,17 @@ class Note(val idHex: String) {
 
     fun addReply(note: Note) {
         if (replies.add(note))
-            refreshObservers()
+            invalidateData()
     }
 
     fun addBoost(note: Note) {
         if (boosts.add(note))
-            refreshObservers()
+            invalidateData()
     }
 
     fun addReaction(note: Note) {
         if (reactions.add(note))
-            refreshObservers()
+            invalidateData()
     }
 
     fun isReactedBy(user: User): Boolean {
@@ -94,30 +99,35 @@ class Note(val idHex: String) {
     // Observers line up here.
     val live: NoteLiveData = NoteLiveData(this)
 
-    private fun refreshObservers() {
-        live.refresh()
+    // Refreshes observers in batches.
+    val scope = CoroutineScope(Job() + Dispatchers.Main)
+    var handlerWaiting = false
+    @Synchronized
+    fun invalidateData() {
+        if (handlerWaiting) return
+
+        handlerWaiting = true
+        scope.launch {
+            delay(100)
+            live.refresh()
+            handlerWaiting = false
+        }
     }
 }
 
 class NoteLiveData(val note: Note): LiveData<NoteState>(NoteState(note)) {
-    val scope = CoroutineScope(Job() + Dispatchers.Main)
-
     fun refresh() {
         postValue(NoteState(note))
     }
 
     override fun onActive() {
         super.onActive()
-        scope.launch {
-            NostrSingleEventDataSource.add(note.idHex)
-        }
+        NostrSingleEventDataSource.add(note.idHex)
     }
 
     override fun onInactive() {
         super.onInactive()
-        scope.launch {
-            NostrSingleEventDataSource.remove(note.idHex)
-        }
+        NostrSingleEventDataSource.remove(note.idHex)
     }
 }
 

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

@@ -8,6 +8,10 @@ import com.vitorpamplona.amethyst.ui.components.isValidURL
 import com.vitorpamplona.amethyst.ui.components.noProtocolUrlValidator
 import com.vitorpamplona.amethyst.ui.components.videoExtension
 import java.util.concurrent.ConcurrentHashMap
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.launch
 
 object UrlCachedPreviewer {
   val cache = ConcurrentHashMap<String, UrlInfoItem>()
@@ -18,16 +22,19 @@ object UrlCachedPreviewer {
       return
     }
 
-    BahaUrlPreview(url, object : IUrlPreviewCallback {
-      override fun onComplete(urlInfo: UrlInfoItem) {
-        cache.put(url, urlInfo)
-        callback?.onComplete(urlInfo)
-      }
+    val scope = CoroutineScope(Job() + Dispatchers.IO)
+    scope.launch {
+      BahaUrlPreview(url, object : IUrlPreviewCallback {
+        override fun onComplete(urlInfo: UrlInfoItem) {
+          cache.put(url, urlInfo)
+          callback?.onComplete(urlInfo)
+        }
 
-      override fun onFailed(throwable: Throwable) {
-        callback?.onFailed(throwable)
-      }
-    }).fetchUrlPreview()
+        override fun onFailed(throwable: Throwable) {
+          callback?.onFailed(throwable)
+        }
+      }).fetchUrlPreview()
+    }
   }
 
   fun findUrlsInMessage(message: String): List<String> {

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

@@ -1,15 +1,23 @@
 package com.vitorpamplona.amethyst.model
 
+import android.os.Handler
+import android.os.Looper
 import androidx.lifecycle.LiveData
+import com.vitorpamplona.amethyst.service.NostrSingleEventDataSource
 import com.vitorpamplona.amethyst.service.NostrSingleUserDataSource
-import com.vitorpamplona.amethyst.ui.note.toDisplayHex
+import com.vitorpamplona.amethyst.ui.note.toShortenHex
 import java.util.Collections
 import java.util.concurrent.ConcurrentHashMap
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
 import nostr.postr.events.ContactListEvent
 
 class User(val pubkey: ByteArray) {
     val pubkeyHex = pubkey.toHexKey()
-    val pubkeyDisplayHex = pubkey.toDisplayHex()
+    val pubkeyDisplayHex = pubkey.toShortenHex()
 
     var info = UserMetadata()
 
@@ -23,7 +31,6 @@ class User(val pubkey: ByteArray) {
     val taggedPosts = Collections.synchronizedSet(mutableSetOf<Note>())
 
     val followers = Collections.synchronizedSet(mutableSetOf<User>())
-
     val messages = ConcurrentHashMap<User, MutableSet<Note>>()
 
     fun toBestDisplayName(): String {
@@ -46,10 +53,16 @@ class User(val pubkey: ByteArray) {
     fun follow(user: User) {
         follows.add(user)
         user.followers.add(this)
+
+        invalidateData()
+        user.invalidateData()
     }
     fun unfollow(user: User) {
         follows.remove(user)
         user.followers.remove(this)
+
+        invalidateData()
+        user.invalidateData()
     }
 
     @Synchronized
@@ -67,9 +80,12 @@ class User(val pubkey: ByteArray) {
     }
 
     fun updateFollows(newFollows: List<User>, updateAt: Long) {
-        val toBeAdded = newFollows - follows
-        val toBeRemoved = follows - newFollows
-
+        val toBeAdded = synchronized(follows) {
+            newFollows - follows
+        }
+        val toBeRemoved = synchronized(follows) {
+            follows - newFollows
+        }
         toBeAdded.forEach {
             follow(it)
         }
@@ -78,22 +94,37 @@ class User(val pubkey: ByteArray) {
         }
 
         updatedFollowsAt = updateAt
-
-        live.refresh()
     }
 
     fun updateUserInfo(newUserInfo: UserMetadata, updateAt: Long) {
         info = newUserInfo
         updatedMetadataAt = updateAt
 
-        live.refresh()
+        invalidateData()
+    }
+
+    fun isFollowing(user: User): Boolean {
+        return synchronized(follows) {
+            follows.contains(user)
+        }
     }
 
     // Observers line up here.
     val live: UserLiveData = UserLiveData(this)
 
-    private fun refreshObservers() {
-        live.refresh()
+    // Refreshes observers in batches.
+    val scope = CoroutineScope(Job() + Dispatchers.Main)
+    var handlerWaiting = false
+    @Synchronized
+    fun invalidateData() {
+        if (handlerWaiting) return
+
+        handlerWaiting = true
+        scope.launch {
+            delay(100)
+            live.refresh()
+            handlerWaiting = false
+        }
     }
 }
 
@@ -115,6 +146,11 @@ class UserMetadata {
     var iris: String? = null
     var main_relay: String? = null
     var twitter: String? = null
+
+    fun anyNameStartsWith(prefix: String): Boolean {
+        return listOfNotNull(name, username, display_name, displayName, nip05, lud06, lud16)
+              .filter { it.startsWith(prefix, true) }.isNotEmpty()
+    }
 }
 
 class UserLiveData(val user: User): LiveData<UserState>(UserState(user)) {

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

@@ -6,5 +6,5 @@ import nostr.postr.JsonFilter
 data class Channel (
   val id: String = UUID.randomUUID().toString().substring(0,4)
 ) {
-  var filter: JsonFilter? = null // Inactive when null
+  var filter: List<JsonFilter>? = null // Inactive when null
 }

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

@@ -6,7 +6,7 @@ object Constants {
     val defaultRelays = arrayOf(
       Relay("wss://nostr.bitcoiner.social", read = true, write = true),
       Relay("wss://relay.nostr.bg", read = true, write = true),
-      //Relay("wss://brb.io", read = true, write = true),
+      Relay("wss://brb.io", read = true, write = true),
       Relay("wss://nostr.v0l.io", read = true, write = true),
       Relay("wss://nostr.rocks", read = true, write = true),
       Relay("wss://relay.damus.io", read = true, write = true),
@@ -17,8 +17,9 @@ object Constants {
       Relay("wss://nostr-pub.wellorder.net", read = true, write = true),
       Relay("wss://nostr.mom", read = true, write = true),
       Relay("wss://nostr.orangepill.dev", read = true, write = true),
-      //Relay("wss://nostr-pub.semisol.dev", read = true, write = true),
+      Relay("wss://nostr-pub.semisol.dev", read = true, write = true),
       Relay("wss://nostr.onsats.org", read = true, write = true),
-      Relay("wss://nostr.sandwich.farm", read = true, write = true)
+      Relay("wss://nostr.sandwich.farm", read = true, write = true),
+      Relay("wss://relay.nostr.ch", read = true, write = true)
     )
 }

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

@@ -29,48 +29,46 @@ object NostrAccountDataSource: NostrDataSource<Note>("AccountData") {
       account.userProfile().live.removeObserver(cacheListener)
   }
 
-  fun createAccountFilter(): JsonFilter {
+  fun createAccountContactListFilter(): JsonFilter {
     return JsonFilter(
-      kinds = listOf(MetadataEvent.kind, ContactListEvent.kind),
+      kinds = listOf(ContactListEvent.kind),
       authors = listOf(account.userProfile().pubkeyHex),
-      since = System.currentTimeMillis() / 1000 - (60 * 60 * 24 * 7), // 4 days
+      limit = 1
     )
   }
 
-  val accountChannel = requestNewChannel()
-
-  fun <T> equalsIgnoreOrder(list1:List<T>?, list2:List<T>?): Boolean {
-    if (list1 == null && list2 == null) return true
-    if (list1 == null) return false
-    if (list2 == null) return false
-
-    return list1.size == list2.size && list1.toSet() == list2.toSet()
+  fun createAccountMetadataFilter(): JsonFilter {
+    return JsonFilter(
+      kinds = listOf(MetadataEvent.kind),
+      authors = listOf(account.userProfile().pubkeyHex),
+      limit = 3
+    )
   }
 
-  fun equalAuthors(list1:JsonFilter?, list2:JsonFilter?): Boolean {
-    if (list1 == null && list2 == null) return true
-    if (list1 == null) return false
-    if (list2 == null) return false
-
-    return equalsIgnoreOrder(list1.authors, list2.authors)
-  }
+  val accountMetadataChannel = requestNewChannel()
+  val accountContactListChannel = requestNewChannel()
 
   override fun feed(): List<Note> {
     val user = account.userProfile()
-    val follows = user.follows.map { it.pubkeyHex }.plus(user.pubkeyHex).toSet()
+
+    val follows = user.follows
+    val followKeys = synchronized(follows) {
+      follows.map { it.pubkeyHex }
+    }
+    val allowSet = followKeys.plus(user.pubkeyHex).toSet()
 
     return LocalCache.notes.values
-      .filter { (it.event is TextNoteEvent || it.event is RepostEvent) && it.author?.pubkeyHex in follows }
+      .filter { (it.event is TextNoteEvent || it.event is RepostEvent) && it.author?.pubkeyHex in allowSet }
       .sortedBy { it.event!!.createdAt }
       .reversed()
   }
 
   override fun updateChannelFilters() {
     // gets everthing about the user logged in
-    val newAccountFilter = createAccountFilter()
+    val newAccountMetadataFilter = createAccountMetadataFilter()
+    accountMetadataChannel.filter = listOf(newAccountMetadataFilter).ifEmpty { null }
 
-    if (!equalAuthors(newAccountFilter, accountChannel.filter)) {
-      accountChannel.filter = newAccountFilter
-    }
+    val newAccountContactListEvent = createAccountContactListFilter()
+    accountContactListChannel.filter = listOf(newAccountContactListEvent).ifEmpty { null }
   }
 }

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

@@ -0,0 +1,37 @@
+package com.vitorpamplona.amethyst.service
+
+import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
+import nostr.postr.JsonFilter
+
+object NostrChannelDataSource: NostrDataSource<Note>("ChatroomFeed") {
+  var channel: com.vitorpamplona.amethyst.model.Channel? = null
+
+  fun loadMessagesBetween(channelId: String) {
+    channel = LocalCache.channels[channelId]
+    resetFilters()
+  }
+
+  fun createMessagesToChannelFilter(): JsonFilter? {
+    if (channel != null) {
+      return JsonFilter(
+        kinds = listOf(ChannelMessageEvent.kind),
+        tags = mapOf("e" to listOfNotNull(channel?.idHex)),
+        since = System.currentTimeMillis() / 1000 - (60 * 60 * 24 * 1), // 24 hours
+      )
+    }
+    return null
+  }
+
+  val messagesChannel = requestNewChannel()
+
+  // returns the last Note of each user.
+  override fun feed(): List<Note> {
+    return channel?.notes?.values?.sortedBy { it.event?.createdAt } ?: emptyList()
+  }
+
+  override fun updateChannelFilters() {
+    messagesChannel.filter = listOfNotNull(createMessagesToChannelFilter()).ifEmpty { null }
+  }
+}

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

@@ -39,7 +39,7 @@ object NostrChatRoomDataSource: NostrDataSource<Note>("ChatroomFeed") {
   }
 
   override fun updateChannelFilters() {
-    incomingChannel.filter = createMessagesToMeFilter()
-    outgoingChannel.filter = createMessagesFromMeFilter()
+    incomingChannel.filter = listOf(createMessagesToMeFilter()).ifEmpty { null }
+    outgoingChannel.filter = listOf(createMessagesFromMeFilter()).ifEmpty { null }
   }
 }

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

@@ -1,7 +1,11 @@
 package com.vitorpamplona.amethyst.service
 
 import com.vitorpamplona.amethyst.model.Account
+import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.service.model.ChannelCreateEvent
+import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
+import com.vitorpamplona.amethyst.service.model.ChannelMetadataEvent
 import nostr.postr.JsonFilter
 import nostr.postr.events.PrivateDmEvent
 
@@ -18,21 +22,74 @@ object NostrChatroomListDataSource: NostrDataSource<Note>("MailBoxFeed") {
     authors = listOf(account.userProfile().pubkeyHex)
   )
 
+  fun createChannelsCreatedbyMeFilter() = JsonFilter(
+    kinds = listOf(ChannelCreateEvent.kind, ChannelMetadataEvent.kind),
+    authors = listOf(account.userProfile().pubkeyHex)
+  )
+
+  fun createMyChannelsFilter() = JsonFilter(
+    kinds = listOf(ChannelCreateEvent.kind),
+    ids = account.followingChannels.toList()
+  )
+
+  fun createLastChannelInfoFilter(): List<JsonFilter> {
+    return account.followingChannels.map {
+      JsonFilter(
+        kinds = listOf(ChannelMetadataEvent.kind),
+        tags = mapOf("e" to listOf(it)),
+        limit = 1
+      )
+    }
+  }
+
+  fun createLastMessageOfEachChannelFilter(): List<JsonFilter> {
+    return account.followingChannels.map {
+      JsonFilter(
+        kinds = listOf(ChannelMessageEvent.kind),
+        tags = mapOf("e" to listOf(it)),
+        limit = 1
+      )
+    }
+  }
+
   val incomingChannel = requestNewChannel()
   val outgoingChannel = requestNewChannel()
 
+  val myChannelsChannel = requestNewChannel()
+  val myChannelsInfoChannel = requestNewChannel()
+  val myChannelsMessagesChannel = requestNewChannel()
+
+  val myChannelsCreatedbyMeChannel = requestNewChannel()
+
   // returns the last Note of each user.
   override fun feed(): List<Note> {
     val messages = account.userProfile().messages
     val messagingWith = messages.keys().toList()
 
-    return messagingWith.mapNotNull {
-      messages[it]?.sortedBy { it.event?.createdAt }?.last { it.event != null }
-    }.sortedBy { it.event?.createdAt }.reversed()
+    val privateMessages = messagingWith.mapNotNull {
+      messages[it]?.sortedBy { it.event?.createdAt }?.lastOrNull { it.event != null }
+    }
+
+    val publicChannels = account.followingChannels().map {
+      it.notes.values.sortedBy { it.event?.createdAt }.lastOrNull { it.event != null }
+    }
+
+    val channelsCreatedByMe = LocalCache.channels.values.filter {
+      it.creator == account.userProfile()
+    }.map {
+      it.notes.values.sortedBy { it.event?.createdAt }.lastOrNull { it.event != null }
+    }
+
+    return (privateMessages + publicChannels).filterNotNull().sortedBy { it.event?.createdAt }.reversed()
   }
 
   override fun updateChannelFilters() {
-    incomingChannel.filter = createMessagesToMeFilter()
-    outgoingChannel.filter = createMessagesFromMeFilter()
+    incomingChannel.filter = listOf(createMessagesToMeFilter()).ifEmpty { null }
+    outgoingChannel.filter = listOf(createMessagesFromMeFilter()).ifEmpty { null }
+    myChannelsChannel.filter = listOf(createMyChannelsFilter()).ifEmpty { null }
+    myChannelsInfoChannel.filter = createLastChannelInfoFilter().ifEmpty { null }
+    myChannelsMessagesChannel.filter = createLastMessageOfEachChannelFilter().ifEmpty { null }
+
+    //myChannelsCreatedbyMeChannel.filter = listOf(createChannelsCreatedbyMeFilter()).ifEmpty { null }
   }
 }

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

@@ -1,11 +1,27 @@
 package com.vitorpamplona.amethyst.service
 
+import android.os.Handler
+import android.os.Looper
 import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.model.UrlCachedPreviewer
+import com.vitorpamplona.amethyst.service.model.ChannelCreateEvent
+import com.vitorpamplona.amethyst.service.model.ChannelHideMessageEvent
+import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
+import com.vitorpamplona.amethyst.service.model.ChannelMetadataEvent
+import com.vitorpamplona.amethyst.service.model.ChannelMuteUserEvent
 import com.vitorpamplona.amethyst.service.model.ReactionEvent
 import com.vitorpamplona.amethyst.service.model.RepostEvent
 import com.vitorpamplona.amethyst.service.relays.Client
 import com.vitorpamplona.amethyst.service.relays.Relay
 import java.util.Collections
+import kotlin.time.ExperimentalTime
+import kotlin.time.measureTimedValue
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
 import nostr.postr.events.ContactListEvent
 import nostr.postr.events.DeletionEvent
 import nostr.postr.events.Event
@@ -18,9 +34,25 @@ abstract class NostrDataSource<T>(val debugName: String) {
   private val channels = Collections.synchronizedSet(mutableSetOf<Channel>())
   private val channelIds =  Collections.synchronizedSet(mutableSetOf<String>())
 
+  private val eventCounter = mutableMapOf<String, Int>()
+
+  fun printCounter() {
+    eventCounter.forEach {
+      println("AAA Count ${it.key}: ${it.value}")
+    }
+  }
+
   private val clientListener = object : Client.Listener() {
     override fun onEvent(event: Event, subscriptionId: String, relay: Relay) {
       if (subscriptionId in channelIds) {
+        val key = "${debugName} ${subscriptionId} ${event.kind}"
+        if (eventCounter.contains(key)) {
+          eventCounter.put(key, eventCounter.get(key)!! + 1)
+        } else {
+          eventCounter.put(key, 1)
+        }
+
+        //println("AAA ${debugName} ${subscriptionId} ${event.kind}")
         when (event) {
           is MetadataEvent -> LocalCache.consume(event)
           is TextNoteEvent -> LocalCache.consume(event)
@@ -33,6 +65,12 @@ abstract class NostrDataSource<T>(val debugName: String) {
           else -> when (event.kind) {
             RepostEvent.kind -> LocalCache.consume(RepostEvent(event.id, event.pubKey, event.createdAt, event.tags, event.content, event.sig))
             ReactionEvent.kind -> LocalCache.consume(ReactionEvent(event.id, event.pubKey, event.createdAt, event.tags, event.content, event.sig))
+
+            ChannelCreateEvent.kind -> LocalCache.consume(ChannelCreateEvent(event.id, event.pubKey, event.createdAt, event.tags, event.content, event.sig))
+            ChannelMetadataEvent.kind -> LocalCache.consume(ChannelMetadataEvent(event.id, event.pubKey, event.createdAt, event.tags, event.content, event.sig))
+            ChannelMessageEvent.kind -> LocalCache.consume(ChannelMessageEvent(event.id, event.pubKey, event.createdAt, event.tags, event.content, event.sig))
+            ChannelHideMessageEvent.kind -> LocalCache.consume(ChannelHideMessageEvent(event.id, event.pubKey, event.createdAt, event.tags, event.content, event.sig))
+            ChannelMuteUserEvent.kind -> LocalCache.consume(ChannelMuteUserEvent(event.id, event.pubKey, event.createdAt, event.tags, event.content, event.sig))
           }
         }
       }
@@ -78,7 +116,23 @@ abstract class NostrDataSource<T>(val debugName: String) {
   }
 
   fun loadTop(): List<T> {
-    return feed().take(100)
+    val returningList = feed().take(100)
+
+    // prepare previews
+    val scope = CoroutineScope(Job() + Dispatchers.IO)
+    scope.launch {
+      loadPreviews(returningList)
+    }
+
+    return returningList
+  }
+
+  fun loadPreviews(list: List<T>) {
+    list.forEach {
+      if (it is Note) {
+        UrlCachedPreviewer.preloadPreviewsFor(it)
+      }
+    }
   }
 
   fun requestNewChannel(): Channel {
@@ -94,11 +148,25 @@ abstract class NostrDataSource<T>(val debugName: String) {
     channelIds.remove(channel.id)
   }
 
+  val scope = CoroutineScope(Job() + Dispatchers.IO)
+  var handlerWaiting = false
+  @Synchronized
+  fun invalidateFilters() {
+    if (handlerWaiting) return
+
+    handlerWaiting = true
+    scope.launch {
+      delay(200)
+      resetFilters()
+      handlerWaiting = false
+    }
+  }
+
   fun resetFilters() {
     // saves the channels that are currently active
     val activeChannels = channels.filter { it.filter != null }
     // saves the current content to only update if it changes
-    val currentFilter = activeChannels.associate { it.id to it.filter!!.toJson() }
+    val currentFilter = activeChannels.associate { it.id to it.filter!!.joinToString("|") { it.toJson() }  }
 
     updateChannelFilters()
 
@@ -112,12 +180,12 @@ abstract class NostrDataSource<T>(val debugName: String) {
           Client.close(channel.id)
         } else {
           // was active and is still active, check if it has changed.
-          if (channelsNewFilter.toJson() != currentFilter[channel.id]) {
+          if (channelsNewFilter.joinToString("|") { it.toJson() } != currentFilter[channel.id]) {
             Client.close(channel.id)
-            Client.sendFilter(channel.id, mutableListOf(channelsNewFilter))
+            Client.sendFilter(channel.id, channelsNewFilter)
           } else {
             // hasn't changed, does nothing.
-            Client.sendFilterOnlyIfDisconnected(channel.id, mutableListOf(channelsNewFilter))
+            Client.sendFilterOnlyIfDisconnected(channel.id, channelsNewFilter)
           }
         }
       } else {
@@ -125,8 +193,8 @@ abstract class NostrDataSource<T>(val debugName: String) {
           // was not active and is still not active, does nothing
         } else {
           // was not active and becomes active, sends the filter.
-          if (channelsNewFilter.toJson() != currentFilter[channel.id]) {
-            Client.sendFilter(channel.id, mutableListOf(channelsNewFilter))
+          if (channelsNewFilter.joinToString("|") { it.toJson() } != currentFilter[channel.id]) {
+            Client.sendFilter(channel.id, channelsNewFilter)
           }
         }
       }

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

@@ -6,31 +6,13 @@ import nostr.postr.JsonFilter
 import nostr.postr.events.TextNoteEvent
 
 object NostrGlobalDataSource: NostrDataSource<Note>("GlobalFeed") {
-  val fifteenMinutes = (60*15) // 15 mins
-
   fun createGlobalFilter() = JsonFilter(
-      kinds = listOf(TextNoteEvent.kind),
-      since = System.currentTimeMillis() / 1000 - fifteenMinutes
-    )
+    kinds = listOf(TextNoteEvent.kind),
+    limit = 50
+  )
 
   val globalFeedChannel = requestNewChannel()
 
-  fun equalTime(list1:Long?, list2:Long?): Boolean {
-    if (list1 == null && list2 == null) return true
-    if (list1 == null) return false
-    if (list2 == null) return false
-
-    return Math.abs(list1 - list2) < (4*fifteenMinutes)
-  }
-
-  fun equalFilters(list1:JsonFilter?, list2:JsonFilter?): Boolean {
-    if (list1 == null && list2 == null) return true
-    if (list1 == null) return false
-    if (list2 == null) return false
-
-    return equalTime(list1.since, list2.since)
-  }
-
   override fun feed() = LocalCache.notes.values
     .filter {
       it.event is TextNoteEvent && (it.event as TextNoteEvent).replyTos.isEmpty()
@@ -39,10 +21,6 @@ object NostrGlobalDataSource: NostrDataSource<Note>("GlobalFeed") {
     .reversed()
 
   override fun updateChannelFilters() {
-    val newFilter = createGlobalFilter()
-
-    if (!equalFilters(newFilter, globalFeedChannel.filter)) {
-      globalFeedChannel.filter = newFilter
-    }
+    globalFeedChannel.filter = listOf(createGlobalFilter()).ifEmpty { null }
   }
 }

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

@@ -28,19 +28,21 @@ object NostrHomeDataSource: NostrDataSource<Note>("HomeFeed") {
       account.userProfile().live.removeObserver(cacheListener)
   }
 
-  fun createFollowAccountsFilter(): JsonFilter? {
-    val follows = listOf(account.userProfile().pubkeyHex.substring(0, 6)).plus(
-      account.userProfile().follows?.map {
-        it.pubkey.toHex().substring(0, 6)
-      } ?: emptyList()
-    )
+  fun createFollowAccountsFilter(): JsonFilter {
+    val follows = account.userProfile().follows ?: emptySet()
 
-    if (follows.isEmpty()) return null
+    val followKeys = synchronized(follows) {
+      follows.map {
+        it.pubkey.toHex().substring(0, 6)
+      }
+    }
+
+    val followSet = followKeys.plus(account.userProfile().pubkeyHex.substring(0, 6))
 
     return JsonFilter(
       kinds = listOf(TextNoteEvent.kind, RepostEvent.kind),
-      authors = follows,
-      since = System.currentTimeMillis() / 1000 - (60 * 60 * 24 * 1), // 24 hours
+      authors = followSet,
+      limit = 200
     )
   }
 
@@ -64,10 +66,16 @@ object NostrHomeDataSource: NostrDataSource<Note>("HomeFeed") {
 
   override fun feed(): List<Note> {
     val user = account.userProfile()
-    val follows = user.follows.map { it.pubkeyHex }.plus(user.pubkeyHex).toSet()
+
+    val follows = user.follows
+    val followKeys = synchronized(follows) {
+      follows.map { it.pubkeyHex }
+    }
+
+    val allowSet = followKeys.plus(user.pubkeyHex).toSet()
 
     return LocalCache.notes.values
-      .filter { (it.event is TextNoteEvent || it.event is RepostEvent) && it.author?.pubkeyHex in follows }
+      .filter { (it.event is TextNoteEvent || it.event is RepostEvent) && it.author?.pubkeyHex in allowSet }
       .sortedBy { it.event!!.createdAt }
       .reversed()
   }
@@ -75,8 +83,8 @@ object NostrHomeDataSource: NostrDataSource<Note>("HomeFeed") {
   override fun updateChannelFilters() {
     val newFollowAccountsFilter = createFollowAccountsFilter()
 
-    if (!equalAuthors(newFollowAccountsFilter, followAccountChannel.filter)) {
-      followAccountChannel.filter = newFollowAccountsFilter
+    if (!equalAuthors(newFollowAccountsFilter, followAccountChannel.filter?.firstOrNull())) {
+      followAccountChannel.filter = listOf(newFollowAccountsFilter).ifEmpty { null }
     }
   }
 }

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

@@ -4,45 +4,26 @@ import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.Note
 import nostr.postr.JsonFilter
 
-object NostrNotificationDataSource: NostrDataSource<Note>("GlobalFeed") {
+object NostrNotificationDataSource: NostrDataSource<Note>("NotificationFeed") {
   lateinit var account: Account
 
-  fun createGlobalFilter() = JsonFilter(
-    since = System.currentTimeMillis() / 1000 - (60 * 60 * 24 * 7), // 7 days
-    tags = mapOf("p" to listOf(account.userProfile().pubkeyHex).filterNotNull())
+  fun createNotificationFilter() = JsonFilter(
+    tags = mapOf("p" to listOf(account.userProfile().pubkeyHex)),
+    limit = 100
   )
 
   val notificationChannel = requestNewChannel()
 
-  fun <T> equalsIgnoreOrder(list1:List<T>?, list2:List<T>?): Boolean {
-    if (list1 == null && list2 == null) return true
-    if (list1 == null) return false
-    if (list2 == null) return false
-
-    return list1.size == list2.size && list1.toSet() == list2.toSet()
-  }
-
-  fun equalFilters(list1:JsonFilter?, list2:JsonFilter?): Boolean {
-    if (list1 == null && list2 == null) return true
-    if (list1 == null) return false
-    if (list2 == null) return false
-
-    return equalsIgnoreOrder(list1.tags?.get("p"), list2.tags?.get("p"))
-        && equalsIgnoreOrder(list1.tags?.get("e"), list2.tags?.get("e"))
-  }
-
   override fun feed(): List<Note> {
-    return account.userProfile().taggedPosts
-      .filter { it.event != null }
-      .sortedBy { it.event!!.createdAt }
-      .reversed()
+    val set = account.userProfile().taggedPosts
+    val filtered = synchronized(set) {
+      set.filter { it.event != null }
+    }
+
+    return filtered.sortedBy { it.event!!.createdAt }.reversed()
   }
 
   override fun updateChannelFilters() {
-    val newFilter = createGlobalFilter()
-
-    if (!equalFilters(newFilter, notificationChannel.filter)) {
-      notificationChannel.filter = newFilter
-    }
+    notificationChannel.filter = listOf(createNotificationFilter()).ifEmpty { null }
   }
 }

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

@@ -9,9 +9,9 @@ import nostr.postr.JsonFilter
 import nostr.postr.events.TextNoteEvent
 
 object NostrSingleEventDataSource: NostrDataSource<Note>("SingleEventFeed") {
-  val eventsToWatch = Collections.synchronizedList(mutableListOf<String>())
+  private var eventsToWatch = setOf<String>()
 
-  fun createRepliesAndReactionsFilter(): JsonFilter? {
+  private fun createRepliesAndReactionsFilter(): JsonFilter? {
     val reactionsToWatch = eventsToWatch.map { it.substring(0, 8) }
 
     if (reactionsToWatch.isEmpty()) {
@@ -46,6 +46,7 @@ object NostrSingleEventDataSource: NostrDataSource<Note>("SingleEventFeed") {
 
     // downloads linked events to this event.
     return JsonFilter(
+      kinds = listOf(TextNoteEvent.kind, ReactionEvent.kind, RepostEvent.kind),
       ids = interestedEvents
     )
   }
@@ -60,17 +61,20 @@ object NostrSingleEventDataSource: NostrDataSource<Note>("SingleEventFeed") {
   }
 
   override fun updateChannelFilters() {
-    repliesAndReactionsChannel.filter = createRepliesAndReactionsFilter()
-    loadEventsChannel.filter = createLoadEventsIfNotLoadedFilter()
+    val reactions = createRepliesAndReactionsFilter()
+    val missing = createLoadEventsIfNotLoadedFilter()
+
+    repliesAndReactionsChannel.filter = listOfNotNull(reactions).ifEmpty { null }
+    loadEventsChannel.filter = listOfNotNull(missing).ifEmpty { null }
   }
 
   fun add(eventId: String) {
-    eventsToWatch.add(eventId)
-    resetFilters()
+    eventsToWatch = eventsToWatch.plus(eventId)
+    invalidateFilters()
   }
 
   fun remove(eventId: String) {
-    eventsToWatch.remove(eventId)
-    resetFilters()
+    eventsToWatch = eventsToWatch.minus(eventId)
+    invalidateFilters()
   }
 }

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

@@ -7,15 +7,18 @@ import nostr.postr.JsonFilter
 import nostr.postr.events.MetadataEvent
 
 object NostrSingleUserDataSource: NostrDataSource<Note>("SingleUserFeed") {
-  val usersToWatch = Collections.synchronizedList(mutableListOf<String>())
+  var usersToWatch = setOf<String>()
 
-  fun createUserFilter(): JsonFilter? {
+  fun createUserFilter(): List<JsonFilter>? {
     if (usersToWatch.isEmpty()) return null
 
-    return JsonFilter(
-      kinds = listOf(MetadataEvent.kind),
-      authors = usersToWatch.map { it.substring(0, 8) }
-    )
+    return usersToWatch.map {
+      JsonFilter(
+        kinds = listOf(MetadataEvent.kind),
+        authors = listOf(it.substring(0, 8)),
+        limit = 10
+      )
+    }
   }
 
   val userChannel = requestNewChannel()
@@ -31,12 +34,12 @@ object NostrSingleUserDataSource: NostrDataSource<Note>("SingleUserFeed") {
   }
 
   fun add(userId: String) {
-    usersToWatch.add(userId)
-    resetFilters()
+    usersToWatch = usersToWatch.plus(userId)
+    invalidateFilters()
   }
 
   fun remove(userId: String) {
-    usersToWatch.remove(userId)
-    resetFilters()
+    usersToWatch = usersToWatch.minus(userId)
+    invalidateFilters()
   }
 }

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

@@ -2,8 +2,11 @@ package com.vitorpamplona.amethyst.service
 
 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.service.model.ReactionEvent
+import com.vitorpamplona.amethyst.service.model.RepostEvent
 import java.util.Collections
 import nostr.postr.JsonFilter
+import nostr.postr.events.TextNoteEvent
 
 object NostrThreadDataSource: NostrDataSource<Note>("SingleThreadFeed") {
   val eventsToWatch = Collections.synchronizedList(mutableListOf<String>())
@@ -16,6 +19,7 @@ object NostrThreadDataSource: NostrDataSource<Note>("SingleThreadFeed") {
     }
 
     return JsonFilter(
+      kinds = listOf(TextNoteEvent.kind, ReactionEvent.kind, RepostEvent.kind),
       tags = mapOf("e" to reactionsToWatch)
     )
   }
@@ -46,8 +50,8 @@ object NostrThreadDataSource: NostrDataSource<Note>("SingleThreadFeed") {
   }
 
   override fun updateChannelFilters() {
-    repliesAndReactionsChannel.filter = createRepliesAndReactionsFilter()
-    loadEventsChannel.filter = createLoadEventsIfNotLoadedFilter()
+    repliesAndReactionsChannel.filter = listOfNotNull(createRepliesAndReactionsFilter()).ifEmpty { null }
+    loadEventsChannel.filter = listOfNotNull(createLoadEventsIfNotLoadedFilter()).ifEmpty { null }
   }
 
   fun loadThread(noteId: String) {

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

@@ -19,7 +19,7 @@ object NostrUserProfileDataSource: NostrDataSource<Note>("UserProfileFeed") {
     return JsonFilter(
       kinds = listOf(MetadataEvent.kind),
       authors = listOf(user!!.pubkeyHex),
-      since = System.currentTimeMillis() / 1000 - (60 * 60 * 24 * 7)
+      limit = 1
     )
   }
 
@@ -27,7 +27,7 @@ object NostrUserProfileDataSource: NostrDataSource<Note>("UserProfileFeed") {
     return JsonFilter(
       kinds = listOf(TextNoteEvent.kind),
       authors = listOf(user!!.pubkeyHex),
-      since = System.currentTimeMillis() / 1000 - (60 * 60 * 24 * 4)
+      limit = 100
     )
   }
 
@@ -35,11 +35,15 @@ object NostrUserProfileDataSource: NostrDataSource<Note>("UserProfileFeed") {
   val notesChannel = requestNewChannel()
 
   override fun feed(): List<Note> {
-    return user?.notes?.sortedBy { it.event?.createdAt }?.reversed() ?: emptyList()
+    val notes = user?.notes ?: return emptyList()
+    val sortedNotes = synchronized(notes) {
+      notes.sortedBy { it.event?.createdAt }
+    }
+    return sortedNotes.reversed()
   }
 
   override fun updateChannelFilters() {
-    userInfoChannel.filter = createUserInfoFilter()
-    notesChannel.filter = createUserPostsFilter()
+    userInfoChannel.filter = listOf(createUserInfoFilter()).ifEmpty { null }
+    notesChannel.filter = listOf(createUserPostsFilter()).ifEmpty { null }
   }
 }

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

@@ -15,17 +15,20 @@ object NostrUserProfileFollowersDataSource: NostrDataSource<User>("UserProfileFo
 
   fun createFollowersFilter() = JsonFilter(
     kinds = listOf(ContactListEvent.kind),
-    since = System.currentTimeMillis() / 1000 - (60 * 60 * 24 * 7), // 7 days
-    tags = mapOf("p" to listOf(user!!.pubkeyHex).filterNotNull())
+    tags = mapOf("p" to listOf(user!!.pubkeyHex))
   )
 
   val followerChannel = requestNewChannel()
 
   override fun feed(): List<User> {
-    return user?.followers?.toList() ?: emptyList()
+    val followers = user?.followers ?: emptyList()
+
+    return synchronized(followers) {
+      followers.toList()
+    }
   }
 
   override fun updateChannelFilters() {
-    followerChannel.filter = createFollowersFilter()
+    followerChannel.filter = listOf(createFollowersFilter()).ifEmpty { null }
   }
 }

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

@@ -17,7 +17,7 @@ object NostrUserProfileFollowsDataSource: NostrDataSource<User>("UserProfileFoll
     return JsonFilter(
       kinds = listOf(ContactListEvent.kind),
       authors = listOf(user!!.pubkeyHex),
-      since = System.currentTimeMillis() / 1000 - (60 * 60 * 24 * 7), // 4 days
+      limit = 1
     )
   }
 
@@ -28,6 +28,6 @@ object NostrUserProfileFollowsDataSource: NostrDataSource<User>("UserProfileFoll
   }
 
   override fun updateChannelFilters() {
-    followChannel.filter = createFollowFilter()
+    followChannel.filter = listOf(createFollowFilter()).ifEmpty { null }
   }
 }

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

@@ -0,0 +1,44 @@
+package com.vitorpamplona.amethyst.service.model
+
+import java.util.Date
+import nostr.postr.Utils
+import nostr.postr.events.Event
+import nostr.postr.events.MetadataEvent
+
+class ChannelCreateEvent (
+  id: ByteArray,
+  pubKey: ByteArray,
+  createdAt: Long,
+  tags: List<List<String>>,
+  content: String,
+  sig: ByteArray
+): Event(id, pubKey, createdAt, kind, tags, content, sig) {
+  @Transient val channelInfo: ChannelData
+
+  init {
+    try {
+      channelInfo = MetadataEvent.gson.fromJson(content, ChannelData::class.java)
+    } catch (e: Exception) {
+      throw Error("can't parse $content", e)
+    }
+  }
+
+  companion object {
+    const val kind = 40
+
+    fun create(channelInfo: ChannelData?, privateKey: ByteArray, createdAt: Long = Date().time / 1000): ChannelCreateEvent {
+      val content = if (channelInfo != null)
+        gson.toJson(channelInfo)
+      else
+        ""
+
+      val pubKey = Utils.pubkeyCreate(privateKey)
+      val tags = emptyList<List<String>>()
+      val id = generateId(pubKey, createdAt, kind, tags, content)
+      val sig = Utils.sign(id, privateKey)
+      return ChannelCreateEvent(id, pubKey, createdAt, tags, content, sig)
+    }
+  }
+
+  data class ChannelData(var name: String?, var about: String?, var picture: String?)
+}

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

@@ -0,0 +1,38 @@
+package com.vitorpamplona.amethyst.service.model
+
+import java.util.Date
+import nostr.postr.Utils
+import nostr.postr.events.Event
+import nostr.postr.toHex
+
+class ChannelHideMessageEvent (
+  id: ByteArray,
+  pubKey: ByteArray,
+  createdAt: Long,
+  tags: List<List<String>>,
+  content: String,
+  sig: ByteArray
+): Event(id, pubKey, createdAt, kind, tags, content, sig) {
+  @Transient val eventsToHide: List<String>
+
+  init {
+    eventsToHide = tags.filter { it.firstOrNull() == "e" }.mapNotNull { it.getOrNull(1) }
+  }
+
+  companion object {
+    const val kind = 43
+
+    fun create(reason: String, messagesToHide: List<String>?, mentions: List<String>?, privateKey: ByteArray, createdAt: Long = Date().time / 1000): ChannelHideMessageEvent {
+      val content = reason
+      val pubKey = Utils.pubkeyCreate(privateKey)
+      val tags =
+        messagesToHide?.map {
+          listOf("e", it)
+        } ?: emptyList()
+
+      val id = generateId(pubKey, createdAt, kind, tags, content)
+      val sig = Utils.sign(id, privateKey)
+      return ChannelHideMessageEvent(id, pubKey, createdAt, tags, content, sig)
+    }
+  }
+}

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

@@ -0,0 +1,47 @@
+package com.vitorpamplona.amethyst.service.model
+
+import java.util.Date
+import nostr.postr.Utils
+import nostr.postr.events.Event
+import nostr.postr.toHex
+
+class ChannelMessageEvent (
+  id: ByteArray,
+  pubKey: ByteArray,
+  createdAt: Long,
+  tags: List<List<String>>,
+  content: String,
+  sig: ByteArray
+): Event(id, pubKey, createdAt, kind, tags, content, sig) {
+  @Transient val channel: String?
+  @Transient val replyTos: List<String>
+  @Transient val mentions: List<String>
+
+  init {
+    channel = tags.firstOrNull { it[0] == "e" && it.size > 3 && it[3] == "root" }?.getOrNull(1) ?: tags.firstOrNull { it.firstOrNull() == "e" }?.getOrNull(1)
+    replyTos = tags.filter { it.firstOrNull() == "e" && (it.size < 3 || (it.size > 3 && it[3] != "root")) }.mapNotNull { it.getOrNull(1) }
+    mentions = tags.filter { it.firstOrNull() == "p" }.mapNotNull { it.getOrNull(1) }
+  }
+
+  companion object {
+    const val kind = 42
+
+    fun create(message: String, channel: String, replyTos: List<String>? = null, mentions: List<String>? = null, privateKey: ByteArray, createdAt: Long = Date().time / 1000): ChannelMessageEvent {
+      val content = message
+      val pubKey = Utils.pubkeyCreate(privateKey)
+      val tags = mutableListOf(
+        listOf("e", channel, "", "root")
+      )
+      replyTos?.forEach {
+        tags.add(listOf("e", it))
+      }
+      mentions?.forEach {
+        tags.add(listOf("p", it))
+      }
+
+      val id = generateId(pubKey, createdAt, kind, tags, content)
+      val sig = Utils.sign(id, privateKey)
+      return ChannelMessageEvent(id, pubKey, createdAt, tags, content, sig)
+    }
+  }
+}

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

@@ -0,0 +1,46 @@
+package com.vitorpamplona.amethyst.service.model
+
+import java.util.Date
+import nostr.postr.ContactMetaData
+import nostr.postr.Utils
+import nostr.postr.events.Event
+import nostr.postr.events.MetadataEvent
+import nostr.postr.toHex
+
+class ChannelMetadataEvent (
+  id: ByteArray,
+  pubKey: ByteArray,
+  createdAt: Long,
+  tags: List<List<String>>,
+  content: String,
+  sig: ByteArray
+): Event(id, pubKey, createdAt, kind, tags, content, sig) {
+  @Transient val channel: String?
+  @Transient val channelInfo: ChannelCreateEvent.ChannelData
+
+  init {
+    channel = tags.firstOrNull { it.firstOrNull() == "e" }?.getOrNull(1)
+    try {
+      channelInfo = MetadataEvent.gson.fromJson(content, ChannelCreateEvent.ChannelData::class.java)
+    } catch (e: Exception) {
+      throw Error("can't parse $content", e)
+    }
+  }
+
+  companion object {
+    const val kind = 41
+
+    fun create(newChannelInfo: ChannelCreateEvent.ChannelData?, originalChannelIdHex: String, privateKey: ByteArray, createdAt: Long = Date().time / 1000): ChannelMetadataEvent {
+      val content = if (newChannelInfo != null)
+        gson.toJson(newChannelInfo)
+      else
+        ""
+
+      val pubKey = Utils.pubkeyCreate(privateKey)
+      val tags = listOf( listOf("e", originalChannelIdHex, "", "root") )
+      val id = generateId(pubKey, createdAt, kind, tags, content)
+      val sig = Utils.sign(id, privateKey)
+      return ChannelMetadataEvent(id, pubKey, createdAt, tags, content, sig)
+    }
+  }
+}

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

@@ -0,0 +1,39 @@
+package com.vitorpamplona.amethyst.service.model
+
+import java.util.Date
+import nostr.postr.Utils
+import nostr.postr.events.Event
+import nostr.postr.events.MetadataEvent
+import nostr.postr.toHex
+
+class ChannelMuteUserEvent (
+  id: ByteArray,
+  pubKey: ByteArray,
+  createdAt: Long,
+  tags: List<List<String>>,
+  content: String,
+  sig: ByteArray
+): Event(id, pubKey, createdAt, kind, tags, content, sig) {
+  @Transient val usersToMute: List<String>
+
+  init {
+    usersToMute = tags.filter { it.firstOrNull() == "p" }.mapNotNull { it.getOrNull(1) }
+  }
+
+  companion object {
+    const val kind = 44
+
+    fun create(reason: String, usersToMute: List<String>?, privateKey: ByteArray, createdAt: Long = Date().time / 1000): ChannelMuteUserEvent {
+      val content = reason
+      val pubKey = Utils.pubkeyCreate(privateKey)
+      val tags =
+        usersToMute?.map {
+          listOf("p", it)
+        } ?: emptyList()
+
+      val id = generateId(pubKey, createdAt, kind, tags, content)
+      val sig = Utils.sign(id, privateKey)
+      return ChannelMuteUserEvent(id, pubKey, createdAt, tags, content, sig)
+    }
+  }
+}

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

@@ -25,8 +25,11 @@ class ReactionEvent (
   companion object {
     const val kind = 7
 
-    fun create(originalNote: Event, privateKey: ByteArray, createdAt: Long = Date().time / 1000): ReactionEvent {
-      val content = "+"
+    fun createLike(originalNote: Event, privateKey: ByteArray, createdAt: Long = Date().time / 1000): ReactionEvent {
+      return create("+", originalNote, privateKey, createdAt)
+    }
+
+    fun create(content: String, originalNote: Event, privateKey: ByteArray, createdAt: Long = Date().time / 1000): ReactionEvent {
       val pubKey = Utils.pubkeyCreate(privateKey)
       val tags = listOf( listOf("e", originalNote.id.toHex()), listOf("p", originalNote.pubKey.toHex()))
       val id = generateId(pubKey, createdAt, kind, tags, content)

app/src/main/java/com/vitorpamplona/amethyst/service/relays/Client.kt

@@ -23,9 +23,9 @@ object Client: RelayPool.Listener {
      *        something.
      **/
     var lenient: Boolean = false
-    private val listeners = Collections.synchronizedSet(HashSet<Listener>())
-    internal var relays = Constants.defaultRelays
-    internal val subscriptions = ConcurrentHashMap<String, MutableList<JsonFilter>>()
+    private var listeners = setOf<Listener>()
+    private var relays = Constants.defaultRelays
+    private val subscriptions = mutableMapOf<String, List<JsonFilter>>()
 
     fun connect(
         relays: Array<Relay> = Constants.defaultRelays
@@ -35,17 +35,9 @@ object Client: RelayPool.Listener {
         this.relays = relays
     }
 
-    fun requestAndWatch(
-        subscriptionId: String = UUID.randomUUID().toString().substring(0..10),
-        filters: MutableList<JsonFilter> = mutableListOf(JsonFilter())
-    ) {
-        subscriptions[subscriptionId] = filters
-        RelayPool.requestAndWatch()
-    }
-
     fun sendFilter(
         subscriptionId: String = UUID.randomUUID().toString().substring(0..10),
-        filters: MutableList<JsonFilter> = mutableListOf(JsonFilter())
+        filters: List<JsonFilter> = listOf(JsonFilter())
     ) {
         subscriptions[subscriptionId] = filters
         RelayPool.sendFilter(subscriptionId)
@@ -53,10 +45,10 @@ object Client: RelayPool.Listener {
 
     fun sendFilterOnlyIfDisconnected(
         subscriptionId: String = UUID.randomUUID().toString().substring(0..10),
-        filters: MutableList<JsonFilter> = mutableListOf(JsonFilter())
+        filters: List<JsonFilter> = listOf(JsonFilter())
     ) {
         subscriptions[subscriptionId] = filters
-        RelayPool.sendFilterOnlyIfDisconnected(subscriptionId)
+        RelayPool.sendFilterOnlyIfDisconnected()
     }
 
     fun send(signedEvent: Event) {
@@ -90,13 +82,22 @@ object Client: RelayPool.Listener {
     }
 
     fun subscribe(listener: Listener) {
-        listeners.add(listener)
+        listeners = listeners.plus(listener)
     }
 
-    fun unsubscribe(listener: Listener): Boolean {
-        return listeners.remove(listener)
+    fun unsubscribe(listener: Listener) {
+        listeners = listeners.minus(listener)
     }
 
+    fun allSubscriptions(): List<String> {
+        return synchronized(subscriptions) {
+            subscriptions.keys.toList()
+        }
+    }
+
+    fun getSubscriptionFilters(subId: String): List<JsonFilter> {
+        return subscriptions[subId] ?: emptyList()
+    }
 
     abstract class Listener {
         /**

app/src/main/java/com/vitorpamplona/amethyst/service/relays/Relay.kt

@@ -1,8 +1,6 @@
 package com.vitorpamplona.amethyst.service.relays
 
 import com.google.gson.JsonElement
-import java.util.Collections
-import nostr.postr.JsonFilter
 import nostr.postr.events.Event
 import okhttp3.OkHttpClient
 import okhttp3.Request
@@ -16,27 +14,29 @@ class Relay(
     var write: Boolean = true
 ) {
     private val httpClient = OkHttpClient()
-    private val listeners = Collections.synchronizedSet(HashSet<Listener>())
+    private var listeners = setOf<Listener>()
     private var socket: WebSocket? = null
 
     fun register(listener: Listener) {
-        listeners.add(listener)
+        listeners = listeners.plus(listener)
+    }
+
+    fun unregister(listener: Listener) {
+        listeners = listeners.minus(listener)
     }
 
     fun isConnected(): Boolean {
         return socket != null
     }
 
-    fun unregister(listener: Listener) = listeners.remove(listener)
-
-    fun requestAndWatch(reconnectTs: Long? = null) {
+    fun requestAndWatch() {
         val request = Request.Builder().url(url).build()
         val listener = object : WebSocketListener() {
 
             override fun onOpen(webSocket: WebSocket, response: Response) {
                 // Sends everything.
-                Client.subscriptions.forEach {
-                    sendFilter(requestId = it.key, reconnectTs = reconnectTs)
+                Client.allSubscriptions().forEach {
+                    sendFilter(requestId = it)
                 }
                 listeners.forEach { it.onRelayStateChange(this@Relay, Type.CONNECT) }
             }
@@ -101,28 +101,22 @@ class Relay(
         socket?.close(1000, "Normal close")
     }
 
-    fun sendFilter(requestId: String, reconnectTs: Long? = null) {
+    fun sendFilter(requestId: String) {
         if (socket == null) {
-            requestAndWatch(reconnectTs)
+            requestAndWatch()
         } else {
-            val filters = if (reconnectTs != null) {
-                Client.subscriptions[requestId]?.let {
-                    it.map { filter ->
-                        JsonFilter(filter.ids, filter.authors, filter.kinds, filter.tags, since = reconnectTs)
-                    }
-                } ?: error("No filter(s) found.")
-            } else {
-                Client.subscriptions[requestId] ?: error("No filter(s) found.")
+            val filters = Client.getSubscriptionFilters(requestId)
+            if (filters.isNotEmpty()) {
+                val request = """["REQ","$requestId",${filters.joinToString(",") { it.toJson() }}]"""
+                //println("FILTERSSENT " + """["REQ","$requestId",${filters.joinToString(",") { it.toJson() }}]""")
+                socket!!.send(request)
             }
-            val request = """["REQ","$requestId",${filters.joinToString(",") { it.toJson() }}]"""
-            //println("FILTERSSENT " + """["REQ","$requestId",${filters.joinToString(",") { it.toJson() }}]""")
-            socket!!.send(request)
         }
     }
 
-    fun sendFilterOnlyIfDisconnected(requestId: String, reconnectTs: Long? = null) {
+    fun sendFilterOnlyIfDisconnected() {
         if (socket == null) {
-            requestAndWatch(reconnectTs)
+            requestAndWatch()
         }
     }
 

app/src/main/java/com/vitorpamplona/amethyst/service/relays/RelayPool.kt

@@ -9,8 +9,8 @@ import nostr.postr.events.Event
  * RelayPool manages the connection to multiple Relays and lets consumers deal with simple events.
  */
 object RelayPool: Relay.Listener {
-    private val relays = Collections.synchronizedList(ArrayList<Relay>())
-    private val listeners = Collections.synchronizedSet(HashSet<Listener>())
+    private var relays = listOf<Relay>()
+    private var listeners = setOf<Listener>()
 
     fun availableRelays(): Int {
         return relays.size
@@ -29,7 +29,8 @@ object RelayPool: Relay.Listener {
     }
 
     fun unloadRelays() {
-        relays.toList().forEach { removeRelay(it) }
+        relays.forEach { it.unregister(this) }
+        relays = listOf()
     }
 
     fun requestAndWatch() {
@@ -40,8 +41,8 @@ object RelayPool: Relay.Listener {
         relays.forEach { it.sendFilter(subscriptionId) }
     }
 
-    fun sendFilterOnlyIfDisconnected(subscriptionId: String) {
-        relays.forEach { it.sendFilterOnlyIfDisconnected(subscriptionId) }
+    fun sendFilterOnlyIfDisconnected() {
+        relays.forEach { it.sendFilterOnlyIfDisconnected() }
     }
 
     fun send(signedEvent: Event) {
@@ -61,19 +62,17 @@ object RelayPool: Relay.Listener {
         relays += relay
     }
 
-    fun removeRelay(relay: Relay): Boolean {
+    fun removeRelay(relay: Relay) {
         relay.unregister(this)
-        return relays.remove(relay)
+        relays = relays.minus(relay)
     }
 
-    fun getRelays(): List<Relay> = relays
-
     fun register(listener: Listener) {
-        listeners.add(listener)
+        listeners = listeners.plus(listener)
     }
 
-    fun unregister(listener: Listener): Boolean {
-        return listeners.remove(listener)
+    fun unregister(listener: Listener) {
+        listeners = listeners.minus(listener)
     }
 
     interface Listener {

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

@@ -1,5 +1,6 @@
 package com.vitorpamplona.amethyst.ui
 
+import android.os.Build.VERSION.SDK_INT
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
@@ -8,8 +9,14 @@ import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Surface
 import androidx.compose.ui.Modifier
 import androidx.lifecycle.viewmodel.compose.viewModel
+import coil.Coil
+import coil.ImageLoader
+import coil.decode.GifDecoder
+import coil.decode.ImageDecoderDecoder
+import coil.decode.SvgDecoder
 import com.vitorpamplona.amethyst.KeyStorage
 import com.vitorpamplona.amethyst.service.NostrAccountDataSource
+import com.vitorpamplona.amethyst.service.NostrChannelDataSource
 import com.vitorpamplona.amethyst.service.NostrChatroomListDataSource
 import com.vitorpamplona.amethyst.service.NostrGlobalDataSource
 import com.vitorpamplona.amethyst.service.NostrHomeDataSource
@@ -29,6 +36,17 @@ class MainActivity : ComponentActivity() {
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
 
+    Coil.setImageLoader {
+      ImageLoader.Builder(this).components {
+        if (SDK_INT >= 28) {
+          add(ImageDecoderDecoder.Factory())
+        } else {
+          add(GifDecoder.Factory())
+        }
+        add(SvgDecoder.Factory())
+      }.build()
+    }
+
     setContent {
       AmethystTheme {
         // A surface container using the 'background' color from the theme
@@ -54,6 +72,7 @@ class MainActivity : ComponentActivity() {
   override fun onPause() {
     NostrAccountDataSource.stop()
     NostrHomeDataSource.stop()
+    NostrChannelDataSource.stop()
     NostrChatroomListDataSource.stop()
     NostrUserProfileDataSource.stop()
     NostrUserProfileFollowersDataSource.stop()

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

@@ -0,0 +1,123 @@
+package com.vitorpamplona.amethyst.ui.actions
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.OutlinedTextField
+import androidx.compose.material.Surface
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.text.input.KeyboardCapitalization
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.window.Dialog
+import androidx.compose.ui.window.DialogProperties
+import androidx.lifecycle.viewmodel.compose.viewModel
+import com.vitorpamplona.amethyst.model.Account
+import com.vitorpamplona.amethyst.model.Channel
+import com.vitorpamplona.amethyst.ui.screen.AccountStateViewModel
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
+
+@Composable
+fun NewChannelView(onClose: () -> Unit, account: Account, accountStateViewModel: AccountStateViewModel, channel: Channel? = null) {
+    val postViewModel: NewChannelViewModel = viewModel()
+
+    postViewModel.load(account, channel, accountStateViewModel)
+
+    Dialog(
+        onDismissRequest = { onClose() },
+        properties = DialogProperties(
+            dismissOnClickOutside = false
+        )
+    ) {
+        Surface(
+        ) {
+            Column(
+                modifier = Modifier.padding(10.dp)
+            ) {
+                Row(
+                    modifier = Modifier
+                        .fillMaxWidth(),
+                    horizontalArrangement = Arrangement.SpaceBetween,
+                    verticalAlignment = Alignment.CenterVertically
+                ) {
+                    CloseButton(onCancel = {
+                        postViewModel.clear()
+                        onClose()
+                    })
+
+                    PostButton(
+                        onPost = {
+                            postViewModel.create()
+                            onClose()
+                        },
+                        postViewModel.channelName.value.text.isNotBlank()
+                    )
+                }
+
+                Spacer(modifier = Modifier.height(15.dp))
+
+                OutlinedTextField(
+                    label = { Text(text = "Channel Name") },
+                    modifier = Modifier.fillMaxWidth(),
+                    value = postViewModel.channelName.value,
+                    onValueChange = { postViewModel.channelName.value = it },
+                    placeholder = {
+                        Text(
+                            text = "My Awesome Group",
+                            color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                        )
+                    },
+                    keyboardOptions = KeyboardOptions.Default.copy(
+                        capitalization = KeyboardCapitalization.Sentences
+                    )
+                )
+
+                Spacer(modifier = Modifier.height(15.dp))
+
+                OutlinedTextField(
+                    label = { Text(text = "Picture Url") },
+                    modifier = Modifier.fillMaxWidth(),
+                    value = postViewModel.channelPicture.value,
+                    onValueChange = { postViewModel.channelPicture.value = it },
+                    placeholder = {
+                        Text(
+                            text = "http://mygroup.com/logo.jpg",
+                            color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                        )
+                    }
+                )
+
+                Spacer(modifier = Modifier.height(15.dp))
+
+                OutlinedTextField(
+                    label = { Text(text = "Description") },
+                    modifier = Modifier.fillMaxWidth().height(100.dp),
+                    value = postViewModel.channelDescription.value,
+                    onValueChange = { postViewModel.channelDescription.value = it },
+                    placeholder = {
+                        Text(
+                            text = "About us.. ",
+                            color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                        )
+                    },
+                    keyboardOptions = KeyboardOptions.Default.copy(
+                        capitalization = KeyboardCapitalization.Sentences
+                    ),
+                    maxLines = 10
+
+                )
+            }
+        }
+    }
+
+
+
+}

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

@@ -0,0 +1,56 @@
+package com.vitorpamplona.amethyst.ui.actions
+
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.ui.text.input.TextFieldValue
+import androidx.lifecycle.ViewModel
+import com.vitorpamplona.amethyst.model.Account
+import com.vitorpamplona.amethyst.model.Channel
+import com.vitorpamplona.amethyst.ui.screen.AccountStateViewModel
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
+
+class NewChannelViewModel: ViewModel() {
+    private var account: Account? = null
+    private var originalChannel: Channel? = null
+    private var accountStateViewModel: AccountStateViewModel? = null
+
+    val channelName = mutableStateOf(TextFieldValue())
+    val channelPicture = mutableStateOf(TextFieldValue())
+    val channelDescription = mutableStateOf(TextFieldValue())
+
+
+    fun load(account: Account, channel: Channel?, accountStateViewModel: AccountStateViewModel) {
+        this.accountStateViewModel = accountStateViewModel
+        this.account = account
+        if (channel != null) {
+            originalChannel = channel
+            channelName.value = TextFieldValue(channel.info.name ?: "")
+            channelPicture.value = TextFieldValue(channel.info.picture ?: "")
+            channelDescription.value = TextFieldValue(channel.info.about ?: "")
+        }
+    }
+
+    fun create() {
+        if (originalChannel == null)
+            this.account?.sendCreateNewChannel(
+                channelName.value.text,
+                channelDescription.value.text,
+                channelPicture.value.text,
+                accountStateViewModel!!
+            )
+        else
+            this.account?.sendChangeChannel(
+                channelName.value.text,
+                channelDescription.value.text,
+                channelPicture.value.text,
+                originalChannel!!
+            )
+
+        clear()
+    }
+
+    fun clear() {
+        channelName.value = TextFieldValue()
+        channelPicture.value = TextFieldValue()
+        channelDescription.value = TextFieldValue()
+    }
+}

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

@@ -3,14 +3,19 @@ package com.vitorpamplona.amethyst.ui.actions
 import androidx.compose.foundation.border
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material.Button
 import androidx.compose.material.ButtonDefaults
+import androidx.compose.material.Icon
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.OutlinedTextField
 import androidx.compose.material.Surface
@@ -29,29 +34,35 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalSoftwareKeyboardController
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.input.KeyboardCapitalization
 import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
 import androidx.compose.ui.window.Dialog
 import androidx.compose.ui.window.DialogProperties
 import androidx.lifecycle.viewmodel.compose.viewModel
 import coil.compose.AsyncImage
+import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.ui.components.UrlPreview
+import com.vitorpamplona.amethyst.ui.components.VideoView
 import com.vitorpamplona.amethyst.ui.components.imageExtension
+import com.vitorpamplona.amethyst.ui.components.isValidURL
+import com.vitorpamplona.amethyst.ui.components.noProtocolUrlValidator
+import com.vitorpamplona.amethyst.ui.components.videoExtension
 import com.vitorpamplona.amethyst.ui.navigation.UploadFromGallery
+import com.vitorpamplona.amethyst.ui.note.ReplyInformation
+import com.vitorpamplona.amethyst.ui.screen.UserLine
 import kotlinx.coroutines.delay
 import nostr.postr.events.TextNoteEvent
 
 
 @OptIn(ExperimentalComposeUiApi::class)
 @Composable
-fun NewPostView(onClose: () -> Unit, replyingTo: Note? = null, account: Account) {
-    val postViewModel: NewPostViewModel = viewModel<NewPostViewModel>().apply {
-        this.replyingTo = replyingTo
-        this.account = account
-    }
+fun NewPostView(onClose: () -> Unit, baseReplyTo: Note? = null, account: Account) {
+    val postViewModel: NewPostViewModel = viewModel()
+
+    postViewModel.load(account, baseReplyTo)
 
     val context = LocalContext.current
 
@@ -99,30 +110,20 @@ fun NewPostView(onClose: () -> Unit, replyingTo: Note? = null, account: Account)
                             postViewModel.sendPost()
                             onClose()
                         },
-                        postViewModel.message.isNotBlank()
+                        postViewModel.message.text.isNotBlank()
                     )
                 }
 
-                if (replyingTo != null && replyingTo.event is TextNoteEvent) {
-                    Row(
-                        verticalAlignment = Alignment.CenterVertically,
-                    ) {
-                        val replyList = replyingTo.replyTo!!.plus(replyingTo).joinToString(", ",  "", "", 2) { it.idDisplayHex }
-                        val withList = replyingTo.mentions!!.plus(replyingTo.author!!).joinToString(", ",  "", "", 2) { it.toBestDisplayName() }
-
-                        Text(
-                            "in reply to ${replyList} with ${withList}",
-                            fontSize = 13.sp,
-                            color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
-                        )
+                if (postViewModel.replyTos != null && baseReplyTo?.event is TextNoteEvent) {
+                    ReplyInformation(postViewModel.replyTos, postViewModel.mentions, "✖ ") {
+                        postViewModel.removeFromReplyList(it)
                     }
                 }
 
                 OutlinedTextField(
                     value = postViewModel.message,
                     onValueChange = {
-                        postViewModel.message = it
-                        postViewModel.urlPreview = postViewModel.findUrlInMessage()
+                        postViewModel.updateMessage(it)
                     },
                     keyboardOptions = KeyboardOptions.Default.copy(
                         capitalization = KeyboardCapitalization.Sentences
@@ -150,30 +151,53 @@ fun NewPostView(onClose: () -> Unit, replyingTo: Note? = null, account: Account)
                         .outlinedTextFieldColors(
                             unfocusedBorderColor = Color.Transparent,
                             focusedBorderColor = Color.Transparent
-                        )
+                        ),
+                    visualTransformation = UrlUserTagTransformation(MaterialTheme.colors.primary)
                 )
 
+                val userSuggestions = postViewModel.userSuggestions
+                if (userSuggestions.isNotEmpty()) {
+                    LazyColumn(
+                        contentPadding = PaddingValues(
+                            top = 10.dp,
+                            bottom = 10.dp
+                        )
+                    ) {
+                        itemsIndexed(userSuggestions, key = { _, item -> item.pubkeyHex }) { index, item ->
+                            UserLine(item) {
+                                postViewModel.autocompleteWithUser(item)
+                            }
+                        }
+                    }
+                }
+
                 val myUrlPreview = postViewModel.urlPreview
                 if (myUrlPreview != null) {
                     Column(modifier = Modifier.padding(top = 5.dp)) {
-                        val removedParamsFromUrl = myUrlPreview.split("?")[0].toLowerCase()
-                        if (imageExtension.matcher(removedParamsFromUrl).matches()) {
-                            AsyncImage(
-                                model = myUrlPreview,
-                                contentDescription = myUrlPreview,
-                                contentScale = ContentScale.FillWidth,
-                                modifier = Modifier
-                                    .padding(top = 4.dp)
-                                    .fillMaxWidth()
-                                    .clip(shape = RoundedCornerShape(15.dp))
-                                    .border(
-                                        1.dp,
-                                        MaterialTheme.colors.onSurface.copy(alpha = 0.12f),
-                                        RoundedCornerShape(15.dp)
-                                    )
-                            )
-                        } else {
-                            UrlPreview("https://$myUrlPreview", myUrlPreview, false)
+                        if (isValidURL(myUrlPreview)) {
+                            val removedParamsFromUrl = myUrlPreview.split("?")[0].toLowerCase()
+                            if (imageExtension.matcher(removedParamsFromUrl).matches()) {
+                                AsyncImage(
+                                    model = myUrlPreview,
+                                    contentDescription = myUrlPreview,
+                                    contentScale = ContentScale.FillWidth,
+                                    modifier = Modifier
+                                        .padding(top = 4.dp)
+                                        .fillMaxWidth()
+                                        .clip(shape = RoundedCornerShape(15.dp))
+                                        .border(
+                                            1.dp,
+                                            MaterialTheme.colors.onSurface.copy(alpha = 0.12f),
+                                            RoundedCornerShape(15.dp)
+                                        )
+                                )
+                            } else if (videoExtension.matcher(removedParamsFromUrl).matches()) {
+                                VideoView(myUrlPreview)
+                            } else {
+                                UrlPreview(myUrlPreview, myUrlPreview)
+                            }
+                        } else if (noProtocolUrlValidator.matcher(myUrlPreview).matches()) {
+                            UrlPreview("https://$myUrlPreview", myUrlPreview)
                         }
                     }
                 }
@@ -199,8 +223,9 @@ fun CloseButton(onCancel: () -> Unit) {
 }
 
 @Composable
-fun PostButton(onPost: () -> Unit = {}, isActive: Boolean) {
+fun PostButton(onPost: () -> Unit = {}, isActive: Boolean, modifier: Modifier = Modifier) {
     Button(
+        modifier = modifier,
         onClick = {
             if (isActive) {
                 onPost()
@@ -215,3 +240,46 @@ fun PostButton(onPost: () -> Unit = {}, isActive: Boolean) {
         Text(text = "Post", color = Color.White)
     }
 }
+
+@Composable
+fun CreateButton(onPost: () -> Unit = {}, isActive: Boolean, modifier: Modifier = Modifier) {
+    Button(
+        modifier = modifier,
+        onClick = {
+            if (isActive) {
+                onPost()
+            }
+        },
+        shape = RoundedCornerShape(20.dp),
+        colors = ButtonDefaults
+            .buttonColors(
+                backgroundColor = if (isActive) MaterialTheme.colors.primary else Color.Gray
+            )
+    ) {
+        Text(text = "Create", color = Color.White)
+    }
+}
+
+@Composable
+fun SearchButton(onPost: () -> Unit = {}, isActive: Boolean, modifier: Modifier = Modifier) {
+    Button(
+        modifier = modifier,
+        onClick = {
+            if (isActive) {
+                onPost()
+            }
+        },
+        shape = RoundedCornerShape(20.dp),
+        colors = ButtonDefaults
+            .buttonColors(
+                backgroundColor = if (isActive) MaterialTheme.colors.primary else Color.Gray
+            )
+    ) {
+        Icon(
+            painter = painterResource(R.drawable.ic_search),
+            null,
+            modifier = Modifier.size(26.dp),
+            tint = Color.White
+        )
+    }
+}

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

@@ -8,22 +8,89 @@ import android.provider.MediaStore
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
+import androidx.compose.ui.text.TextRange
+import androidx.compose.ui.text.input.TextFieldValue
 import androidx.lifecycle.ViewModel
 import com.vitorpamplona.amethyst.model.Account
+import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.model.User
+import com.vitorpamplona.amethyst.model.decodePublicKey
 import com.vitorpamplona.amethyst.ui.components.isValidURL
 import com.vitorpamplona.amethyst.ui.components.noProtocolUrlValidator
+import nostr.postr.toNpub
 
 class NewPostViewModel: ViewModel() {
-    var account: Account? = null
-    var replyingTo: Note? = null
+    private var account: Account? = null
+    private var originalNote: Note? = null
 
-    var message by mutableStateOf("")
+    var mentions by mutableStateOf<List<User>?>(null)
+    var replyTos by mutableStateOf<MutableList<Note>?>(null)
+
+    var message by mutableStateOf(TextFieldValue(""))
     var urlPreview by mutableStateOf<String?>(null)
 
+    var userSuggestions by mutableStateOf<List<User>>(emptyList())
+    var userSuggestionAnchor: TextRange? = null
+
+    fun load(account: Account, replyingTo: Note?) {
+        originalNote = replyingTo
+        replyingTo?.let { replyNote ->
+            this.replyTos = (replyNote.replyTo ?: mutableListOf()).plus(replyNote).toMutableList()
+            replyNote.author?.let { replyUser ->
+                this.mentions = (replyNote.mentions ?: emptyList()).plus(replyUser)
+            }
+        }
+        this.account = account
+    }
+
+    fun addUserToMentionsIfNotInAndReturnIndex(user: User): Int {
+        val replyToSize = replyTos?.size ?: 0
+
+        var myMentions = mentions
+        if (myMentions == null) {
+            mentions = listOf(user)
+            return replyToSize + 0 // position of the user
+        }
+
+        val index = myMentions.indexOf(user)
+
+        if (index >= 0) return replyToSize + index
+
+        myMentions = myMentions.plus(user)
+        mentions = myMentions
+        return replyToSize + myMentions.indexOf(user)
+    }
+
     fun sendPost() {
-        account?.sendPost(message, replyingTo)
-        message = ""
+        // Moves @npub to mentions
+        val newMessage = message.text.split('\n').map { paragraph: String ->
+            paragraph.split(' ').map { word: String ->
+                try {
+                    if (word.startsWith("@npub") && word.length >= 64) {
+                        val keyB32 = word.substring(0, 64)
+                        val restOfWord = word.substring(64)
+
+                        val key = decodePublicKey(keyB32.removePrefix("@"))
+                        val user = LocalCache.getOrCreateUser(key)
+
+                        val index = addUserToMentionsIfNotInAndReturnIndex(user)
+
+                        val newWord = "#[${index}]"
+
+                        newWord + restOfWord
+                    } else {
+                        word
+                    }
+                } catch (e: Exception) {
+                    // if it can't parse the key, don't try to change.
+                    word
+                }
+            }.joinToString(" ")
+        }.joinToString("\n")
+
+        account?.sendPost(newMessage, originalNote, mentions)
+        message = TextFieldValue("")
         urlPreview = null
     }
 
@@ -36,22 +103,56 @@ class NewPostViewModel: ViewModel() {
 
         img?.let {
             ImageUploader.uploadImage(img) {
-                message = message + "\n\n" + it
+                message = TextFieldValue(message.text + "\n\n" + it)
                 urlPreview = findUrlInMessage()
             }
         }
     }
 
     fun cancel() {
-        message = ""
+        message = TextFieldValue("")
         urlPreview = null
     }
 
     fun findUrlInMessage(): String? {
-        return message.split('\n').firstNotNullOfOrNull { paragraph ->
+        return message.text.split('\n').firstNotNullOfOrNull { paragraph ->
             paragraph.split(' ').firstOrNull { word: String ->
                 isValidURL(word) || noProtocolUrlValidator.matcher(word).matches()
             }
         }
     }
+
+    fun removeFromReplyList(it: User) {
+        mentions = mentions?.minus(it)
+    }
+
+    fun updateMessage(it: TextFieldValue) {
+        message = it
+        urlPreview = findUrlInMessage()
+
+        if (it.selection.collapsed) {
+            val lastWord = it.text.substring(0, it.selection.end).substringAfterLast("\n").substringAfterLast(" ")
+            userSuggestionAnchor = it.selection
+            if (lastWord.startsWith("@") && lastWord.length > 2) {
+                userSuggestions = LocalCache.findUsersStartingWith(lastWord.removePrefix("@"))
+            } else {
+                userSuggestions = emptyList()
+            }
+        }
+    }
+
+    fun autocompleteWithUser(item: User) {
+        userSuggestionAnchor?.let {
+            val lastWord = message.text.substring(0, it.end).substringAfterLast("\n").substringAfterLast(" ")
+            val lastWordStart = it.end - lastWord.length
+            val wordToInsert = "@${item.pubkey.toNpub()} "
+
+            message = TextFieldValue(
+                message.text.replaceRange(lastWordStart, it.end, wordToInsert),
+                TextRange(lastWordStart + wordToInsert.length, lastWordStart + wordToInsert.length)
+            )
+            userSuggestionAnchor = null
+            userSuggestions = emptyList()
+        }
+    }
 }

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

@@ -0,0 +1,143 @@
+package com.vitorpamplona.amethyst.ui.actions
+
+import android.util.Patterns
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.SpanStyle
+import androidx.compose.ui.text.TextRange
+import androidx.compose.ui.text.buildAnnotatedString
+import androidx.compose.ui.text.input.OffsetMapping
+import androidx.compose.ui.text.input.TransformedText
+import androidx.compose.ui.text.input.VisualTransformation
+import androidx.compose.ui.text.style.TextDecoration
+import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.model.decodePublicKey
+import kotlin.math.roundToInt
+
+data class RangesChanges(val original: TextRange, val modified: TextRange)
+
+class UrlUserTagTransformation(val color: Color) : VisualTransformation {
+  override fun filter(text: AnnotatedString): TransformedText {
+    return buildAnnotatedStringWithUrlHighlighting(text, color)
+  }
+}
+
+fun buildAnnotatedStringWithUrlHighlighting(text: AnnotatedString, color: Color): TransformedText {
+    val substitutions = mutableListOf<RangesChanges>()
+
+    val newText = buildAnnotatedString {
+      val builderBefore = StringBuilder() // important to correctly measure Tag start and end
+      val builderAfter = StringBuilder() // important to correctly measure Tag start and end
+      append(
+        text.split('\n').map { paragraph: String ->
+          paragraph.split(' ').map { word: String ->
+            try {
+              if (word.startsWith("@npub") && word.length >= 64) {
+                val keyB32 = word.substring(0, 64)
+                val restOfWord = word.substring(64)
+
+                val startIndex = builderBefore.toString().length
+
+                builderBefore.append("$keyB32$restOfWord ") // accounts for the \n at the end of each paragraph
+
+                val endIndex = startIndex + keyB32.length
+
+                val key = decodePublicKey(keyB32.removePrefix("@"))
+                val user = LocalCache.getOrCreateUser(key)
+
+                val newWord = "@${user.toBestDisplayName()}"
+                val startNew = builderAfter.toString().length
+
+                builderAfter.append("$newWord$restOfWord ") // accounts for the \n at the end of each paragraph
+
+                substitutions.add(
+                  RangesChanges(
+                    TextRange(startIndex, endIndex),
+                    TextRange(startNew, startNew + newWord.length)
+                  )
+                )
+                newWord + restOfWord
+              } else {
+                builderBefore.append(word + " ")
+                builderAfter.append(word + " ")
+                word
+              }
+            } catch (e: Exception) {
+              // if it can't parse the key, don't try to change.
+              builderBefore.append(word + " ")
+              builderAfter.append(word + " ")
+              word
+            }
+          }.joinToString(" ")
+        }.joinToString("\n")
+      )
+
+      val newText = toAnnotatedString()
+
+      newText.split("\\s+".toRegex()).filter { word ->
+        Patterns.WEB_URL.matcher(word).matches()
+      }.forEach {
+        val startIndex = text.indexOf(it)
+        val endIndex = startIndex + it.length
+        addStyle(
+          style = SpanStyle(
+            color = color,
+            textDecoration = TextDecoration.None
+          ),
+          start = startIndex, end = endIndex
+        )
+      }
+
+      substitutions.forEach {
+        addStyle(
+          style = SpanStyle(
+            color = color,
+            textDecoration = TextDecoration.None
+          ),
+          start = it.modified.start, end = it.modified.end
+        )
+      }
+    }
+
+    val numberOffsetTranslator = object : OffsetMapping {
+        override fun originalToTransformed(offset: Int): Int {
+          val inInsideRange = substitutions.filter { offset > it.original.start && offset < it.original.end }.firstOrNull()
+
+          if (inInsideRange != null) {
+            val percentInRange = (offset - inInsideRange.original.start) / (inInsideRange.original.length.toFloat())
+            return (inInsideRange.modified.start + inInsideRange.modified.length * percentInRange).roundToInt()
+          }
+
+          val lastRangeThrough = substitutions.lastOrNull { offset >= it.original.end }
+
+          if (lastRangeThrough != null) {
+            return lastRangeThrough.modified.end + (offset - lastRangeThrough.original.end)
+          } else {
+            return offset
+          }
+        }
+
+        override fun transformedToOriginal(offset: Int): Int {
+          val inInsideRange = substitutions.filter { offset > it.modified.start && offset < it.modified.end }.firstOrNull()
+
+          if (inInsideRange != null) {
+            val percentInRange = (offset - inInsideRange.modified.start) / (inInsideRange.modified.length.toFloat())
+            return (inInsideRange.original.start + inInsideRange.original.length * percentInRange).roundToInt()
+          }
+
+          val lastRangeThrough = substitutions.lastOrNull { offset >= it.modified.end }
+
+          if (lastRangeThrough != null) {
+            return lastRangeThrough.original.end + (offset - lastRangeThrough.modified.end)
+          } else {
+            return offset
+          }
+        }
+    }
+
+    return TransformedText(
+      newText,
+      numberOffsetTranslator
+    )
+
+}

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

@@ -0,0 +1,53 @@
+package com.vitorpamplona.amethyst.buttons
+
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.material.ButtonDefaults
+import androidx.compose.material.Icon
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.OutlinedButton
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.Add
+import androidx.compose.material.icons.outlined.Visibility
+import androidx.compose.material.icons.outlined.VisibilityOff
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.unit.dp
+import com.vitorpamplona.amethyst.R
+import com.vitorpamplona.amethyst.model.Account
+import com.vitorpamplona.amethyst.ui.actions.NewChannelView
+import com.vitorpamplona.amethyst.ui.actions.NewPostView
+import com.vitorpamplona.amethyst.ui.screen.AccountStateViewModel
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
+
+@Composable
+fun NewChannelButton(account: Account, accountStateViewModel: AccountStateViewModel) {
+    var wantsToPost by remember {
+        mutableStateOf(false)
+    }
+
+    if (wantsToPost)
+        NewChannelView({ wantsToPost = false }, account = account, accountStateViewModel)
+
+    OutlinedButton(
+        onClick = { wantsToPost = true },
+        modifier = Modifier.size(55.dp),
+        shape = CircleShape,
+        colors = ButtonDefaults.outlinedButtonColors(backgroundColor = MaterialTheme.colors.primary),
+        contentPadding = PaddingValues(0.dp),
+    ) {
+        Icon(
+            imageVector = Icons.Outlined.Add,
+            contentDescription = "New Channel",
+            modifier = Modifier.size(26.dp),
+            tint = Color.White
+        )
+    }
+}

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

@@ -0,0 +1,38 @@
+package com.vitorpamplona.amethyst.ui.components
+
+import android.content.ActivityNotFoundException
+import android.content.Context
+import android.content.Intent
+import androidx.compose.foundation.text.ClickableText
+import androidx.compose.material.LocalTextStyle
+import androidx.compose.material.MaterialTheme
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalUriHandler
+import androidx.compose.ui.text.AnnotatedString
+
+@Composable
+fun ClickableEmail(email: String) {
+  val context = LocalContext.current
+
+  ClickableText(
+    text = AnnotatedString("$email "),
+    onClick = { runCatching { context.sendMail(email) } },
+    style = LocalTextStyle.current.copy(color = MaterialTheme.colors.primary),
+  )
+}
+
+fun Context.sendMail(to: String, subject: String? = null) {
+  try {
+    val intent = Intent(Intent.ACTION_SEND)
+    intent.type = "vnd.android.cursor.item/email" // or "message/rfc822"
+    intent.putExtra(Intent.EXTRA_EMAIL, arrayOf(to))
+    if (subject != null)
+      intent.putExtra(Intent.EXTRA_SUBJECT, subject)
+    startActivity(intent)
+  } catch (e: ActivityNotFoundException) {
+    // TODO: Handle case where no email app is available
+  } catch (t: Throwable) {
+    // TODO: Handle potential other type of exceptions
+  }
+}

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

@@ -0,0 +1,26 @@
+package com.vitorpamplona.amethyst.ui.components
+
+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.getValue
+import androidx.compose.runtime.livedata.observeAsState
+import androidx.compose.ui.text.AnnotatedString
+import androidx.navigation.NavController
+import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.model.toNote
+import com.vitorpamplona.amethyst.ui.note.toShortenHex
+
+@Composable
+fun ClickableNoteTag(
+  note: Note,
+  navController: NavController
+) {
+  val innerNoteState by note.live.observeAsState()
+  ClickableText(
+    text = AnnotatedString("@${innerNoteState?.note?.id?.toNote()?.toShortenHex()} "),
+    onClick = { navController.navigate("Note/${innerNoteState?.note?.idHex}") },
+    style = LocalTextStyle.current.copy(color = MaterialTheme.colors.primary)
+  )
+}

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

@@ -0,0 +1,33 @@
+package com.vitorpamplona.amethyst.ui.components
+
+import android.content.ActivityNotFoundException
+import android.content.Context
+import android.content.Intent
+import android.net.Uri
+import androidx.compose.foundation.text.ClickableText
+import androidx.compose.material.LocalTextStyle
+import androidx.compose.material.MaterialTheme
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalUriHandler
+import androidx.compose.ui.text.AnnotatedString
+
+@Composable
+fun ClickablePhone(phone: String) {
+  val context = LocalContext.current
+
+  ClickableText(
+    text = AnnotatedString("$phone "),
+    onClick = { runCatching { context.dial(phone) } },
+    style = LocalTextStyle.current.copy(color = MaterialTheme.colors.primary),
+  )
+}
+
+fun Context.dial(phone: String) {
+  try {
+    val intent = Intent(Intent.ACTION_DIAL, Uri.fromParts("tel", phone, null))
+    startActivity(intent)
+  } catch (t: Throwable) {
+    // TODO: Handle potential exceptions
+  }
+}

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

@@ -0,0 +1,19 @@
+package com.vitorpamplona.amethyst.ui.components
+
+import androidx.compose.foundation.text.ClickableText
+import androidx.compose.material.LocalTextStyle
+import androidx.compose.material.MaterialTheme
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.platform.LocalUriHandler
+import androidx.compose.ui.text.AnnotatedString
+
+@Composable
+fun ClickableUrl(urlText: String, url: String) {
+  val uri = LocalUriHandler.current
+
+  ClickableText(
+    text = AnnotatedString("$urlText "),
+    onClick = { runCatching { uri.openUri(url) } },
+    style = LocalTextStyle.current.copy(color = MaterialTheme.colors.primary),
+  )
+}

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

@@ -0,0 +1,24 @@
+package com.vitorpamplona.amethyst.ui.components
+
+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.getValue
+import androidx.compose.runtime.livedata.observeAsState
+import androidx.compose.ui.text.AnnotatedString
+import androidx.navigation.NavController
+import com.vitorpamplona.amethyst.model.User
+
+@Composable
+fun ClickableUserTag(
+  user: User,
+  navController: NavController
+) {
+  val innerUserState by user.live.observeAsState()
+  ClickableText(
+    text = AnnotatedString("@${innerUserState?.user?.toBestDisplayName()} "),
+    onClick = { navController.navigate("User/${innerUserState?.user?.pubkeyHex}") },
+    style = LocalTextStyle.current.copy(color = MaterialTheme.colors.primary)
+  )
+}

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

@@ -27,6 +27,7 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.core.content.ContextCompat.startActivity
 import com.vitorpamplona.amethyst.R
+import com.vitorpamplona.amethyst.lnurl.LnInvoiceUtil
 
 @Composable
 fun InvoicePreview(lnInvoice: String) {

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

@@ -3,29 +3,23 @@ package com.vitorpamplona.amethyst.ui.components
 import android.util.Patterns
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.text.ClickableText
-import androidx.compose.material.LocalTextStyle
-import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.livedata.observeAsState
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.unit.dp
 import androidx.navigation.NavController
 import com.google.accompanist.flowlayout.FlowRow
+import com.vitorpamplona.amethyst.lnurl.LnInvoiceUtil
 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.Note
-import com.vitorpamplona.amethyst.model.toNote
-import com.vitorpamplona.amethyst.ui.note.toDisplayHex
+import com.vitorpamplona.amethyst.ui.note.toShortenHex
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import java.net.MalformedURLException
 import java.net.URISyntaxException
 import java.net.URL
 import java.util.regex.Pattern
 
-val imageExtension = Pattern.compile("(.*/)*.+\\.(png|jpg|gif|bmp|jpeg|webp)$")
+val imageExtension = Pattern.compile("(.*/)*.+\\.(png|jpg|gif|bmp|jpeg|webp|svg)$")
 val videoExtension = Pattern.compile("(.*/)*.+\\.(mp4|avi|wmv|mpg|amv|webm)$")
 val noProtocolUrlValidator = Pattern.compile("^[-a-zA-Z0-9@:%._\\+~#=]{1,256}\\.[a-zA-Z0-9()]{1,6}\\b(?:[-a-zA-Z0-9()@:%_\\+.~#?&//=]*)$")
 val tagIndex = Pattern.compile(".*\\#\\[([0-9]+)\\].*")
@@ -60,12 +54,16 @@ fun RichTextViewer(content: String, tags: List<List<String>>?, note: Note, accou
           } else if (isValidURL(word)) {
             val removedParamsFromUrl = word.split("?")[0].toLowerCase()
             if (imageExtension.matcher(removedParamsFromUrl).matches()) {
-              ExtendedImageView(word)
+              ZoomableImageView(word)
             } else if (videoExtension.matcher(removedParamsFromUrl).matches()) {
               VideoView(word)
             } else {
               UrlPreview(word, word)
             }
+          } else if (Patterns.EMAIL_ADDRESS.matcher(word).matches()) {
+            ClickableEmail(word)
+          } else if (Patterns.PHONE.matcher(word).matches()) {
+            ClickablePhone(word)
           } else if (noProtocolUrlValidator.matcher(word).matches()) {
             UrlPreview("https://$word", word)
           } else if (tagIndex.matcher(word).matches() && tags != null) {
@@ -100,22 +98,19 @@ fun TagLink(word: String, tags: List<List<String>>, navController: NavController
     if (tags[index][0] == "p") {
       val user = LocalCache.users[tags[index][1]]
       if (user != null) {
-        val innerUserState by user.live.observeAsState()
-        Text(
-          "@${innerUserState?.user?.toBestDisplayName()} "
-        )
+        ClickableUserTag(user, navController)
+      } else {
+        Text(text = "${tags[index][1].toShortenHex()} ")
       }
     } else if (tags[index][0] == "e") {
       val note = LocalCache.notes[tags[index][1]]
       if (note != null) {
-        val innerNoteState by note.live.observeAsState()
-        ClickableText(
-          text = AnnotatedString("@${innerNoteState?.note?.id?.toNote()?.toDisplayHex()} "),
-          onClick = { navController.navigate("Note/${note.idHex}") },
-          style = LocalTextStyle.current.copy(color = MaterialTheme.colors.primary)
-        )
+        ClickableNoteTag(note, navController)
+      } else {
+        Text(text = "${tags[index][1].toShortenHex()} ")
       }
     } else
       Text(text = "$word ")
   }
-}
+}
+

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

@@ -1,45 +1,21 @@
 package com.vitorpamplona.amethyst.ui.components
 
 import androidx.compose.animation.Crossfade
-import androidx.compose.foundation.border
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.foundation.text.ClickableText
-import androidx.compose.material.LocalTextStyle
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
-import androidx.compose.ui.ExperimentalComposeUiApi
-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.LocalUriHandler
-import androidx.compose.ui.text.AnnotatedString
-import androidx.compose.ui.text.style.TextOverflow
-import androidx.compose.ui.unit.dp
-import coil.compose.AsyncImage
 import com.baha.url.preview.IUrlPreviewCallback
 import com.baha.url.preview.UrlInfoItem
 import com.vitorpamplona.amethyst.model.UrlCachedPreviewer
 
 
-@OptIn(ExperimentalComposeUiApi::class)
 @Composable
 fun UrlPreview(url: String, urlText: String, showUrlIfError: Boolean = true) {
   var urlPreviewState by remember { mutableStateOf<UrlPreviewState>(UrlPreviewState.Loading) }
 
-  val uri = LocalUriHandler.current
-
   // Doesn't use a viewModel because of viewModel reusing issues (too many UrlPreview are created).
   LaunchedEffect(url) {
     UrlCachedPreviewer.previewInfo(url, object : IUrlPreviewCallback {
@@ -59,50 +35,15 @@ fun UrlPreview(url: String, urlText: String, showUrlIfError: Boolean = true) {
   Crossfade(targetState = urlPreviewState) { state ->
     when (state) {
       is UrlPreviewState.Loaded -> {
-        Row(
-          modifier = Modifier.clickable { runCatching { uri.openUri(url) } }
-            .clip(shape = RoundedCornerShape(15.dp))
-            .border(1.dp, MaterialTheme.colors.onSurface.copy(alpha = 0.12f), RoundedCornerShape(15.dp))
-        ) {
-          Column {
-            AsyncImage(
-              model = state.previewInfo.image,
-              contentDescription = "Profile Image",
-              contentScale = ContentScale.FillWidth,
-              modifier = Modifier.fillMaxWidth()
-            )
-
-            Text(
-              text = state.previewInfo.title,
-              style = MaterialTheme.typography.body2,
-              modifier = Modifier.fillMaxWidth().padding(start = 10.dp, end = 10.dp, top= 10.dp),
-              maxLines = 1,
-              overflow = TextOverflow.Ellipsis
-            )
-
-            Text(
-              text = state.previewInfo.description,
-              style = MaterialTheme.typography.caption,
-              modifier = Modifier
-                .fillMaxWidth()
-                .padding(start = 10.dp, end = 10.dp, bottom = 10.dp),
-              color = Color.Gray,
-              maxLines = 3,
-              overflow = TextOverflow.Ellipsis
-            )
-          }
-        }
+        UrlPreviewCard(url, state.previewInfo)
       }
       else -> {
         if (showUrlIfError) {
-          ClickableText(
-            text = AnnotatedString("$urlText "),
-            onClick = { runCatching { uri.openUri(url) } },
-            style = LocalTextStyle.current.copy(color = MaterialTheme.colors.primary),
-          )
+          ClickableUrl(urlText, url)
         }
       }
     }
   }
 
-}
+}
+

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

@@ -0,0 +1,66 @@
+package com.vitorpamplona.amethyst.ui.components
+
+import androidx.compose.foundation.border
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+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.LocalUriHandler
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.dp
+import coil.compose.AsyncImage
+import com.baha.url.preview.UrlInfoItem
+
+@Composable
+fun UrlPreviewCard(
+  url: String,
+  previewInfo: UrlInfoItem
+) {
+  val uri = LocalUriHandler.current
+
+  Row(
+    modifier = Modifier
+      .clickable { runCatching { uri.openUri(url) } }
+      .clip(shape = RoundedCornerShape(15.dp))
+      .border(1.dp, MaterialTheme.colors.onSurface.copy(alpha = 0.12f), RoundedCornerShape(15.dp))
+  ) {
+    Column {
+      AsyncImage(
+        model = previewInfo.image,
+        contentDescription = "Profile Image",
+        contentScale = ContentScale.FillWidth,
+        modifier = Modifier.fillMaxWidth()
+      )
+
+      Text(
+        text = previewInfo.title,
+        style = MaterialTheme.typography.body2,
+        modifier = Modifier
+          .fillMaxWidth()
+          .padding(start = 10.dp, end = 10.dp, top = 10.dp),
+        maxLines = 1,
+        overflow = TextOverflow.Ellipsis
+      )
+
+      Text(
+        text = previewInfo.description,
+        style = MaterialTheme.typography.caption,
+        modifier = Modifier
+          .fillMaxWidth()
+          .padding(start = 10.dp, end = 10.dp, bottom = 10.dp),
+        color = Color.Gray,
+        maxLines = 3,
+        overflow = TextOverflow.Ellipsis
+      )
+    }
+  }
+}

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

@@ -44,7 +44,6 @@ fun ZoomableAsyncImage(imageUrl: String) {
                 }
             }
     ) {
-
         AsyncImage(
             model = imageUrl,
             contentDescription = "Profile Image",

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

@@ -1,7 +1,9 @@
 package com.vitorpamplona.amethyst.ui.components
 
+import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.border
 import androidx.compose.foundation.clickable
+import androidx.compose.foundation.combinedClickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
@@ -21,15 +23,20 @@ import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.platform.LocalClipboardManager
+import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.Dialog
 import androidx.compose.ui.window.DialogProperties
 import coil.compose.AsyncImage
 import com.vitorpamplona.amethyst.ui.actions.CloseButton
+import nostr.postr.toNpub
 
 @Composable
-@OptIn(ExperimentalComposeUiApi::class)
-fun ExtendedImageView(word: String) {
+@OptIn(ExperimentalComposeUiApi::class, ExperimentalFoundationApi::class)
+fun ZoomableImageView(word: String) {
+  val clipboardManager = LocalClipboardManager.current
+
   // store the dialog open or close state
   var dialogOpen by remember {
     mutableStateOf(false)
@@ -44,8 +51,9 @@ fun ExtendedImageView(word: String) {
       .fillMaxWidth()
       .clip(shape = RoundedCornerShape(15.dp))
       .border(1.dp, MaterialTheme.colors.onSurface.copy(alpha = 0.12f), RoundedCornerShape(15.dp))
-      .clickable(
-        onClick = { dialogOpen = true }
+      .combinedClickable(
+        onClick = { dialogOpen = true },
+        onLongClick = { clipboardManager.setText(AnnotatedString(word)) },
       )
   )
 

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

@@ -4,16 +4,18 @@ import androidx.compose.runtime.Composable
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
+import com.vitorpamplona.amethyst.ui.screen.AccountStateViewModel
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 
 @Composable
 fun AppNavigation(
     navController: NavHostController,
-    accountViewModel: AccountViewModel
+    accountViewModel: AccountViewModel,
+    accountStateViewModel: AccountStateViewModel
 ) {
     NavHost(navController, startDestination = Route.Home.route) {
         Routes.forEach {
-            composable(it.route, it.arguments, content = it.buildScreen(accountViewModel, navController))
+            composable(it.route, it.arguments, content = it.buildScreen(accountViewModel, accountStateViewModel, navController))
         }
     }
 }

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

@@ -31,6 +31,19 @@ import androidx.lifecycle.viewmodel.compose.viewModel
 import androidx.navigation.NavHostController
 import coil.compose.AsyncImage
 import com.vitorpamplona.amethyst.R
+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.NostrHomeDataSource
+import com.vitorpamplona.amethyst.service.NostrNotificationDataSource
+import com.vitorpamplona.amethyst.service.NostrSingleEventDataSource
+import com.vitorpamplona.amethyst.service.NostrSingleUserDataSource
+import com.vitorpamplona.amethyst.service.NostrThreadDataSource
+import com.vitorpamplona.amethyst.service.NostrUserProfileDataSource
+import com.vitorpamplona.amethyst.service.NostrUserProfileFollowersDataSource
+import com.vitorpamplona.amethyst.service.NostrUserProfileFollowsDataSource
 import com.vitorpamplona.amethyst.service.relays.Client
 import com.vitorpamplona.amethyst.ui.screen.RelayPoolViewModel
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
@@ -38,13 +51,10 @@ import kotlinx.coroutines.launch
 
 @Composable
 fun AppTopBar(navController: NavHostController, scaffoldState: ScaffoldState, accountViewModel: AccountViewModel) {
-
-
     when (currentRoute(navController)) {
         //Route.Profile.route -> TopBarWithBackButton(navController)
         else -> MainTopBar(scaffoldState, accountViewModel)
     }
-
 }
 
 @Composable
@@ -71,20 +81,36 @@ fun MainTopBar(scaffoldState: ScaffoldState, accountViewModel: AccountViewModel)
                 ) {
                     IconButton(
                         onClick = {
-                            Client.subscriptions.map { "${it.key} ${it.value.joinToString { it.toJson() }}" }.forEach {
+                            Client.allSubscriptions().map { "${it} ${Client.getSubscriptionFilters(it).joinToString { it.toJson() }}" }.forEach {
                                 Log.d("CURRENT FILTERS", it)
                             }
+
+                            NostrAccountDataSource.printCounter()
+                            NostrChannelDataSource.printCounter()
+                            NostrChatRoomDataSource.printCounter()
+                            NostrChatroomListDataSource.printCounter()
+
+                            NostrGlobalDataSource.printCounter()
+                            NostrHomeDataSource.printCounter()
+                            NostrNotificationDataSource.printCounter()
+
+                            NostrSingleEventDataSource.printCounter()
+                            NostrSingleUserDataSource.printCounter()
+                            NostrThreadDataSource.printCounter()
+
+                            NostrUserProfileDataSource.printCounter()
+                            NostrUserProfileFollowersDataSource.printCounter()
+                            NostrUserProfileFollowsDataSource.printCounter()
                         }
                     ) {
                         Icon(
-                            painter = painterResource(R.drawable.ic_amethyst),
+                            painter = painterResource(R.drawable.amethyst),
                             null,
-                            modifier = Modifier.size(32.dp),
-                            tint = MaterialTheme.colors.primary
+                            modifier = Modifier.size(40.dp),
+                            tint = Color.Unspecified
                         )
                     }
                 }
-
             },
             navigationIcon = {
                 IconButton(

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

@@ -49,7 +49,10 @@ fun DrawerContent(navController: NavHostController,
                   accountViewModel: AccountViewModel,
                   accountStateViewModel: AccountStateViewModel) {
 
-    val accountUserState by accountViewModel.userLiveData.observeAsState()
+    val accountState by accountViewModel.accountLiveData.observeAsState()
+    val account = accountState?.account ?: return
+
+    val accountUserState by account.userProfile().live.observeAsState()
     val accountUser = accountUserState?.user
 
     Surface(
@@ -64,14 +67,18 @@ fun DrawerContent(navController: NavHostController,
                         model = banner,
                         contentDescription = "Profile Image",
                         contentScale = ContentScale.FillWidth,
-                        modifier = Modifier.fillMaxWidth().height(150.dp)
+                        modifier = Modifier
+                            .fillMaxWidth()
+                            .height(150.dp)
                     )
                 } else {
                     Image(
                         painter = painterResource(R.drawable.profile_banner),
                         contentDescription = "Profile Banner",
                         contentScale = ContentScale.FillWidth,
-                        modifier = Modifier.fillMaxWidth().height(150.dp)
+                        modifier = Modifier
+                            .fillMaxWidth()
+                            .height(150.dp)
                     )
                 }
 
@@ -106,12 +113,15 @@ fun DrawerContent(navController: NavHostController,
 fun ProfileContent(accountUser: User?, modifier: Modifier = Modifier, scaffoldState: ScaffoldState, navController: NavController) {
     val coroutineScope = rememberCoroutineScope()
 
+    println("AAA " + accountUser?.profilePicture())
+
     Column(modifier = modifier) {
         AsyncImage(
             model = accountUser?.profilePicture() ?: "https://robohash.org/ohno.png",
             contentDescription = "Profile Image",
             modifier = Modifier
-                .width(100.dp).height(100.dp)
+                .width(100.dp)
+                .height(100.dp)
                 .clip(shape = CircleShape)
                 .border(3.dp, MaterialTheme.colors.background, CircleShape)
                 .background(MaterialTheme.colors.background)
@@ -205,7 +215,8 @@ fun NavigationRow(navController: NavHostController, scaffoldState: ScaffoldState
         })
     ) {
         Row(
-            modifier = Modifier.fillMaxWidth()
+            modifier = Modifier
+                .fillMaxWidth()
                 .padding(vertical = 15.dp, horizontal = 25.dp),
             verticalAlignment = Alignment.CenterVertically
         ) {

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

@@ -10,6 +10,8 @@ import androidx.navigation.NavType
 import androidx.navigation.compose.currentBackStackEntryAsState
 import androidx.navigation.navArgument
 import com.vitorpamplona.amethyst.R
+import com.vitorpamplona.amethyst.ui.screen.AccountStateViewModel
+import com.vitorpamplona.amethyst.ui.screen.ChannelScreen
 import com.vitorpamplona.amethyst.ui.screen.ChatroomListScreen
 import com.vitorpamplona.amethyst.ui.screen.ChatroomScreen
 import com.vitorpamplona.amethyst.ui.screen.HomeScreen
@@ -24,26 +26,31 @@ sealed class Route(
     val route: String,
     val icon: Int,
     val arguments: List<NamedNavArgument> = emptyList(),
-    val buildScreen: (AccountViewModel, NavController) -> @Composable (NavBackStackEntry) -> Unit
+    val buildScreen: (AccountViewModel, AccountStateViewModel, NavController) -> @Composable (NavBackStackEntry) -> Unit
 ) {
-    object Home : Route("Home", R.drawable.ic_home, buildScreen = { acc, nav -> { _ -> HomeScreen(acc, nav) } })
-    object Search : Route("Search", R.drawable.ic_search, buildScreen = { acc, nav -> { _ -> SearchScreen(acc, nav) }})
-    object Notification : Route("Notification", R.drawable.ic_notifications,buildScreen = { acc, nav -> { _ -> NotificationScreen(acc, nav) }})
-    object Message : Route("Message", R.drawable.ic_dm, buildScreen = { acc, nav -> { _ -> ChatroomListScreen(acc, nav) }})
+    object Home : Route("Home", R.drawable.ic_home, buildScreen = { acc, accSt, nav -> { _ -> HomeScreen(acc, nav) } })
+    object Search : Route("Search", R.drawable.ic_search, buildScreen = { acc, accSt, nav -> { _ -> SearchScreen(acc, nav) }})
+    object Notification : Route("Notification", R.drawable.ic_notifications,buildScreen = { acc, accSt, nav -> { _ -> NotificationScreen(acc, nav) }})
+    object Message : Route("Message", R.drawable.ic_dm, buildScreen = { acc, accSt, nav -> { _ -> ChatroomListScreen(acc, nav) }})
 
     object Profile : Route("User/{id}", R.drawable.ic_profile,
         arguments = listOf(navArgument("id") { type = NavType.StringType } ),
-        buildScreen = { acc, nav -> { ProfileScreen(it.arguments?.getString("id"), acc, nav) }}
+        buildScreen = { acc, accSt, nav -> { ProfileScreen(it.arguments?.getString("id"), acc, nav) }}
     )
 
     object Note : Route("Note/{id}", R.drawable.ic_moments,
         arguments = listOf(navArgument("id") { type = NavType.StringType } ),
-        buildScreen = { acc, nav -> { ThreadScreen(it.arguments?.getString("id"), acc, nav) }}
+        buildScreen = { acc, accSt, nav -> { ThreadScreen(it.arguments?.getString("id"), acc, nav) }}
     )
 
     object Room : Route("Room/{id}", R.drawable.ic_moments,
         arguments = listOf(navArgument("id") { type = NavType.StringType } ),
-        buildScreen = { acc, nav -> { ChatroomScreen(it.arguments?.getString("id"), acc, nav) }}
+        buildScreen = { acc, accSt, nav -> { ChatroomScreen(it.arguments?.getString("id"), acc, nav) }}
+    )
+
+    object Channel : Route("Channel/{id}", R.drawable.ic_moments,
+        arguments = listOf(navArgument("id") { type = NavType.StringType } ),
+        buildScreen = { acc, accSt, nav -> { ChannelScreen(it.arguments?.getString("id"), acc, accSt, nav) }}
     )
 }
 
@@ -57,7 +64,8 @@ val Routes = listOf(
     //drawer
     Route.Profile,
     Route.Note,
-    Route.Room
+    Route.Room,
+    Route.Channel
 )
 
 @Composable

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

@@ -1,6 +1,7 @@
 package com.vitorpamplona.amethyst.ui.note
 
 import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.height
@@ -16,11 +17,14 @@ 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.text.font.FontWeight
+import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import androidx.navigation.NavController
 import coil.compose.AsyncImage
 import com.vitorpamplona.amethyst.model.Note
-import com.vitorpamplona.amethyst.ui.components.RichTextViewer
+import com.vitorpamplona.amethyst.service.model.ChannelCreateEvent
+import com.vitorpamplona.amethyst.service.model.ChannelMetadataEvent
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 
 @Composable
@@ -33,6 +37,34 @@ fun ChatroomCompose(baseNote: Note, accountViewModel: AccountViewModel, navContr
 
     if (note?.event == null) {
         BlankNote(Modifier)
+    } else if (note.channel != null) {
+        val authorState by note.author!!.live.observeAsState()
+        val author = authorState?.user
+
+        val channelState by note.channel!!.live.observeAsState()
+        val channel = channelState?.channel
+
+        val description = if (note.event is ChannelCreateEvent) {
+            "Channel created"
+        } else if (note.event is ChannelMetadataEvent) {
+            "Channel Information changed to "
+        } else {
+            note.event?.content
+        }
+        channel?.let {
+            ChannelName(
+                channelPicture = it.profilePicture(),
+                channelTitle = {
+                    Text(
+                        "${it.info.name}",
+                        fontWeight = FontWeight.Bold
+                    )
+                },
+                channelLastTime = note.event?.createdAt,
+                channelLastContent = "${author?.toBestDisplayName()}: " + description,
+                onClick = { navController.navigate("Channel/${it.idHex}") })
+        }
+
     } else {
         val authorState by note.author!!.live.observeAsState()
         val author = authorState?.user
@@ -50,50 +82,77 @@ fun ChatroomCompose(baseNote: Note, accountViewModel: AccountViewModel, navContr
             }
         }
 
-        Column(modifier =
-            Modifier.clickable(
-                    onClick = { navController.navigate("Room/${userToComposeOn?.pubkeyHex}") }
-            )
+        userToComposeOn?.let {
+            ChannelName(
+                channelPicture = it.profilePicture(),
+                channelTitle = { UsernameDisplay(it) },
+                channelLastTime = note.event?.createdAt,
+                channelLastContent = accountViewModel.decrypt(note),
+                onClick = { navController.navigate("Room/${it.pubkeyHex}") })
+        }
+    }
+
+}
+
+@Composable
+fun ChannelName(
+    channelPicture: String,
+    channelTitle: @Composable () -> Unit,
+    channelLastTime: Long?,
+    channelLastContent: String?,
+    onClick: () -> Unit
+) {
+    Column(modifier = Modifier.clickable(onClick = onClick) ) {
+        Row(
+            modifier = Modifier.padding(start = 12.dp, end = 12.dp, top = 10.dp)
         ) {
-            Row(
+
+            AsyncImage(
+                model = channelPicture,
+                contentDescription = "Profile Image",
                 modifier = Modifier
-                    .padding(
-                        start = 12.dp,
-                        end = 12.dp,
-                        top = 10.dp)
-            ) {
+                    .width(55.dp)
+                    .height(55.dp)
+                    .clip(shape = CircleShape)
+            )
 
-                AsyncImage(
-                    model = userToComposeOn?.profilePicture(),
-                    contentDescription = "Profile Image",
-                    modifier = Modifier
-                        .width(55.dp).height(55.dp)
-                        .clip(shape = CircleShape)
-                )
-
-                Column(modifier = Modifier.padding(start = 10.dp)) {
-                    Row(verticalAlignment = Alignment.CenterVertically) {
-                        if (userToComposeOn != null)
-                            UserDisplay(userToComposeOn)
+            Column(modifier = Modifier.padding(start = 10.dp),
+            verticalArrangement = Arrangement.SpaceAround) {
+                Row(
+                    verticalAlignment = Alignment.CenterVertically,
+                    modifier = Modifier.padding(bottom = 4.dp)
+                ) {
+                    channelTitle()
 
+                    channelLastTime?.let {
                         Text(
-                            timeAgo(note.event?.createdAt),
-                            color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                            timeAgo(channelLastTime),
+                            color = MaterialTheme.colors.onSurface.copy(alpha = 0.52f)
                         )
                     }
 
-                    val eventContent = accountViewModel.decrypt(note)
-                    if (eventContent != null)
-                        RichTextViewer(eventContent.take(100), note.event?.tags, note, accountViewModel, navController)
-                    else
-                        RichTextViewer("Referenced event not found", note.event?.tags, note, accountViewModel, navController)
                 }
-            }
 
-            Divider(
-                modifier = Modifier.padding(top = 10.dp),
-                thickness = 0.25.dp
-            )
+                if (channelLastContent != null)
+                    Text(
+                        channelLastContent,
+                        color = MaterialTheme.colors.onSurface.copy(alpha = 0.52f),
+                        maxLines = 1,
+                        overflow = TextOverflow.Ellipsis
+                    )
+                else
+                    Text(
+                        "Referenced event not found",
+                        color = MaterialTheme.colors.onSurface.copy(alpha = 0.52f),
+                        maxLines = 1,
+                        overflow = TextOverflow.Ellipsis
+                    )
+            }
         }
+
+        Divider(
+            modifier = Modifier.padding(top = 10.dp),
+            thickness = 0.25.dp
+        )
     }
 }

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

@@ -1,10 +1,19 @@
 package com.vitorpamplona.amethyst.ui.note
 
+import androidx.compose.foundation.ExperimentalFoundationApi
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.combinedClickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.layout.widthIn
+import androidx.compose.foundation.layout.wrapContentWidth
+import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Surface
@@ -12,19 +21,30 @@ import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.livedata.observeAsState
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.Shape
+import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
 import androidx.navigation.NavController
+import coil.compose.AsyncImage
 import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.service.model.ChannelCreateEvent
+import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
+import com.vitorpamplona.amethyst.service.model.ChannelMetadataEvent
 import com.vitorpamplona.amethyst.ui.components.RichTextViewer
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 
-val ChatBubbleShapeMe = RoundedCornerShape(20.dp, 20.dp, 3.dp, 20.dp)
-val ChatBubbleShapeThem = RoundedCornerShape(20.dp, 20.dp, 20.dp, 3.dp)
+val ChatBubbleShapeMe = RoundedCornerShape(15.dp, 15.dp, 3.dp, 15.dp)
+val ChatBubbleShapeThem = RoundedCornerShape(3.dp, 15.dp, 15.dp, 15.dp)
 
+@OptIn(ExperimentalFoundationApi::class)
 @Composable
 fun ChatroomMessageCompose(baseNote: Note, accountViewModel: AccountViewModel, navController: NavController) {
     val noteState by baseNote.live.observeAsState()
@@ -33,82 +53,141 @@ fun ChatroomMessageCompose(baseNote: Note, accountViewModel: AccountViewModel, n
     val accountUserState by accountViewModel.userLiveData.observeAsState()
     val accountUser = accountUserState?.user
 
+    var popupExpanded by remember { mutableStateOf(false) }
+
     if (note?.event == null) {
         BlankNote(Modifier)
     } else {
         val authorState by note.author!!.live.observeAsState()
         val author = authorState?.user
 
+        var backgroundBubbleColor: Color
+        var alignment: Arrangement.Horizontal
+        var shape: Shape
+
+        if (author == accountUser) {
+            backgroundBubbleColor = MaterialTheme.colors.primary.copy(alpha = 0.32f)
+            alignment = Arrangement.End
+            shape = ChatBubbleShapeMe
+        } else {
+            backgroundBubbleColor = MaterialTheme.colors.onSurface.copy(alpha = 0.12f)
+            alignment = Arrangement.Start
+            shape = ChatBubbleShapeThem
+        }
+
         Column() {
-            var backgroundBubbleColor: Color
-            var alignment: Arrangement.Horizontal
-            var shape: Shape
-
-            if (author == accountUser) {
-                backgroundBubbleColor = MaterialTheme.colors.primary.copy(alpha = 0.32f)
-                alignment = Arrangement.End
-                shape = ChatBubbleShapeMe
-            } else {
-                backgroundBubbleColor = MaterialTheme.colors.onSurface.copy(alpha = 0.12f)
-                alignment = Arrangement.Start
-                shape = ChatBubbleShapeThem
-            }
-
             Row(
-                horizontalArrangement = alignment,
-                modifier = Modifier.fillMaxWidth()
-                    .padding(
-                        start = 12.dp,
-                        end = 12.dp,
-                        top = 10.dp)
+                modifier = Modifier.fillMaxWidth(1f).padding(
+                    start = 12.dp,
+                    end = 12.dp,
+                    top = 5.dp,
+                    bottom = 5.dp
+                ),
+                horizontalArrangement = alignment
             ) {
-
                 Row(
-                    verticalAlignment = Alignment.CenterVertically
+                    horizontalArrangement = alignment,
+                    modifier = Modifier.fillMaxWidth(0.85f)
                 ) {
+
                     Surface(
                         color = backgroundBubbleColor,
-                        shape = shape
+                        shape = shape,
+                        modifier = Modifier
+                            .combinedClickable(
+                                onClick = { },
+                                onLongClick = { popupExpanded = true }
+                            )
                     ) {
                         Column(
-                            modifier = Modifier.padding(10.dp),
+                            modifier = Modifier.padding(start = 10.dp, end = 10.dp, bottom = 5.dp),
                         ) {
-                            Row(
-                                verticalAlignment = Alignment.CenterVertically
-                            ) {
-                                val eventContent = accountViewModel.decrypt(note)
 
-                                if (eventContent != null)
-                                    RichTextViewer(
-                                        eventContent,
-                                        note.event?.tags,
-                                        note,
-                                        accountViewModel,
-                                        navController
-                                    )
-                                else
-                                    RichTextViewer(
-                                        "Could Not decrypt the message",
-                                        note.event?.tags,
-                                        note,
-                                        accountViewModel,
-                                        navController
+                            if (author != accountUser && note.event is ChannelMessageEvent) {
+                                Row(
+                                    verticalAlignment = Alignment.CenterVertically,
+                                    horizontalArrangement = alignment,
+                                    modifier = Modifier.padding(top = 5.dp)
+                                ) {
+                                    AsyncImage(
+                                        model = author?.profilePicture(),
+                                        contentDescription = "Profile Image",
+                                        modifier = Modifier
+                                            .width(25.dp)
+                                            .height(25.dp)
+                                            .clip(shape = CircleShape)
+                                            .clickable(onClick = {
+                                                author?.let {
+                                                    navController.navigate("User/${it.pubkeyHex}")
+                                                }
+                                            })
                                     )
 
+                                    Text(
+                                        "  ${author?.toBestDisplayName()}",
+                                        fontWeight = FontWeight.Bold,
+                                        modifier = Modifier.clickable(onClick = {
+                                                author?.let {
+                                                    navController.navigate("User/${it.pubkeyHex}")
+                                                }
+                                            })
+                                    )
+                                }
                             }
 
+                            Row(verticalAlignment = Alignment.CenterVertically) {
+                                val event = note.event
+                                if (event is ChannelCreateEvent) {
+                                    Text(text = "${note.author?.toBestDisplayName()} created " +
+                                      "${event.channelInfo.name ?: ""} with " +
+                                      "description of '${event.channelInfo.about ?: ""}', " +
+                                      "and picture '${event.channelInfo.picture ?: ""}'")
+                                } else if (event is ChannelMetadataEvent) {
+                                    Text(text = "${note.author?.toBestDisplayName()} changed " +
+                                      "chat name to '${event.channelInfo.name ?: ""}', " +
+                                      "description to '${event.channelInfo.about ?: ""}', " +
+                                      "and picture to '${event.channelInfo.picture ?: ""}'")
+                                } else {
+                                    val eventContent = accountViewModel.decrypt(note)
+
+                                    if (eventContent != null)
+                                        RichTextViewer(
+                                            eventContent,
+                                            note.event?.tags,
+                                            note,
+                                            accountViewModel,
+                                            navController
+                                        )
+                                    else
+                                        RichTextViewer(
+                                            "Could Not decrypt the message",
+                                            note.event?.tags,
+                                            note,
+                                            accountViewModel,
+                                            navController
+                                        )
+
+                                }
+                            }
+
+
                             Row(
                                 verticalAlignment = Alignment.CenterVertically,
-                                horizontalArrangement = alignment
+                                horizontalArrangement = Arrangement.End,
+                                modifier = Modifier.padding(top = 2.dp)
                             ) {
                                 Text(
                                     timeAgoLong(note.event?.createdAt),
-                                    color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                                    color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f),
+                                    fontSize = 12.sp
                                 )
                             }
                         }
                     }
+
                 }
+
+                NoteDropDownMenu(note, popupExpanded, { popupExpanded = false }, accountViewModel)
             }
         }
     }

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

@@ -107,16 +107,10 @@ fun NoteCompose(baseNote: Note, modifier: Modifier = Modifier, isInnerNote: Bool
                     }
                 }
 
-                Column(modifier = Modifier.padding(start = if (!isInnerNote) 10.dp else 0.dp)
-                    .clickable(onClick = {
-                        note?.let {
-                            navController.navigate("Note/${note.idHex}")
-                        }
-                    })
-                ) {
+                Column(modifier = Modifier.padding(start = if (!isInnerNote) 10.dp else 0.dp)) {
                     Row(verticalAlignment = Alignment.CenterVertically) {
                         if (author != null)
-                            UserDisplay(author)
+                            UsernameDisplay(author)
 
                         if (note.event !is RepostEvent) {
                             Text(
@@ -133,7 +127,7 @@ fun NoteCompose(baseNote: Note, modifier: Modifier = Modifier, isInnerNote: Bool
                     }
 
                     if (note.event is TextNoteEvent && (note.replyTo != null || note.mentions != null)) {
-                        ReplyInformation(note.replyTo, note.mentions)
+                        ReplyInformation(note.replyTo, note.mentions, navController)
                     }
 
                     if (note.event is ReactionEvent || note.event is RepostEvent) {
@@ -184,7 +178,7 @@ fun NoteDropDownMenu(note: Note, popupExpanded: Boolean, onDismiss: () -> Unit,
         expanded = popupExpanded,
         onDismissRequest = onDismiss
     ) {
-        DropdownMenuItem(onClick = { clipboardManager.setText(AnnotatedString(note.event?.content ?: "")); onDismiss() }) {
+        DropdownMenuItem(onClick = { clipboardManager.setText(AnnotatedString(accountViewModel.decrypt(note) ?: "")); onDismiss() }) {
             Text("Copy Text")
         }
         DropdownMenuItem(onClick = { clipboardManager.setText(AnnotatedString(note.author?.pubkey?.toNpub() ?: "")); onDismiss() }) {

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

@@ -2,11 +2,11 @@ package com.vitorpamplona.amethyst.ui.note
 
 import nostr.postr.toHex
 
-fun ByteArray.toDisplayHex(): String {
-  return toHex().toDisplayHex()
+fun ByteArray.toShortenHex(): String {
+  return toHex().toShortenHex()
 }
 
-fun String.toDisplayHex(): String {
+fun String.toShortenHex(): String {
   return replaceRange(6, length-6, ":")
 }
 

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

@@ -1,61 +1,70 @@
 package com.vitorpamplona.amethyst.ui.note
 
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.text.ClickableText
+import androidx.compose.material.LocalTextStyle
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.livedata.observeAsState
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import androidx.navigation.NavController
 import com.google.accompanist.flowlayout.FlowRow
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.model.User
 
 @Composable
-fun ReplyInformation(replyTo: MutableList<Note>?, mentions: List<User>?) {
+fun ReplyInformation(replyTo: MutableList<Note>?, mentions: List<User>?, navController: NavController) {
+  ReplyInformation(replyTo, mentions) {
+    navController.navigate("User/${it.pubkeyHex}")
+  }
+}
+
+@Composable
+fun ReplyInformation(replyTo: MutableList<Note>?, mentions: List<User>?, prefix: String = "", onUserTagClick: (User) -> Unit) {
   FlowRow() {
-    /*
-    if (replyTo != null && replyTo.isNotEmpty()) {
-      Text(
-        " in reply to ",
-        fontSize = 13.sp,
-        color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
-      )
-      replyTo.toSet().forEachIndexed { idx, note ->
-        val innerNoteState by note.live.observeAsState()
-        Text(
-          "${innerNoteState?.note?.idDisplayHex}${if (idx < replyTo.size - 1) ", " else ""}",
-          fontSize = 13.sp,
-          color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
-        )
-      }
-    }
-    */
     if (mentions != null && mentions.isNotEmpty()) {
-      Text(
-        "replying to ",
-        fontSize = 13.sp,
-        color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
-      )
-      mentions.toSet().forEachIndexed { idx, user ->
-        val innerUserState by user.live.observeAsState()
+      if (replyTo != null && replyTo.isNotEmpty()) {
         Text(
-          "${innerUserState?.user?.toBestDisplayName()}",
+          "replying to ",
           fontSize = 13.sp,
           color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
         )
 
-        if (idx < mentions.size - 2) {
-          Text(
-            ", ",
-            fontSize = 13.sp,
-            color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
-          )
-        } else if (idx < mentions.size - 1) {
-          Text(
-            " and ",
-            fontSize = 13.sp,
-            color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
-          )
+        mentions.toSet().forEachIndexed { idx, user ->
+          val innerUserState by user.live.observeAsState()
+          val innerUser = innerUserState?.user
+
+          innerUser?.let { myUser ->
+            ClickableText(
+              AnnotatedString("${prefix}@${myUser.toBestDisplayName()}"),
+              style = LocalTextStyle.current.copy(color = MaterialTheme.colors.primary.copy(alpha = 0.52f), fontSize = 13.sp),
+              onClick = { onUserTagClick(myUser) }
+            )
+
+            if (idx < mentions.size - 2) {
+              Text(
+                ", ",
+                fontSize = 13.sp,
+                color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+              )
+            } else if (idx < mentions.size - 1) {
+              Text(
+                " and ",
+                fontSize = 13.sp,
+                color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+              )
+            }
+          }
         }
       }
     }

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

@@ -18,7 +18,7 @@ fun timeAgo(mills: Long?): String {
   return " • " + humanReadable
     .replace(" hr. ago", "h")
     .replace(" min. ago", "m")
-    .replace(" days. ago", "d")
+    .replace(" days ago", "d")
 }
 
 fun timeAgoLong(mills: Long?): String {

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

@@ -54,7 +54,7 @@ fun UserCompose(baseUser: User, accountViewModel: AccountViewModel, navControlle
 
             Column(modifier = Modifier.padding(start = 10.dp).weight(1f)) {
                 Row(verticalAlignment = Alignment.CenterVertically) {
-                    UserDisplay(user)
+                    UsernameDisplay(user)
                 }
 
                 Text(
@@ -64,7 +64,7 @@ fun UserCompose(baseUser: User, accountViewModel: AccountViewModel, navControlle
             }
 
             Column(modifier = Modifier.padding(start = 10.dp)) {
-                if (accountState?.account?.userProfile()?.follows?.contains(user) == true) {
+                if (accountState?.account?.userProfile()?.isFollowing(user) == true) {
                     UnfollowButton { accountState?.account?.unfollow(user) }
                 } else {
                     FollowButton { accountState?.account?.follow(user) }

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

@@ -7,7 +7,7 @@ import androidx.compose.ui.text.font.FontWeight
 import com.vitorpamplona.amethyst.model.User
 
 @Composable
-fun UserDisplay(user: User) {
+fun UsernameDisplay(user: User) {
     if (user.bestUsername() != null || user.bestDisplayName() != null) {
       if (user.bestDisplayName().isNullOrBlank()) {
         Text(

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

@@ -3,8 +3,10 @@ package com.vitorpamplona.amethyst.ui.screen
 import androidx.lifecycle.ViewModel
 import androidx.security.crypto.EncryptedSharedPreferences
 import com.vitorpamplona.amethyst.model.Account
+import com.vitorpamplona.amethyst.model.DefaultChannels
 import com.vitorpamplona.amethyst.model.toByteArray
 import com.vitorpamplona.amethyst.service.NostrAccountDataSource
+import com.vitorpamplona.amethyst.service.NostrChannelDataSource
 import com.vitorpamplona.amethyst.service.NostrChatroomListDataSource
 import com.vitorpamplona.amethyst.service.NostrGlobalDataSource
 import com.vitorpamplona.amethyst.service.NostrHomeDataSource
@@ -27,41 +29,47 @@ class AccountStateViewModel(private val encryptedPreferences: EncryptedSharedPre
 
   init {
     // pulls account from storage.
-    loadFromEncryptedStorage()?.let { login(it) }
+    loadFromEncryptedStorage()?.let {
+      login(it)
+    }
   }
 
   fun login(key: String) {
     val pattern = Pattern.compile(".+@.+\\.[a-z]+")
 
-    login(
+    val account =
       if (key.startsWith("nsec")) {
-        Persona(privKey = key.bechToBytes())
+        Account(Persona(privKey = key.bechToBytes()))
       } else if (key.startsWith("npub")) {
-        Persona(pubKey = key.bechToBytes())
+        Account(Persona(pubKey = key.bechToBytes()))
       } else if (pattern.matcher(key).matches()) {
         // Evaluate NIP-5
-        Persona()
+        Account(Persona())
       } else {
-        Persona(Hex.decode(key))
+        Account(Persona(Hex.decode(key)))
       }
-    )
 
+    saveToEncryptedStorage(account)
+
+    login(account)
   }
 
-  fun login(person: Persona) {
-    val loggedIn = Account(person)
+  fun newKey() {
+    val account = Account(Persona())
+    saveToEncryptedStorage(account)
+    login(account)
+  }
 
-    if (person.privKey != null)
-      _accountContent.update { AccountState.LoggedIn ( loggedIn ) }
+  fun login(account: Account) {
+    if (account.loggedIn.privKey != null)
+      _accountContent.update { AccountState.LoggedIn ( account ) }
     else
-      _accountContent.update { AccountState.LoggedInViewOnly ( Account(person) ) }
+      _accountContent.update { AccountState.LoggedInViewOnly ( account ) }
 
-    saveToEncryptedStorage(person)
-
-    NostrAccountDataSource.account = loggedIn
-    NostrHomeDataSource.account = loggedIn
-    NostrNotificationDataSource.account = loggedIn
-    NostrChatroomListDataSource.account = loggedIn
+    NostrAccountDataSource.account = account
+    NostrHomeDataSource.account = account
+    NostrNotificationDataSource.account = account
+    NostrChatroomListDataSource.account = account
 
     NostrAccountDataSource.start()
     NostrGlobalDataSource.start()
@@ -73,10 +81,6 @@ class AccountStateViewModel(private val encryptedPreferences: EncryptedSharedPre
     NostrChatroomListDataSource.start()
   }
 
-  fun newKey() {
-    login(Persona())
-  }
-
   fun logOff() {
     _accountContent.update { AccountState.LoggedOff }
 
@@ -90,20 +94,22 @@ class AccountStateViewModel(private val encryptedPreferences: EncryptedSharedPre
     }.apply()
   }
 
-  fun saveToEncryptedStorage(login: Persona) {
+  fun saveToEncryptedStorage(account: Account) {
     encryptedPreferences.edit().apply {
-      login.privKey?.let { putString("nostr_privkey", it.toHex()) }
-      login.pubKey.let { putString("nostr_pubkey", it.toHex()) }
+      account.loggedIn.privKey?.let { putString("nostr_privkey", it.toHex()) }
+      account.loggedIn.pubKey.let { putString("nostr_pubkey", it.toHex()) }
+      account.followingChannels.let { putStringSet("following_channels", account.followingChannels) }
     }.apply()
   }
 
-  fun loadFromEncryptedStorage(): Persona? {
+  fun loadFromEncryptedStorage(): Account? {
     encryptedPreferences.apply {
       val privKey = getString("nostr_privkey", null)
       val pubKey = getString("nostr_pubkey", null)
+      val followingChannels = getStringSet("following_channels", DefaultChannels)?.toMutableSet() ?: DefaultChannels.toMutableSet()
 
       if (pubKey != null) {
-        return Persona(privKey = privKey?.toByteArray(), pubKey = pubKey.toByteArray())
+        return Account(Persona(privKey = privKey?.toByteArray(), pubKey = pubKey.toByteArray()), followingChannels)
       } else {
         return null
       }

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

@@ -1,5 +1,7 @@
 package com.vitorpamplona.amethyst.ui.screen
 
+import android.os.Handler
+import android.os.Looper
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.vitorpamplona.amethyst.model.LocalCache
@@ -8,7 +10,11 @@ import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.service.NostrDataSource
 import com.vitorpamplona.amethyst.service.model.ReactionEvent
 import com.vitorpamplona.amethyst.service.model.RepostEvent
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
 import kotlinx.coroutines.cancel
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.update
@@ -21,13 +27,13 @@ class CardFeedViewModel(val dataSource: NostrDataSource<Note>): ViewModel() {
     private var lastNotes: List<Note>? = null
 
     fun refresh() {
-        // For some reason, view Model Scope doesn't call
-        viewModelScope.launch {
-            refreshSuspend()
+        val scope = CoroutineScope(Job() + Dispatchers.IO)
+        scope.launch {
+            refreshSuspended()
         }
     }
 
-    fun refreshSuspend() {
+    private fun refreshSuspended() {
         val notes = dataSource.loadTop()
 
         val lastNotesCopy = lastNotes
@@ -75,22 +81,32 @@ class CardFeedViewModel(val dataSource: NostrDataSource<Note>): ViewModel() {
     }
 
     fun updateFeed(notes: List<Card>) {
-        if (notes.isEmpty()) {
-            _feedContent.update { CardFeedState.Empty }
-        } else {
-            _feedContent.update { CardFeedState.Loaded(notes) }
+        val scope = CoroutineScope(Job() + Dispatchers.Main)
+        scope.launch {
+            if (notes.isEmpty()) {
+                _feedContent.update { CardFeedState.Empty }
+            } else {
+                _feedContent.update { CardFeedState.Loaded(notes) }
+            }
         }
     }
 
-    fun refreshCurrentList() {
-        val state = feedContent.value
-        if (state is CardFeedState.Loaded) {
-            _feedContent.update { CardFeedState.Loaded(state.feed) }
+    val scope = CoroutineScope(Job() + Dispatchers.IO)
+    var handlerWaiting = false
+    @Synchronized
+    fun invalidateData() {
+        if (handlerWaiting) return
+
+        handlerWaiting = true
+        scope.launch {
+            delay(100)
+            refresh()
+            handlerWaiting = false
         }
     }
 
     private val cacheListener: (LocalCacheState) -> Unit = {
-        refresh()
+        invalidateData()
     }
 
     init {

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

@@ -21,7 +21,7 @@ import com.vitorpamplona.amethyst.ui.note.ChatroomMessageCompose
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 
 @Composable
-fun ChatroomFeedView(userId: String, viewModel: FeedViewModel, accountViewModel: AccountViewModel, navController: NavController) {
+fun ChatroomFeedView(viewModel: FeedViewModel, accountViewModel: AccountViewModel, navController: NavController) {
     val feedState by viewModel.feedContent.collectAsStateWithLifecycle()
 
     var isRefreshing by remember { mutableStateOf(false) }

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

@@ -1,30 +1,55 @@
 package com.vitorpamplona.amethyst.ui.screen
 
+import android.os.Handler
+import android.os.Looper
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.LocalCacheState
 import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.service.NostrChannelDataSource
+import com.vitorpamplona.amethyst.service.NostrChatRoomDataSource
+import com.vitorpamplona.amethyst.service.NostrChatroomListDataSource
 import com.vitorpamplona.amethyst.service.NostrDataSource
+import com.vitorpamplona.amethyst.service.NostrGlobalDataSource
+import com.vitorpamplona.amethyst.service.NostrHomeDataSource
+import com.vitorpamplona.amethyst.service.NostrThreadDataSource
+import com.vitorpamplona.amethyst.service.NostrUserProfileDataSource
+import com.vitorpamplona.amethyst.service.NostrUserProfileFollowersDataSource
+import com.vitorpamplona.amethyst.service.NostrUserProfileFollowsDataSource
+import kotlin.time.ExperimentalTime
+import kotlin.time.measureTimedValue
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
 import kotlinx.coroutines.cancel
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
 
+class NostrChannelFeedViewModel: FeedViewModel(NostrChannelDataSource)
+class NostrChatroomListFeedViewModel: FeedViewModel(NostrChatroomListDataSource)
+class NostrChatRoomFeedViewModel: FeedViewModel(NostrChatRoomDataSource)
+class NostrHomeFeedViewModel: FeedViewModel(NostrHomeDataSource)
+class NostrGlobalFeedViewModel: FeedViewModel(NostrGlobalDataSource)
+class NostrThreadFeedViewModel: FeedViewModel(NostrThreadDataSource)
+class NostrUserProfileFeedViewModel: FeedViewModel(NostrUserProfileDataSource)
 
-class FeedViewModel(val dataSource: NostrDataSource<Note>): ViewModel() {
+
+abstract class FeedViewModel(val dataSource: NostrDataSource<Note>): ViewModel() {
     private val _feedContent = MutableStateFlow<FeedState>(FeedState.Loading)
     val feedContent = _feedContent.asStateFlow()
 
     fun refresh() {
-        // For some reason, view Model Scope doesn't call
-        viewModelScope.launch {
-            refreshSuspend()
+        val scope = CoroutineScope(Job() + Dispatchers.IO)
+        scope.launch {
+            refreshSuspended()
         }
     }
 
-    fun refreshSuspend() {
+    private fun refreshSuspended() {
         val notes = dataSource.loadTop()
 
         val oldNotesState = feedContent.value
@@ -38,10 +63,13 @@ class FeedViewModel(val dataSource: NostrDataSource<Note>): ViewModel() {
     }
 
     fun updateFeed(notes: List<Note>) {
-        if (notes.isEmpty()) {
-            _feedContent.update { FeedState.Empty }
-        } else {
-            _feedContent.update { FeedState.Loaded(notes) }
+        val scope = CoroutineScope(Job() + Dispatchers.Main)
+        scope.launch {
+            if (notes.isEmpty()) {
+                _feedContent.update { FeedState.Empty }
+            } else {
+                _feedContent.update { FeedState.Loaded(notes) }
+            }
         }
     }
 
@@ -52,8 +80,22 @@ class FeedViewModel(val dataSource: NostrDataSource<Note>): ViewModel() {
         }
     }
 
+    val scope = CoroutineScope(Job() + Dispatchers.IO)
+    var handlerWaiting = false
+    @Synchronized
+    fun invalidateData() {
+        if (handlerWaiting) return
+
+        handlerWaiting = true
+        scope.launch {
+            delay(100)
+            refresh()
+            handlerWaiting = false
+        }
+    }
+
     private val cacheListener: (LocalCacheState) -> Unit = {
-        refresh()
+        invalidateData()
     }
 
     init {

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

@@ -40,7 +40,7 @@ import com.vitorpamplona.amethyst.ui.components.RichTextViewer
 import com.vitorpamplona.amethyst.ui.note.BlankNote
 import com.vitorpamplona.amethyst.ui.note.NoteCompose
 import com.vitorpamplona.amethyst.ui.note.ReactionsRowState
-import com.vitorpamplona.amethyst.ui.note.UserDisplay
+import com.vitorpamplona.amethyst.ui.note.UsernameDisplay
 import com.vitorpamplona.amethyst.ui.note.timeAgoLong
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 
@@ -185,7 +185,7 @@ fun NoteMaster(baseNote: Note, accountViewModel: AccountViewModel, navController
                 Column(modifier = Modifier.padding(start = 10.dp)) {
                     Row(verticalAlignment = Alignment.CenterVertically) {
                         if (author != null)
-                            UserDisplay(author)
+                            UsernameDisplay(author)
                     }
 
                     Row(verticalAlignment = Alignment.CenterVertically) {

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

@@ -1,5 +1,7 @@
 package com.vitorpamplona.amethyst.ui.screen
 
+import android.os.Handler
+import android.os.Looper
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.vitorpamplona.amethyst.model.LocalCache
@@ -8,7 +10,11 @@ import com.vitorpamplona.amethyst.model.User
 import com.vitorpamplona.amethyst.service.NostrDataSource
 import com.vitorpamplona.amethyst.service.NostrUserProfileFollowersDataSource
 import com.vitorpamplona.amethyst.service.NostrUserProfileFollowsDataSource
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
 import kotlinx.coroutines.cancel
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.update
@@ -27,13 +33,13 @@ open class UserFeedViewModel(val dataSource: NostrDataSource<User>): ViewModel()
     val feedContent = _feedContent.asStateFlow()
 
     fun refresh() {
-        // For some reason, view Model Scope doesn't call
-        viewModelScope.launch {
-            refreshSuspend()
+        val scope = CoroutineScope(Job() + Dispatchers.IO)
+        scope.launch {
+            refreshSuspended()
         }
     }
 
-    fun refreshSuspend() {
+    private fun refreshSuspended() {
         val notes = dataSource.loadTop()
 
         val oldNotesState = feedContent.value
@@ -47,10 +53,13 @@ open class UserFeedViewModel(val dataSource: NostrDataSource<User>): ViewModel()
     }
 
     fun updateFeed(notes: List<User>) {
-        if (notes.isEmpty()) {
-            _feedContent.update { UserFeedState.Empty }
-        } else {
-            _feedContent.update { UserFeedState.Loaded(notes) }
+        val scope = CoroutineScope(Job() + Dispatchers.Main)
+        scope.launch {
+            if (notes.isEmpty()) {
+                _feedContent.update { UserFeedState.Empty }
+            } else {
+                _feedContent.update { UserFeedState.Loaded(notes) }
+            }
         }
     }
 
@@ -61,8 +70,22 @@ open class UserFeedViewModel(val dataSource: NostrDataSource<User>): ViewModel()
         }
     }
 
+    val scope = CoroutineScope(Job() + Dispatchers.IO)
+    var handlerWaiting = false
+    @Synchronized
+    fun invalidateData() {
+        if (handlerWaiting) return
+
+        handlerWaiting = true
+        scope.launch {
+            delay(100)
+            refresh()
+            handlerWaiting = false
+        }
+    }
+
     private val cacheListener: (LocalCacheState) -> Unit = {
-        refresh()
+        invalidateData()
     }
 
     init {

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

@@ -0,0 +1,265 @@
+package com.vitorpamplona.amethyst.ui.screen
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.material.Button
+import androidx.compose.material.ButtonDefaults
+import androidx.compose.material.Divider
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.Text
+import androidx.compose.material.TextField
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.livedata.observeAsState
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.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.platform.ClipboardManager
+import androidx.compose.ui.platform.LocalClipboardManager
+import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.input.KeyboardCapitalization
+import androidx.compose.ui.text.input.TextFieldValue
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import androidx.lifecycle.viewmodel.compose.viewModel
+import androidx.navigation.NavController
+import coil.compose.AsyncImage
+import com.vitorpamplona.amethyst.model.Account
+import com.vitorpamplona.amethyst.model.Channel
+import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.model.toNote
+import com.vitorpamplona.amethyst.service.NostrChannelDataSource
+import com.vitorpamplona.amethyst.ui.actions.NewChannelView
+import com.vitorpamplona.amethyst.ui.actions.NewPostView
+import com.vitorpamplona.amethyst.ui.actions.PostButton
+import com.vitorpamplona.amethyst.ui.navigation.Route
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
+
+@Composable
+fun ChannelScreen(channelId: String?, accountViewModel: AccountViewModel, accountStateViewModel: AccountStateViewModel, navController: NavController) {
+    val accountState by accountViewModel.accountLiveData.observeAsState()
+    val account = accountState?.account
+
+    if (account != null && channelId != null) {
+        val newPost = remember { mutableStateOf(TextFieldValue("")) }
+
+        NostrChannelDataSource.loadMessagesBetween(channelId)
+
+        val channelState by NostrChannelDataSource.channel!!.live.observeAsState()
+        val channel = channelState?.channel ?: return
+
+        val feedViewModel: NostrChannelFeedViewModel = viewModel()
+
+        LaunchedEffect(Unit) {
+            feedViewModel.refresh()
+        }
+
+        Column(Modifier.fillMaxHeight()) {
+            ChannelHeader(
+                channel, account,
+                accountStateViewModel = accountStateViewModel,
+                navController = navController
+            )
+
+            Column(
+                modifier = Modifier
+                    .fillMaxHeight()
+                    .padding(vertical = 0.dp)
+                    .weight(1f, true)
+            ) {
+                ChatroomFeedView(feedViewModel, accountViewModel, navController)
+            }
+
+            //LAST ROW
+            Row(modifier = Modifier
+                .padding(10.dp)
+                .fillMaxWidth(),
+                horizontalArrangement = Arrangement.SpaceBetween,
+                verticalAlignment = Alignment.CenterVertically
+            ) {
+                TextField(
+                    value = newPost.value,
+                    onValueChange = { newPost.value = it },
+                    keyboardOptions = KeyboardOptions.Default.copy(
+                        capitalization = KeyboardCapitalization.Sentences
+                    ),
+                    modifier = Modifier
+                        .weight(1f, true)
+                        .padding(end = 10.dp),
+                    placeholder = {
+                        Text(
+                            text = "reply here.. ",
+                            color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                        )
+                    },
+                    trailingIcon = {
+                        PostButton(
+                            onPost = {
+                                account.sendChannelMeesage(newPost.value.text, channel.idHex)
+                                newPost.value = TextFieldValue("")
+                            },
+                            newPost.value.text.isNotBlank(),
+                            modifier = Modifier.padding(end = 10.dp)
+                        )
+                    }
+                )
+            }
+        }
+    }
+}
+
+@Composable
+fun ChannelHeader(baseChannel: Channel, account: Account, accountStateViewModel: AccountStateViewModel, navController: NavController) {
+    val channelState by baseChannel.live.observeAsState()
+    val channel = channelState?.channel
+
+    Column() {
+        Column(modifier = Modifier.padding(12.dp)) {
+            Row(verticalAlignment = Alignment.CenterVertically) {
+
+                AsyncImage(
+                    model = channel?.profilePicture(),
+                    contentDescription = "Profile Image",
+                    modifier = Modifier
+                        .width(35.dp)
+                        .height(35.dp)
+                        .clip(shape = CircleShape)
+                )
+
+                Column(modifier = Modifier
+                    .padding(start = 10.dp)
+                    .weight(1f)) {
+                    Row(verticalAlignment = Alignment.CenterVertically) {
+                        Text(
+                            "${channel?.info?.name}",
+                            fontWeight = FontWeight.Bold,
+                        )
+                    }
+
+                    Row(verticalAlignment = Alignment.CenterVertically) {
+                        Text(
+                            "${channel?.info?.about}",
+                            color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f),
+                            maxLines = 2,
+                            overflow = TextOverflow.Ellipsis,
+                            fontSize = 12.sp
+                        )
+                    }
+                }
+
+                channel?.let { NoteCopyButton(it) }
+
+                channel?.let {
+                    if (channel.creator == account.userProfile()) {
+                        EditButton(account, it, accountStateViewModel)
+                    } else {
+                        if (account.followingChannels.contains(channel.idHex)) {
+                            LeaveButton(account,channel,accountStateViewModel, navController)
+                        } else {
+                            JoinButton(account,channel,accountStateViewModel, navController)
+                        }
+                    }
+                }
+            }
+        }
+
+        Divider(
+            modifier = Modifier.padding(start = 12.dp, end = 12.dp),
+            thickness = 0.25.dp
+        )
+    }
+}
+
+
+@Composable
+private fun NoteCopyButton(
+    note: Channel
+) {
+    val clipboardManager = LocalClipboardManager.current
+
+    Button(
+        modifier = Modifier.padding(horizontal = 3.dp),
+        onClick = { clipboardManager.setText(AnnotatedString(note.id.toNote())) },
+        shape = RoundedCornerShape(20.dp),
+        colors = ButtonDefaults
+            .buttonColors(
+                backgroundColor = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+            ),
+    ) {
+        Text(text = "note", color = Color.White)
+    }
+}
+
+@Composable
+private fun EditButton(account: Account, channel: Channel, accountStateViewModel: AccountStateViewModel) {
+    var wantsToPost by remember {
+        mutableStateOf(false)
+    }
+
+    if (wantsToPost)
+        NewChannelView({ wantsToPost = false }, account = account, accountStateViewModel, channel)
+
+    Button(
+        modifier = Modifier.padding(horizontal = 3.dp),
+        onClick = { wantsToPost = true },
+        shape = RoundedCornerShape(20.dp),
+        colors = ButtonDefaults
+            .buttonColors(
+                backgroundColor = MaterialTheme.colors.primary
+            )
+    ) {
+        Text(text = "Edit", color = Color.White)
+    }
+}
+
+@Composable
+private fun JoinButton(account: Account, channel: Channel, accountStateViewModel: AccountStateViewModel, navController: NavController) {
+    Button(
+        modifier = Modifier.padding(horizontal = 3.dp),
+        onClick = {
+            account.joinChannel(channel.idHex, accountStateViewModel)
+            navController.navigate(Route.Message.route)
+        },
+        shape = RoundedCornerShape(20.dp),
+        colors = ButtonDefaults
+            .buttonColors(
+                backgroundColor = MaterialTheme.colors.primary
+            )
+    ) {
+        Text(text = "Join", color = Color.White)
+    }
+}
+
+@Composable
+private fun LeaveButton(account: Account, channel: Channel, accountStateViewModel: AccountStateViewModel, navController: NavController) {
+    Button(
+        modifier = Modifier.padding(horizontal = 3.dp),
+        onClick = {
+            account.leaveChannel(channel.idHex, accountStateViewModel)
+            navController.navigate(Route.Message.route)
+        },
+        shape = RoundedCornerShape(20.dp),
+        colors = ButtonDefaults
+            .buttonColors(
+                backgroundColor = MaterialTheme.colors.primary
+            )
+    ) {
+        Text(text = "Leave", color = Color.White)
+    }
+}

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

@@ -4,6 +4,7 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.padding
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.livedata.observeAsState
 import androidx.compose.ui.Modifier
@@ -18,7 +19,11 @@ fun ChatroomListScreen(accountViewModel: AccountViewModel, navController: NavCon
     val account by accountViewModel.accountLiveData.observeAsState()
 
     if (account != null) {
-        val feedViewModel: FeedViewModel = viewModel { FeedViewModel( NostrChatroomListDataSource ) }
+        val feedViewModel: NostrChatroomListFeedViewModel = viewModel()
+
+        LaunchedEffect(Unit) {
+            feedViewModel.refresh()
+        }
 
         Column(Modifier.fillMaxHeight()) {
             Column(

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

@@ -13,9 +13,10 @@ import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material.Divider
 import androidx.compose.material.MaterialTheme
-import androidx.compose.material.OutlinedTextField
 import androidx.compose.material.Text
+import androidx.compose.material.TextField
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.livedata.observeAsState
 import androidx.compose.runtime.mutableStateOf
@@ -32,7 +33,7 @@ import coil.compose.AsyncImage
 import com.vitorpamplona.amethyst.model.User
 import com.vitorpamplona.amethyst.service.NostrChatRoomDataSource
 import com.vitorpamplona.amethyst.ui.actions.PostButton
-import com.vitorpamplona.amethyst.ui.note.UserDisplay
+import com.vitorpamplona.amethyst.ui.note.UsernameDisplay
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 
 @Composable
@@ -45,7 +46,11 @@ fun ChatroomScreen(userId: String?, accountViewModel: AccountViewModel, navContr
 
         NostrChatRoomDataSource.loadMessagesBetween(account, userId)
 
-        val feedViewModel: FeedViewModel = viewModel { FeedViewModel( NostrChatRoomDataSource ) }
+        val feedViewModel: NostrChatRoomFeedViewModel = viewModel()
+
+        LaunchedEffect(Unit) {
+            feedViewModel.refresh()
+        }
 
         Column(Modifier.fillMaxHeight()) {
             NostrChatRoomDataSource.withUser?.let {
@@ -59,7 +64,7 @@ fun ChatroomScreen(userId: String?, accountViewModel: AccountViewModel, navContr
             Column(
                 modifier = Modifier.fillMaxHeight().padding(vertical = 0.dp).weight(1f, true)
             ) {
-                ChatroomFeedView(userId, feedViewModel, accountViewModel, navController)
+                ChatroomFeedView(feedViewModel, accountViewModel, navController)
             }
 
             //LAST ROW
@@ -67,27 +72,29 @@ fun ChatroomScreen(userId: String?, accountViewModel: AccountViewModel, navContr
                 horizontalArrangement = Arrangement.SpaceBetween,
                 verticalAlignment = Alignment.CenterVertically
             ) {
-                OutlinedTextField(
+                TextField(
                     value = newPost.value,
                     onValueChange = { newPost.value = it },
                     keyboardOptions = KeyboardOptions.Default.copy(
                         capitalization = KeyboardCapitalization.Sentences
                     ),
-                    modifier = Modifier.weight(1f, true).padding(end = 10.dp),
+                    modifier = Modifier.weight(1f, true),
                     placeholder = {
                         Text(
                             text = "reply here.. ",
                             color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
                         )
-                    }
-                )
-
-                PostButton(
-                    onPost = {
-                        account.sendPrivateMeesage(newPost.value.text, userId)
-                        newPost.value = TextFieldValue("")
                     },
-                    newPost.value.text.isNotBlank()
+                    trailingIcon = {
+                        PostButton(
+                            onPost = {
+                                account.sendPrivateMeesage(newPost.value.text, userId)
+                                newPost.value = TextFieldValue("")
+                            },
+                            newPost.value.text.isNotBlank(),
+                            modifier = Modifier.padding(end = 10.dp)
+                        )
+                    }
                 )
             }
         }
@@ -100,33 +107,32 @@ fun ChatroomHeader(baseUser: User, accountViewModel: AccountViewModel, navContro
     val authorState by baseUser.live.observeAsState()
     val author = authorState?.user
 
-    Column(modifier =
-        Modifier
-            .padding(12.dp)
-            .clickable(
-                onClick = { navController.navigate("User/${author?.pubkeyHex}") }
-            )
+    Column(modifier = Modifier.clickable(
+            onClick = { navController.navigate("User/${author?.pubkeyHex}") }
+        )
     ) {
-        Row(verticalAlignment = Alignment.CenterVertically) {
+        Column(modifier = Modifier.padding(12.dp)) {
+            Row(verticalAlignment = Alignment.CenterVertically) {
 
-            AsyncImage(
-                model = author?.profilePicture(),
-                contentDescription = "Profile Image",
-                modifier = Modifier
-                    .width(35.dp).height(35.dp)
-                    .clip(shape = CircleShape)
-            )
+                AsyncImage(
+                    model = author?.profilePicture(),
+                    contentDescription = "Profile Image",
+                    modifier = Modifier
+                        .width(35.dp).height(35.dp)
+                        .clip(shape = CircleShape)
+                )
 
-            Column(modifier = Modifier.padding(start = 10.dp)) {
-                Row(verticalAlignment = Alignment.CenterVertically) {
-                    if (author != null)
-                        UserDisplay(author)
+                Column(modifier = Modifier.padding(start = 10.dp)) {
+                    Row(verticalAlignment = Alignment.CenterVertically) {
+                        if (author != null)
+                            UsernameDisplay(author)
+                    }
                 }
             }
         }
 
         Divider(
-            modifier = Modifier.padding(top = 12.dp, start = 12.dp, end = 12.dp),
+            modifier = Modifier.padding(start = 12.dp, end = 12.dp),
             thickness = 0.25.dp
         )
     }

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

@@ -4,21 +4,32 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.padding
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.DisposableEffect
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.livedata.observeAsState
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.viewmodel.compose.viewModel
 import androidx.navigation.NavController
 import com.vitorpamplona.amethyst.service.NostrHomeDataSource
+import com.vitorpamplona.amethyst.service.NostrUserProfileDataSource
+import com.vitorpamplona.amethyst.service.NostrUserProfileFollowersDataSource
+import com.vitorpamplona.amethyst.service.NostrUserProfileFollowsDataSource
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
+import java.lang.System.currentTimeMillis
 
 @Composable
 fun HomeScreen(accountViewModel: AccountViewModel, navController: NavController) {
     val accountState by accountViewModel.accountLiveData.observeAsState()
 
     if (accountState != null) {
-        val feedViewModel: FeedViewModel = viewModel { FeedViewModel( NostrHomeDataSource ) }
+        val feedViewModel: NostrHomeFeedViewModel = viewModel()
+
+        LaunchedEffect(Unit) {
+            feedViewModel.refresh()
+        }
 
         Column(Modifier.fillMaxHeight()) {
             Column(

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

@@ -16,6 +16,7 @@ import androidx.compose.ui.Modifier
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.rememberNavController
+import com.vitorpamplona.amethyst.buttons.NewChannelButton
 import com.vitorpamplona.amethyst.buttons.NewNoteButton
 import com.vitorpamplona.amethyst.ui.navigation.AppBottomBar
 import com.vitorpamplona.amethyst.ui.navigation.AppNavigation
@@ -49,7 +50,7 @@ fun MainScreen(accountViewModel: AccountViewModel, accountStateViewModel: Accoun
         scaffoldState = scaffoldState
     ) {
         Column(modifier = Modifier.padding(bottom = it.calculateBottomPadding())) {
-            AppNavigation(navController, accountViewModel)
+            AppNavigation(navController, accountViewModel, accountStateViewModel)
         }
     }
 }
@@ -73,4 +74,20 @@ fun FloatingButton(navController: NavHostController, accountViewModel: AccountSt
             }
         }
     }
+
+    if (currentRoute(navController) == Route.Message.route) {
+        Crossfade(targetState = accountState) { state ->
+            when (state) {
+                is AccountState.LoggedInViewOnly -> {
+                    // Does nothing.
+                }
+                is AccountState.LoggedOff -> {
+                    // Does nothing.
+                }
+                is AccountState.LoggedIn -> {
+                    NewChannelButton(state.account, accountViewModel)
+                }
+            }
+        }
+    }
 }

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

@@ -4,6 +4,7 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.padding
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.livedata.observeAsState
 import androidx.compose.ui.Modifier
@@ -18,8 +19,11 @@ fun NotificationScreen(accountViewModel: AccountViewModel, navController: NavCon
     val account by accountViewModel.accountLiveData.observeAsState()
 
     if (account != null) {
-        val feedViewModel: CardFeedViewModel =
-            viewModel { CardFeedViewModel( NostrNotificationDataSource ) }
+        val feedViewModel: CardFeedViewModel = viewModel { CardFeedViewModel( NostrNotificationDataSource ) }
+
+        LaunchedEffect(Unit) {
+            feedViewModel.refresh()
+        }
 
         Column(Modifier.fillMaxHeight()) {
             Column(

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

@@ -51,7 +51,9 @@ import com.google.accompanist.pager.HorizontalPager
 import com.google.accompanist.pager.pagerTabIndicatorOffset
 import com.google.accompanist.pager.rememberPagerState
 import com.vitorpamplona.amethyst.R
+import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.model.User
+import com.vitorpamplona.amethyst.model.toNote
 import com.vitorpamplona.amethyst.service.NostrUserProfileDataSource
 import com.vitorpamplona.amethyst.service.NostrUserProfileFollowersDataSource
 import com.vitorpamplona.amethyst.service.NostrUserProfileFollowsDataSource
@@ -73,8 +75,6 @@ fun ProfileScreen(userId: String?, accountViewModel: AccountViewModel, navContro
     val accountUserState by accountViewModel.userLiveData.observeAsState()
     val accountUser = accountUserState?.user
 
-    val clipboardManager = LocalClipboardManager.current
-
     if (userId != null && account != null && accountUser != null) {
         DisposableEffect(account) {
             NostrUserProfileDataSource.loadUserProfile(userId)
@@ -138,12 +138,12 @@ fun ProfileScreen(userId: String?, accountViewModel: AccountViewModel, navContro
 
                             MessageButton(user, navController)
 
-                            NPubCopyButton(clipboardManager, user)
+                            NPubCopyButton(user)
 
                             if (accountUser == user) {
                                 EditButton()
                             } else {
-                                if (accountUser.follows?.contains(user) == true) {
+                                if (accountUser.isFollowing(user) == true) {
                                     UnfollowButton { account.unfollow(user) }
                                 } else {
                                     FollowButton { account.follow(user) }
@@ -160,7 +160,7 @@ fun ProfileScreen(userId: String?, accountViewModel: AccountViewModel, navContro
                         Text(" @${user.bestUsername()}", color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f))
                         Text(
                             "${user.info.about}",
-                            color = Color.White,
+                            color = MaterialTheme.colors.onSurface,
                             modifier = Modifier.padding(top = 5.dp, bottom = 5.dp)
                         )
 
@@ -222,7 +222,7 @@ fun ProfileScreen(userId: String?, accountViewModel: AccountViewModel, navContro
 fun TabNotes(user: User, accountViewModel: AccountViewModel, navController: NavController) {
     val accountState by accountViewModel.accountLiveData.observeAsState()
     if (accountState != null) {
-        val feedViewModel: FeedViewModel = viewModel { FeedViewModel( NostrUserProfileDataSource ) }
+        val feedViewModel: NostrUserProfileFeedViewModel = viewModel()
 
         Column(Modifier.fillMaxHeight()) {
             Column(
@@ -262,9 +262,10 @@ fun TabFollowers(user: User, accountViewModel: AccountViewModel, navController:
 
 @Composable
 private fun NPubCopyButton(
-    clipboardManager: ClipboardManager,
     user: User
 ) {
+    val clipboardManager = LocalClipboardManager.current
+
     Button(
         modifier = Modifier.padding(horizontal = 3.dp),
         onClick = { clipboardManager.setText(AnnotatedString(user.pubkey.toNpub())) },
@@ -293,7 +294,7 @@ private fun MessageButton(user: User, navController: NavController) {
             painter = painterResource(R.drawable.ic_dm),
             "Send a Direct Message",
             modifier = Modifier.size(20.dp),
-            tint = Color.Unspecified
+            tint = Color.White
         )
     }
 }

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

@@ -1,25 +1,235 @@
 package com.vitorpamplona.amethyst.ui.screen
 
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.defaultMinSize
 import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.itemsIndexed
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.text.ClickableText
+import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.material.Divider
+import androidx.compose.material.Icon
+import androidx.compose.material.IconButton
+import androidx.compose.material.LocalTextStyle
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.Text
+import androidx.compose.material.TextField
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Clear
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.derivedStateOf
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.livedata.observeAsState
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.input.KeyboardCapitalization
+import androidx.compose.ui.text.input.TextFieldValue
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.viewmodel.compose.viewModel
 import androidx.navigation.NavController
+import coil.compose.AsyncImage
+import com.vitorpamplona.amethyst.R
+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.ui.actions.CloseButton
+import com.vitorpamplona.amethyst.ui.actions.SearchButton
+import com.vitorpamplona.amethyst.ui.note.ChannelName
+import com.vitorpamplona.amethyst.ui.note.NoteCompose
+import com.vitorpamplona.amethyst.ui.note.UsernameDisplay
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 
 @Composable
 fun SearchScreen(accountViewModel: AccountViewModel, navController: NavController) {
-    val feedViewModel: FeedViewModel = viewModel { FeedViewModel( NostrGlobalDataSource ) }
+    val feedViewModel: NostrGlobalFeedViewModel = viewModel()
+
+    LaunchedEffect(Unit) {
+        feedViewModel.refresh()
+    }
 
     Column(Modifier.fillMaxHeight()) {
         Column(
             modifier = Modifier.padding(vertical = 0.dp)
         ) {
+            SearchBar(accountViewModel, navController)
             FeedView(feedViewModel, accountViewModel, navController)
         }
     }
 }
+
+@Composable
+private fun SearchBar(accountViewModel: AccountViewModel, navController: NavController) {
+    val searchValue = remember { mutableStateOf(TextFieldValue("")) }
+    val searchResults = remember { mutableStateOf<List<User>>(emptyList()) }
+    val searchResultsNotes = remember { mutableStateOf<List<Note>>(emptyList()) }
+    val searchResultsChannels = remember { mutableStateOf<List<Channel>>(emptyList()) }
+
+    val isTrailingIconVisible by remember {
+        derivedStateOf {
+            searchValue.value.text.isNotBlank()
+        }
+    }
+
+    //LAST ROW
+    Row(
+        modifier = Modifier
+            .padding(10.dp)
+            .fillMaxWidth(),
+        horizontalArrangement = Arrangement.SpaceBetween,
+        verticalAlignment = Alignment.CenterVertically
+    ) {
+        TextField(
+            value = searchValue.value,
+            onValueChange = {
+                searchValue.value = it
+                searchResults.value = LocalCache.findUsersStartingWith(it.text)
+                searchResultsNotes.value = LocalCache.findNotesStartingWith(it.text)
+                searchResultsChannels.value = LocalCache.findChannelsStartingWith(it.text)
+            },
+            keyboardOptions = KeyboardOptions.Default.copy(
+                capitalization = KeyboardCapitalization.Sentences
+            ),
+            leadingIcon = {
+                Icon(
+                    painter = painterResource(R.drawable.ic_search),
+                    contentDescription = null,
+                    modifier = Modifier.size(20.dp),
+                    tint = Color.Unspecified
+                )
+            },
+            modifier = Modifier
+                .weight(1f, true)
+                .defaultMinSize(minHeight = 20.dp),
+            placeholder = {
+                Text(
+                    text = "npub, hex, username ",
+                    color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                )
+            },
+            trailingIcon = {
+                if (isTrailingIconVisible) {
+                    IconButton(
+                        onClick = {
+                            searchValue.value = TextFieldValue("")
+                            searchResults.value = emptyList()
+                            searchResultsChannels.value = emptyList()
+                            searchResultsNotes.value = emptyList()
+                        }
+                    ) {
+                        Icon(
+                            imageVector = Icons.Default.Clear,
+                            contentDescription = "Clear"
+                        )
+                    }
+                }
+            }
+        )
+    }
+
+    if (searchValue.value.text.isNotBlank()) {
+        LazyColumn(
+            modifier = Modifier.fillMaxHeight(),
+            contentPadding = PaddingValues(
+                top = 10.dp,
+                bottom = 10.dp
+            )
+        ) {
+            itemsIndexed(searchResults.value, key = { _, item -> item.pubkeyHex }) { index, item ->
+                UserLine(item) {
+                    navController.navigate("User/${item.pubkeyHex}")
+                }
+            }
+
+            itemsIndexed(searchResultsChannels.value, key = { _, item -> item.idHex }) { index, item ->
+                ChannelName(
+                    channelPicture = item.profilePicture(),
+                    channelTitle = {
+                        Text(
+                            "${item.info.name}",
+                            fontWeight = FontWeight.Bold
+                        )
+                    },
+                    channelLastTime = null,
+                    channelLastContent = item.info.about,
+                    onClick = { navController.navigate("Channel/${item.idHex}") })
+            }
+
+            itemsIndexed(searchResultsNotes.value, key = { _, item -> item.idHex }) { index, item ->
+                NoteCompose(item, accountViewModel = accountViewModel, navController = navController)
+            }
+        }
+    }
+}
+
+@Composable
+fun UserLine(
+    baseUser: User,
+    onClick: () -> Unit
+) {
+    val userState by baseUser.live.observeAsState()
+    val user = userState?.user ?: return
+
+    Column(modifier = Modifier
+        .fillMaxWidth()
+        .clickable(onClick = onClick)
+    ) {
+        Row(
+            modifier = Modifier
+                .padding(
+                    start = 12.dp,
+                    end = 12.dp,
+                    top = 10.dp
+                )
+        ) {
+
+            AsyncImage(
+                model = user.profilePicture(),
+                contentDescription = "Profile Image",
+                modifier = Modifier
+                    .width(55.dp)
+                    .height(55.dp)
+                    .clip(shape = CircleShape)
+            )
+
+            Column(
+                modifier = Modifier
+                    .padding(start = 10.dp)
+                    .weight(1f)
+            ) {
+                Row(verticalAlignment = Alignment.CenterVertically) {
+                    UsernameDisplay(user)
+                }
+
+                Text(
+                    user.info.about?.take(100) ?: "",
+                    color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                )
+            }
+        }
+
+        Divider(
+            modifier = Modifier.padding(top = 10.dp),
+            thickness = 0.25.dp
+        )
+    }
+}

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

@@ -27,7 +27,7 @@ fun ThreadScreen(noteId: String?, accountViewModel: AccountViewModel, navControl
     if (account != null && noteId != null) {
         NostrThreadDataSource.loadThread(noteId)
 
-        val feedViewModel: FeedViewModel = viewModel { FeedViewModel( NostrThreadDataSource ) }
+        val feedViewModel: NostrThreadFeedViewModel = viewModel()
 
         Column(Modifier.fillMaxHeight()) {
             Column(

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

@@ -70,7 +70,7 @@ fun LoginPage(accountViewModel: AccountStateViewModel) {
         var errorMessage by remember { mutableStateOf("") }
 
         Image(
-            painterResource(id = R.drawable.amethyst_logo),
+            painterResource(id = R.drawable.amethyst),
             contentDescription = "App Logo",
             modifier = Modifier.size(300.dp),
             contentScale = ContentScale.Inside

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

@@ -1,30 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z">
-        <aapt:attr name="android:fillColor">
-            <gradient
-                android:endX="85.84757"
-                android:endY="92.4963"
-                android:startX="42.9492"
-                android:startY="49.59793"
-                android:type="linear">
-                <item
-                    android:color="#44000000"
-                    android:offset="0.0" />
-                <item
-                    android:color="#00000000"
-                    android:offset="1.0" />
-            </gradient>
-        </aapt:attr>
-    </path>
-    <path
-        android:fillColor="#FFFFFF"
-        android:fillType="nonZero"
-        android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
-        android:strokeWidth="1"
-        android:strokeColor="#00000000" />
-</vector>

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

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

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

@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path
-        android:fillColor="#3DDC84"
-        android:pathData="M0,0h108v108h-108z" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M9,0L9,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,0L19,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,0L29,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,0L39,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,0L49,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,0L59,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,0L69,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,0L79,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M89,0L89,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M99,0L99,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,9L108,9"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,19L108,19"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,29L108,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,39L108,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,49L108,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,59L108,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,69L108,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,79L108,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,89L108,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,99L108,99"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,29L89,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,39L89,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,49L89,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,59L89,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,69L89,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,79L89,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,19L29,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,19L39,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,19L49,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,19L59,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,19L69,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,19L79,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-</vector>

app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
-</adaptive-icon>

app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
-</adaptive-icon>