Version 0.9.5

Adding Data deletion path and contact info

.gitignore

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

PRIVACY.md

@@ -0,0 +1,11 @@
+# Amethyst Privacy Policy
+
+Effective as of Jan 20, 2023.
+
+The Amethyst app for Android does not collect or process any personal information from its users. The app is used to connect to third-party Nostr servers (also called Relays) that may or may not collect personal information and are not covered by this privacy policy. Each third-party relay server comes equipped with its own privacy policy that can be viewed through the app or through that server's website. The developers of this open source project or maintainers of the distribution channels (app stores) do not have access to the data located in the user's phone. Accounts are fully maintained by the user. We do not have control over them. 
+
+Data from connected accounts is only stored locally on the device when it is required for functionality and performance of Amethyst. This data is strictly confidental and cannot be accessed by other apps (on non-rooted devices). Phone data can be deleted by clearing Amethyst's local storage or uninstalling the app.
+
+We reserve the right to modify this Privacy Policy at any time. Any modifications to this Privacy Policy will be effective upon our posting the new terms and/or upon implementation of the new changes on the Service (or as otherwise indicated at the time of posting). In all cases, your continued use of the app after the posting of any modified Privacy Policy indicates your acceptance of the terms of the modified Privacy Policy.
+
+If you have any questions about Amethyst or this privacy policy, you can send a message to amethyst@vitorpamplona.com

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 4
-        versionName "0.4"
+        versionCode 16
+        versionName "0.9.5"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {
@@ -22,7 +22,7 @@ android {
 
     buildTypes {
         release {
-            minifyEnabled false
+            minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
@@ -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"
@@ -56,11 +56,12 @@ dependencies {
 
     // Navigation
     implementation("androidx.navigation:navigation-compose:$nav_version")
-    implementation 'androidx.lifecycle:lifecycle-runtime-compose:2.6.0-alpha03'
-    implementation 'androidx.compose.runtime:runtime-livedata:1.4.0-alpha03'
+    implementation 'androidx.lifecycle:lifecycle-runtime-compose:2.6.0-alpha04'
+    implementation 'androidx.compose.runtime:runtime-livedata:1.4.0-alpha04'
+    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'
@@ -80,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'
@@ -98,6 +99,15 @@ 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"
+
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'

app/proguard-rules.pro

@@ -18,4 +18,10 @@
 
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
-#-renamesourcefileattribute SourceFile
+#-renamesourcefileattribute SourceFile
+# For the Secp256k1 library
+-keep class fr.acinq.secp256k1.jni.** { *; }
+# For the NostrPostr library
+-keep class nostr.postr.** { *; }
+-keep class com.vitorpamplona.amethyst.model.** { *; }
+-keep class com.vitorpamplona.amethyst.service.** { *; }

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

@@ -1,24 +0,0 @@
-package com.vitorpamplona.amethyst
-
-import androidx.test.platform.app.InstrumentationRegistry
-import androidx.test.ext.junit.runners.AndroidJUnit4
-
-import org.junit.Test
-import org.junit.runner.RunWith
-
-import org.junit.Assert.*
-
-/**
- * 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,17 +9,16 @@
         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"
+        android:largeHeap="true"
         tools:targetApi="31">
         <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

@@ -1,29 +1,72 @@
 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 java.util.Date
+import nostr.postr.Contact
 import nostr.postr.Persona
+import nostr.postr.Utils
+import nostr.postr.events.ContactListEvent
+import nostr.postr.events.Event
+import nostr.postr.events.MetadataEvent
+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
   }
 
+  fun sendNewUserMetadata(toString: String) {
+    if (!isWriteable()) return
+
+    loggedIn.privKey?.let {
+      val createdAt = Date().time / 1000
+      val content = toString
+      val pubKey = Utils.pubkeyCreate(it)
+      val tags = listOf<List<String>>()
+      val id = Event.generateId(pubKey, createdAt, MetadataEvent.kind, tags, content)
+      val sig = Utils.sign(id, it)
+      val event = MetadataEvent(id, pubKey, createdAt, tags, content, sig)
+
+      Client.send(event)
+      LocalCache.consume(event)
+    }
+  }
+
   fun reactTo(note: Note) {
     if (!isWriteable()) return
 
+    if (note.reactions.firstOrNull { it.author == userProfile() } != null) {
+      // has already liked this note
+      return
+    }
+
     note.event?.let {
-      val event = ReactionEvent.create(it, loggedIn.privKey!!)
+      val event = ReactionEvent.createLike(it, loggedIn.privKey!!)
       Client.send(event)
       LocalCache.consume(event)
     }
@@ -39,31 +82,155 @@ class Account(val loggedIn: Persona) {
     }
   }
 
-  fun sendPost(message: String, replyingTo: Note?) {
+  fun broadcast(note: Note) {
+    note.event?.let {
+      Client.send(it)
+    }
+  }
+
+  fun follow(user: User) {
     if (!isWriteable()) return
 
-    val replyToEvent = replyingTo?.event
-    if (replyToEvent is TextNoteEvent) {
-      val repliesTo = replyToEvent.replyTos.plus(replyToEvent.id.toHex())
-      val mentions = replyToEvent.mentions.plus(replyToEvent.pubKey.toHex())
-
-      val signedEvent = TextNoteEvent.create(
-        msg = message,
-        replyTos = repliesTo,
-        mentions = mentions,
-        privateKey = loggedIn.privKey!!
-      )
-      Client.send(signedEvent)
-      LocalCache.consume(signedEvent)
+    val lastestContactList = userProfile().latestContactList
+    val event = if (lastestContactList != null) {
+      ContactListEvent.create(lastestContactList.follows.plus(Contact(user.pubkeyHex, null)), lastestContactList.relayUse, loggedIn.privKey!!)
     } else {
-      val signedEvent = TextNoteEvent.create(
-        msg = message,
-        replyTos = null,
-        mentions = null,
-        privateKey = loggedIn.privKey!!
-      )
-      Client.send(signedEvent)
-      LocalCache.consume(signedEvent)
+      val relays = Constants.defaultRelays.associate { it.url to ContactListEvent.ReadWrite(it.read, it.write) }
+      ContactListEvent.create(listOf(Contact(user.pubkeyHex, null)), relays, loggedIn.privKey!!)
+    }
+
+    Client.send(event)
+    LocalCache.consume(event)
+  }
+
+  fun unfollow(user: User) {
+    if (!isWriteable()) return
+
+    val lastestContactList = userProfile().latestContactList
+    if (lastestContactList != null) {
+      val event = ContactListEvent.create(lastestContactList.follows.filter { it.pubKeyHex != user.pubkeyHex }, lastestContactList.relayUse, loggedIn.privKey!!)
+      Client.send(event)
+      LocalCache.consume(event)
+    }
+  }
+
+  fun sendPost(message: String, replyTo: List<Note>?, mentions: List<User>?) {
+    if (!isWriteable()) return
+
+    val repliesToHex = replyTo?.map { it.idHex }
+    val mentionsHex = mentions?.map { it.pubkeyHex }
+
+    val signedEvent = TextNoteEvent.create(
+      msg = message,
+      replyTos = repliesToHex,
+      mentions = mentionsHex,
+      privateKey = loggedIn.privKey!!
+    )
+    Client.send(signedEvent)
+    LocalCache.consume(signedEvent)
+  }
+
+  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
+
+    val signedEvent = PrivateDmEvent.create(
+      recipientPubKey = user.pubkey,
+      publishedRecipientPubKey = user.pubkey,
+      msg = message,
+      privateKey = loggedIn.privKey!!,
+      advertiseNip18 = false
+    )
+    Client.send(signedEvent)
+    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) {
+      var pubkeyToUse = event.pubKey
+
+      val recepientPK = event.recipientPubKey
+
+      if (note.author == userProfile() && recepientPK != null)
+        pubkeyToUse = recepientPK
+
+      return try {
+        val sharedSecret = Utils.getSharedSecret(loggedIn.privKey!!, pubkeyToUse)
+
+        val retVal = Utils.decrypt(event.content, sharedSecret)
+
+        if (retVal.startsWith(PrivateDmEvent.nip18Advertisement)) {
+          retVal.substring(16)
+        } else {
+          retVal
+        }
+
+      } catch (e: Exception) {
+        e.printStackTrace()
+        null
+      }
+    } else {
+      event?.content
     }
   }
 
@@ -73,6 +240,8 @@ class Account(val loggedIn: Persona) {
   private fun refreshObservers() {
     live.refresh()
   }
+
+
 }
 
 class AccountLiveData(private val account: Account): LiveData<AccountState>(AccountState(account)) {

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

@@ -2,9 +2,13 @@ package com.vitorpamplona.amethyst.model
 
 import android.util.Log
 import androidx.lifecycle.LiveData
-import com.baha.url.preview.UrlInfoItem
 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
@@ -20,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 {
@@ -29,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 {
@@ -49,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) {
@@ -64,6 +80,7 @@ object LocalCache {
       }
 
       oldUser.updateUserInfo(newUser, event.createdAt)
+      oldUser.latestMetadata = event
     } else {
       //Log.d("MT","Relay sent a previous Metadata Event ${oldUser.toBestDisplayName()} ${formattedDateTime(event.createdAt)} > ${formattedDateTime(oldUser.updatedAt)}")
     }
@@ -86,7 +103,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)
@@ -104,8 +121,6 @@ object LocalCache {
       it.addReply(note)
     }
 
-    UrlCachedPreviewer.preloadPreviewsFor(note)
-
     refreshObservers()
   }
 
@@ -115,9 +130,9 @@ object LocalCache {
 
   fun consume(event: ContactListEvent) {
     val user = getOrCreateUser(event.pubKey)
-    //Log.d("CL", "${user.toBestDisplayName()} ${event.follows}")
 
     if (event.createdAt > user.updatedFollowsAt) {
+      //Log.d("CL", "AAA ${user.toBestDisplayName()} ${event.follows.size}")
       user.updateFollows(
         event.follows.map {
           try {
@@ -132,13 +147,35 @@ object LocalCache {
         }.filterNotNull(),
         event.createdAt
       )
+
+      user.latestContactList = event
     }
 
     refreshObservers()
   }
 
   fun consume(event: PrivateDmEvent) {
-    //Log.d("PM", event.toJson())
+    val note = getOrCreateNote(event.id.toHex())
+
+    // Already processed this event.
+    if (note.event != null) return
+
+    val author = getOrCreateUser(event.pubKey)
+    val recipient = event.recipientPubKey?.let { getOrCreateUser(it) }
+
+    //Log.d("PM", "${author.toBestDisplayName()} to ${recipient?.toBestDisplayName()}")
+
+    val repliesTo = event.tags.filter { it.firstOrNull() == "e" }.mapNotNull { it.getOrNull(1) }.map { getOrCreateNote(it) }.toMutableList()
+    val mentions = event.tags.filter { it.firstOrNull() == "p" }.mapNotNull { it.getOrNull(1) }.map { getOrCreateUser(decodePublicKey(it)) }
+
+    note.loadEvent(event, author, mentions, repliesTo)
+
+    if (recipient != null) {
+      author.addMessage(recipient, note)
+      recipient.addMessage(author, note)
+    }
+
+    refreshObservers()
   }
 
   fun consume(event: DeletionEvent) {
@@ -151,7 +188,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()
@@ -208,6 +245,119 @@ 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) }
+        .filter { it.event !is ChannelCreateEvent }
+        .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,21 +1,27 @@
 package com.vitorpamplona.amethyst.model
 
+import android.os.Handler
+import android.os.Looper
 import androidx.lifecycle.LiveData
-import com.baha.url.preview.UrlInfoItem
 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
 import java.time.format.DateTimeFormatter
 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
 
 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.
@@ -29,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 {
@@ -67,32 +75,47 @@ 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 {
-        return reactions.any { it.author == user }
+        return synchronized(reactions) {
+            reactions.any { it.author == user }
+        }
     }
 
     fun isBoostedBy(user: User): Boolean {
-        return boosts.any { it.author == user }
+        return synchronized(boosts) {
+            boosts.any { it.author == user }
+        }
     }
 
     // Observers line up here.
     val live: NoteLiveData = NoteLiveData(this)
 
-    private fun refreshObservers() {
-        live.refresh()
+    // Refreshes observers in batches.
+    var handlerWaiting = false
+    @Synchronized
+    fun invalidateData() {
+        if (handlerWaiting) return
+
+        handlerWaiting = true
+        val scope = CoroutineScope(Job() + Dispatchers.Main)
+        scope.launch {
+            delay(100)
+            live.refresh()
+            handlerWaiting = false
+        }
     }
 }
 

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

@@ -2,23 +2,35 @@ package com.vitorpamplona.amethyst.model
 
 import androidx.lifecycle.LiveData
 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
+import nostr.postr.events.MetadataEvent
 
 class User(val pubkey: ByteArray) {
     val pubkeyHex = pubkey.toHexKey()
-    val pubkeyDisplayHex = pubkey.toDisplayHex()
+    val pubkeyDisplayHex = pubkey.toShortenHex()
 
     var info = UserMetadata()
 
     var updatedMetadataAt: Long = 0;
     var updatedFollowsAt: Long = 0;
 
+    var latestContactList: ContactListEvent? = null
+    var latestMetadata: MetadataEvent? = null
+
     val notes = Collections.synchronizedSet(mutableSetOf<Note>())
     val follows = Collections.synchronizedSet(mutableSetOf<User>())
     val taggedPosts = Collections.synchronizedSet(mutableSetOf<Note>())
 
-    var follower: Number? = null
+    val followers = Collections.synchronizedSet(mutableSetOf<User>())
+    val messages = ConcurrentHashMap<User, MutableSet<Note>>()
 
     fun toBestDisplayName(): String {
         return bestDisplayName() ?: bestUsername() ?: pubkeyDisplayHex
@@ -37,26 +49,81 @@ class User(val pubkey: ByteArray) {
         return info.picture ?: "https://robohash.org/${pubkeyHex}.png"
     }
 
-    fun updateFollows(newFollows: List<User>, updateAt: Long) {
-        follows.clear()
-        follows.addAll(newFollows)
-        updatedFollowsAt = updateAt
+    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
+    fun getOrCreateChannel(user: User): MutableSet<Note> {
+        return messages[user] ?: run {
+            val channel = mutableSetOf<Note>()
+            messages[user] = channel
+            channel
+        }
+    }
+
+    fun addMessage(user: User, msg: Note) {
+        getOrCreateChannel(user).add(msg)
         live.refresh()
     }
 
+    fun updateFollows(newFollows: List<User>, updateAt: Long) {
+        val toBeAdded = synchronized(follows) {
+            newFollows - follows
+        }
+        val toBeRemoved = synchronized(follows) {
+            follows - newFollows
+        }
+        toBeAdded.forEach {
+            follow(it)
+        }
+        toBeRemoved.forEach {
+            unfollow(it)
+        }
+
+        updatedFollowsAt = updateAt
+    }
+
     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.
+    var handlerWaiting = false
+    @Synchronized
+    fun invalidateData() {
+        if (handlerWaiting) return
+
+        handlerWaiting = true
+        val scope = CoroutineScope(Job() + Dispatchers.Main)
+        scope.launch {
+            delay(100)
+            live.refresh()
+            handlerWaiting = false
+        }
     }
 }
 
@@ -66,6 +133,7 @@ class UserMetadata {
     var display_name: String? = null
     var displayName: String? = null
     var picture: String? = null
+    var banner: String? = null
     var website: String? = null
     var about: String? = null
     var nip05: String? = null
@@ -77,6 +145,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

@@ -6,10 +6,11 @@ import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.model.UserState
 import com.vitorpamplona.amethyst.service.model.RepostEvent
 import nostr.postr.JsonFilter
+import nostr.postr.events.ContactListEvent
+import nostr.postr.events.MetadataEvent
 import nostr.postr.events.TextNoteEvent
-import nostr.postr.toHex
 
-object NostrAccountDataSource: NostrDataSource("AccountData") {
+object NostrAccountDataSource: NostrDataSource<Note>("AccountData") {
   lateinit var account: Account
 
   private val cacheListener: (UserState) -> Unit = {
@@ -28,47 +29,46 @@ object NostrAccountDataSource: NostrDataSource("AccountData") {
       account.userProfile().live.removeObserver(cacheListener)
   }
 
-  fun createAccountFilter(): JsonFilter {
+  fun createAccountContactListFilter(): JsonFilter {
     return JsonFilter(
+      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 }
-      .sortedBy { it.event!!.createdAt }
+      .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

@@ -0,0 +1,45 @@
+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.model.User
+import nostr.postr.JsonFilter
+import nostr.postr.events.PrivateDmEvent
+
+object NostrChatRoomDataSource: NostrDataSource<Note>("ChatroomFeed") {
+  lateinit var account: Account
+  var withUser: User? = null
+
+  fun loadMessagesBetween(accountIn: Account, userId: String) {
+    account = accountIn
+    withUser = LocalCache.users[userId]
+  }
+
+  fun createMessagesToMeFilter() = JsonFilter(
+    kinds = listOf(PrivateDmEvent.kind),
+    authors = withUser?.let { listOf(it.pubkeyHex) },
+    tags = mapOf("p" to listOf(account.userProfile().pubkeyHex))
+  )
+
+  fun createMessagesFromMeFilter() = JsonFilter(
+    kinds = listOf(PrivateDmEvent.kind),
+    authors = listOf(account.userProfile().pubkeyHex),
+    tags = withUser?.let { mapOf("p" to listOf(it.pubkeyHex)) }
+  )
+
+  val incomingChannel = requestNewChannel()
+  val outgoingChannel = requestNewChannel()
+
+  // returns the last Note of each user.
+  override fun feed(): List<Note> {
+    val messages = account.userProfile().messages[withUser]
+
+    return messages?.sortedBy { it.event?.createdAt } ?: emptyList()
+  }
+
+  override fun updateChannelFilters() {
+    incomingChannel.filter = listOf(createMessagesToMeFilter()).ifEmpty { null }
+    outgoingChannel.filter = listOf(createMessagesFromMeFilter()).ifEmpty { null }
+  }
+}

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

@@ -0,0 +1,95 @@
+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
+
+object NostrChatroomListDataSource: NostrDataSource<Note>("MailBoxFeed") {
+  lateinit var account: Account
+
+  fun createMessagesToMeFilter() = JsonFilter(
+    kinds = listOf(PrivateDmEvent.kind),
+    tags = mapOf("p" to listOf(account.userProfile().pubkeyHex))
+  )
+
+  fun createMessagesFromMeFilter() = JsonFilter(
+    kinds = listOf(PrivateDmEvent.kind),
+    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()
+
+    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 = 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,12 +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
@@ -15,13 +30,29 @@ import nostr.postr.events.PrivateDmEvent
 import nostr.postr.events.RecommendRelayEvent
 import nostr.postr.events.TextNoteEvent
 
-abstract class NostrDataSource(val debugName: String) {
+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)
@@ -34,6 +65,12 @@ abstract class NostrDataSource(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))
           }
         }
       }
@@ -57,6 +94,10 @@ abstract class NostrDataSource(val debugName: String) {
         resetFilters()
       }*/
     }
+
+    override fun onSendResponse(eventId: String, success: Boolean, message: String, relay: Relay) {
+
+    }
   }
 
   init {
@@ -74,8 +115,24 @@ abstract class NostrDataSource(val debugName: String) {
     }
   }
 
-  fun loadTop(): List<Note> {
-    return feed().take(100)
+  fun loadTop(): List<T> {
+    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 {
@@ -91,11 +148,32 @@ abstract class NostrDataSource(val debugName: String) {
     channelIds.remove(channel.id)
   }
 
+  var handlerWaiting = false
+  @Synchronized
+  fun invalidateFilters() {
+    if (handlerWaiting) return
+
+    handlerWaiting = true
+    val scope = CoroutineScope(Job() + Dispatchers.IO)
+    scope.launch {
+      delay(200)
+      resetFiltersSuspend()
+      handlerWaiting = false
+    }
+  }
+
   fun resetFilters() {
+    val scope = CoroutineScope(Job() + Dispatchers.IO)
+    scope.launch {
+      resetFiltersSuspend()
+    }
+  }
+
+  fun resetFiltersSuspend() {
     // 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()
 
@@ -109,12 +187,12 @@ abstract class NostrDataSource(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 {
@@ -122,8 +200,8 @@ abstract class NostrDataSource(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)
           }
         }
       }
@@ -131,5 +209,5 @@ abstract class NostrDataSource(val debugName: String) {
   }
 
   abstract fun updateChannelFilters()
-  abstract fun feed(): List<Note>
+  abstract fun feed(): List<T>
 }

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

@@ -1,47 +1,26 @@
 package com.vitorpamplona.amethyst.service
 
 import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.model.Note
 import nostr.postr.JsonFilter
 import nostr.postr.events.TextNoteEvent
 
-object NostrGlobalDataSource: NostrDataSource("GlobalFeed") {
-  val fifteenMinutes = (60*15) // 15 mins
-
+object NostrGlobalDataSource: NostrDataSource<Note>("GlobalFeed") {
   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()
     }
-    .sortedBy { it.event!!.createdAt }
+    .sortedBy { it.event?.createdAt }
     .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

@@ -9,7 +9,7 @@ import nostr.postr.JsonFilter
 import nostr.postr.events.TextNoteEvent
 import nostr.postr.toHex
 
-object NostrHomeDataSource: NostrDataSource("HomeFeed") {
+object NostrHomeDataSource: NostrDataSource<Note>("HomeFeed") {
   lateinit var account: Account
 
   private val cacheListener: (UserState) -> Unit = {
@@ -28,17 +28,21 @@ object NostrHomeDataSource: NostrDataSource("HomeFeed") {
       account.userProfile().live.removeObserver(cacheListener)
   }
 
-  fun createFollowAccountsFilter(): JsonFilter? {
-    val follows = account.userProfile().follows?.map {
-      it.pubkey.toHex().substring(0, 6)
+  fun createFollowAccountsFilter(): JsonFilter {
+    val follows = account.userProfile().follows ?: emptySet()
+
+    val followKeys = synchronized(follows) {
+      follows.map {
+        it.pubkey.toHex().substring(0, 6)
+      }
     }
 
-    if (follows == null || follows.isEmpty()) return null
+    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
     )
   }
 
@@ -62,19 +66,25 @@ object NostrHomeDataSource: NostrDataSource("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 }
-      .sortedBy { it.event!!.createdAt }
+      .filter { (it.event is TextNoteEvent || it.event is RepostEvent) && it.author?.pubkeyHex in allowSet }
+      .sortedBy { it.event?.createdAt }
       .reversed()
   }
 
   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("GlobalFeed") {
+object NostrNotificationDataSource: NostrDataSource<Note>("NotificationFeed") {
   lateinit var account: Account
 
-  fun createGlobalFilter() = JsonFilter(
-    since = System.currentTimeMillis() / 1000 - (60 * 60 * 24 * 7), // 2 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

@@ -2,20 +2,25 @@ 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 NostrSingleEventDataSource: NostrDataSource("SingleEventFeed") {
-  val eventsToWatch = Collections.synchronizedList(mutableListOf<String>())
+object NostrSingleEventDataSource: NostrDataSource<Note>("SingleEventFeed") {
+  private var eventsToWatch = setOf<String>()
 
-  fun createRepliesAndReactionsFilter(): JsonFilter? {
-    val reactionsToWatch = eventsToWatch.map { it.substring(0, 8) }
+  private fun createRepliesAndReactionsFilter(): JsonFilter? {
+    val reactionsToWatch = eventsToWatch.map { it }
 
     if (reactionsToWatch.isEmpty()) {
       return null
     }
 
+    // downloads all the reactions to a given event.
     return JsonFilter(
+      kinds = listOf(TextNoteEvent.kind, ReactionEvent.kind, RepostEvent.kind),
       tags = mapOf("e" to reactionsToWatch)
     )
   }
@@ -33,13 +38,15 @@ object NostrSingleEventDataSource: NostrDataSource("SingleEventFeed") {
 
     val interestedEvents =
       (directEventsToLoad + threadingEventsToLoad)
-      .map { it.idHex.substring(0, 8) }
+      .map { it.idHex }
 
     if (interestedEvents.isEmpty()) {
       return null
     }
 
+    // downloads linked events to this event.
     return JsonFilter(
+      kinds = listOf(TextNoteEvent.kind, ReactionEvent.kind, RepostEvent.kind),
       ids = interestedEvents
     )
   }
@@ -54,17 +61,20 @@ object NostrSingleEventDataSource: NostrDataSource("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

@@ -6,16 +6,19 @@ import java.util.Collections
 import nostr.postr.JsonFilter
 import nostr.postr.events.MetadataEvent
 
-object NostrSingleUserDataSource: NostrDataSource("SingleUserFeed") {
-  val usersToWatch = Collections.synchronizedList(mutableListOf<String>())
+object NostrSingleUserDataSource: NostrDataSource<Note>("SingleUserFeed") {
+  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 = 1
+      )
+    }
   }
 
   val userChannel = requestNewChannel()
@@ -31,12 +34,12 @@ object NostrSingleUserDataSource: NostrDataSource("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,20 +2,24 @@ 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("SingleThreadFeed") {
+object NostrThreadDataSource: NostrDataSource<Note>("SingleThreadFeed") {
   val eventsToWatch = Collections.synchronizedList(mutableListOf<String>())
 
   fun createRepliesAndReactionsFilter(): JsonFilter? {
-    val reactionsToWatch = eventsToWatch.map { it.substring(0, 8) }
+    val reactionsToWatch = eventsToWatch.map { it }
 
     if (reactionsToWatch.isEmpty()) {
       return null
     }
 
     return JsonFilter(
+      kinds = listOf(TextNoteEvent.kind, ReactionEvent.kind, RepostEvent.kind),
       tags = mapOf("e" to reactionsToWatch)
     )
   }
@@ -46,8 +50,8 @@ object NostrThreadDataSource: NostrDataSource("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

@@ -0,0 +1,49 @@
+package com.vitorpamplona.amethyst.service
+
+import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.model.User
+import nostr.postr.JsonFilter
+import nostr.postr.events.MetadataEvent
+import nostr.postr.events.TextNoteEvent
+
+object NostrUserProfileDataSource: NostrDataSource<Note>("UserProfileFeed") {
+  var user: User? = null
+
+  fun loadUserProfile(userId: String) {
+    user = LocalCache.users[userId]
+    resetFilters()
+  }
+
+  fun createUserInfoFilter(): JsonFilter {
+    return JsonFilter(
+      kinds = listOf(MetadataEvent.kind),
+      authors = listOf(user!!.pubkeyHex),
+      limit = 1
+    )
+  }
+
+  fun createUserPostsFilter(): JsonFilter {
+    return JsonFilter(
+      kinds = listOf(TextNoteEvent.kind),
+      authors = listOf(user!!.pubkeyHex),
+      limit = 100
+    )
+  }
+
+  val userInfoChannel = requestNewChannel()
+  val notesChannel = requestNewChannel()
+
+  override fun feed(): List<Note> {
+    val notes = user?.notes ?: return emptyList()
+    val sortedNotes = synchronized(notes) {
+      notes.sortedBy { it.event?.createdAt }
+    }
+    return sortedNotes.reversed()
+  }
+
+  override fun updateChannelFilters() {
+    userInfoChannel.filter = listOf(createUserInfoFilter()).ifEmpty { null }
+    notesChannel.filter = listOf(createUserPostsFilter()).ifEmpty { null }
+  }
+}

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

@@ -0,0 +1,34 @@
+package com.vitorpamplona.amethyst.service
+
+import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.model.User
+import nostr.postr.JsonFilter
+import nostr.postr.events.ContactListEvent
+
+object NostrUserProfileFollowersDataSource: NostrDataSource<User>("UserProfileFollowerFeed") {
+  var user: User? = null
+
+  fun loadUserProfile(userId: String) {
+    user = LocalCache.users[userId]
+    resetFilters()
+  }
+
+  fun createFollowersFilter() = JsonFilter(
+    kinds = listOf(ContactListEvent.kind),
+    tags = mapOf("p" to listOf(user!!.pubkeyHex))
+  )
+
+  val followerChannel = requestNewChannel()
+
+  override fun feed(): List<User> {
+    val followers = user?.followers ?: emptyList()
+
+    return synchronized(followers) {
+      followers.toList()
+    }
+  }
+
+  override fun updateChannelFilters() {
+    followerChannel.filter = listOf(createFollowersFilter()).ifEmpty { null }
+  }
+}

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

@@ -0,0 +1,33 @@
+package com.vitorpamplona.amethyst.service
+
+import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.model.User
+import nostr.postr.JsonFilter
+import nostr.postr.events.ContactListEvent
+
+object NostrUserProfileFollowsDataSource: NostrDataSource<User>("UserProfileFollowsFeed") {
+  var user: User? = null
+
+  fun loadUserProfile(userId: String) {
+    user = LocalCache.users[userId]
+    resetFilters()
+  }
+
+  fun createFollowFilter(): JsonFilter {
+    return JsonFilter(
+      kinds = listOf(ContactListEvent.kind),
+      authors = listOf(user!!.pubkeyHex),
+      limit = 1
+    )
+  }
+
+  val followChannel = requestNewChannel()
+
+  override fun feed(): List<User> {
+    return user?.follows?.toList() ?: emptyList()
+  }
+
+  override fun updateChannelFilters() {
+    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) {
@@ -85,14 +77,27 @@ object Client: RelayPool.Listener {
         listeners.forEach { it.onRelayStateChange(type, relay) }
     }
 
+    override fun onSendResponse(eventId: String, success: Boolean, message: String, relay: Relay) {
+        listeners.forEach { it.onSendResponse(eventId, success, message, relay) }
+    }
+
     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 {
         /**
@@ -109,5 +114,10 @@ object Client: RelayPool.Listener {
          * Connected to or disconnected from a relay
          */
         open fun onRelayStateChange(type: Relay.Type, relay: Relay) = Unit
+
+        /**
+         * When an relay saves or rejects a new event.
+         */
+        open fun onSendResponse(eventId: String, success: Boolean, message: String, relay: Relay) = Unit
     }
 }

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,30 @@ 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() {
+        println("Connecting with ${url}")
         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) }
             }
@@ -59,8 +60,7 @@ class Relay(
                             it.onError(this@Relay, channel, Error("Relay sent notice: $channel"))
                         }
                         "OK" -> listeners.forEach {
-                            // "channel" being the second string in the string array ...
-                            // Event was saved correctly?
+                            it.onSendResponse(this@Relay, msg[1].asString, msg[2].asBoolean, msg[3].asString)
                         }
                         else -> listeners.forEach {
                             it.onError(
@@ -88,6 +88,10 @@ class Relay(
             }
 
             override fun onFailure(webSocket: WebSocket, t: Throwable, response: Response?) {
+                socket?.close(1000, "Normal close")
+                // Failures disconnect the relay. 
+                socket = null
+                //println("Relay onFailure ${url}, ${response?.message}")
                 t.printStackTrace()
                 listeners.forEach {
                     it.onError(this@Relay, "", Error("WebSocket Failure. Response: ${response}. Exception: ${t.message}", t))
@@ -100,30 +104,25 @@ class Relay(
     fun disconnect() {
         //httpClient.dispatcher.executorService.shutdown()
         socket?.close(1000, "Normal close")
+        socket = null
     }
 
-    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()
         }
     }
 
@@ -155,6 +154,7 @@ class Relay(
 
         fun onError(relay: Relay, subscriptionId: String, error: Error)
 
+        fun onSendResponse(relay: Relay, eventId: String, success: Boolean, message: String)
         /**
          * Connected to or disconnected from a relay
          *

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

@@ -3,18 +3,25 @@ package com.vitorpamplona.amethyst.service.relays
 import androidx.lifecycle.LiveData
 import com.vitorpamplona.amethyst.service.Constants
 import java.util.Collections
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.launch
 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 report(): String {
-        val connected = relays.filter { it.isConnected() }
-        return "${connected.size}/${relays.size}"
+    fun availableRelays(): Int {
+        return relays.size
+    }
+
+    fun connectedRelays(): Int {
+        return relays.filter { it.isConnected() }.size
     }
 
     fun loadRelays(relayList: List<Relay>? = null){
@@ -26,7 +33,8 @@ object RelayPool: Relay.Listener {
     }
 
     fun unloadRelays() {
-        relays.toList().forEach { removeRelay(it) }
+        relays.forEach { it.unregister(this) }
+        relays = listOf()
     }
 
     fun requestAndWatch() {
@@ -37,8 +45,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) {
@@ -58,19 +66,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 {
@@ -79,6 +85,8 @@ object RelayPool: Relay.Listener {
         fun onError(error: Error, subscriptionId: String, relay: Relay)
 
         fun onRelayStateChange(type: Relay.Type, relay: Relay)
+
+        fun onSendResponse(eventId: String, success: Boolean, message: String, relay: Relay)
     }
 
     @Synchronized
@@ -96,11 +104,18 @@ object RelayPool: Relay.Listener {
         refreshObservers()
     }
 
+    override fun onSendResponse(relay: Relay, eventId: String, success: Boolean, message: String) {
+        listeners.forEach { it.onSendResponse(eventId, success, message, relay) }
+    }
+
     // Observers line up here.
     val live: RelayPoolLiveData = RelayPoolLiveData(this)
 
     private fun refreshObservers() {
-        live.refresh()
+        val scope = CoroutineScope(Job() + Dispatchers.Main)
+        scope.launch {
+            live.refresh()
+        }
     }
 }
 

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,15 +9,24 @@ import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Surface
 import androidx.compose.ui.Modifier
 import androidx.lifecycle.viewmodel.compose.viewModel
-import com.google.android.exoplayer2.util.Util
+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
 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.AccountScreen
 import com.vitorpamplona.amethyst.ui.screen.AccountStateViewModel
@@ -26,6 +36,19 @@ 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())
+      }
+        .respectCacheHeaders(false)
+        .build()
+    }
+
     setContent {
       AmethystTheme {
         // A surface container using the 'background' color from the theme
@@ -51,6 +74,11 @@ class MainActivity : ComponentActivity() {
   override fun onPause() {
     NostrAccountDataSource.stop()
     NostrHomeDataSource.stop()
+    NostrChannelDataSource.stop()
+    NostrChatroomListDataSource.stop()
+    NostrUserProfileDataSource.stop()
+    NostrUserProfileFollowersDataSource.stop()
+    NostrUserProfileFollowsDataSource.stop()
 
     NostrGlobalDataSource.stop()
     NostrNotificationDataSource.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
@@ -18,10 +23,6 @@ import androidx.compose.material.Text
 import androidx.compose.material.TextFieldDefaults
 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.Alignment
 import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
@@ -33,34 +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.google.accompanist.flowlayout.FlowRow
+import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.Note
-import com.vitorpamplona.amethyst.ui.components.TagLink
 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.tagIndex
+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
 
@@ -107,30 +109,21 @@ fun NewPostView(onClose: () -> Unit, replyingTo: Note? = null, account: Account)
                         onPost = {
                             postViewModel.sendPost()
                             onClose()
-                        }
+                        },
+                        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
@@ -158,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)
                         }
                     }
                 }
@@ -191,7 +207,7 @@ fun NewPostView(onClose: () -> Unit, replyingTo: Note? = null, account: Account)
 }
 
 @Composable
-private fun CloseButton(onCancel: () -> Unit) {
+fun CloseButton(onCancel: () -> Unit) {
     Button(
         onClick = {
             onCancel()
@@ -207,17 +223,63 @@ private fun CloseButton(onCancel: () -> Unit) {
 }
 
 @Composable
-private fun PostButton(onPost: () -> Unit = {}) {
+fun PostButton(onPost: () -> Unit = {}, isActive: Boolean, modifier: Modifier = Modifier) {
     Button(
+        modifier = modifier,
         onClick = {
-            onPost()
+            if (isActive) {
+                onPost()
+            }
         },
         shape = RoundedCornerShape(20.dp),
         colors = ButtonDefaults
             .buttonColors(
-                backgroundColor = MaterialTheme.colors.primary
+                backgroundColor = if (isActive) MaterialTheme.colors.primary else Color.Gray
             )
     ) {
         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

@@ -7,24 +7,96 @@ import android.os.Build
 import android.provider.MediaStore
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
 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 ->
+                val currentMentions = replyNote.mentions ?: emptyList()
+                if (currentMentions.contains(replyUser)) {
+                    this.mentions = currentMentions
+                } else {
+                    this.mentions = currentMentions.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, replyTos, mentions)
+        message = TextFieldValue("")
         urlPreview = null
     }
 
@@ -37,22 +109,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/NewUserMetadataView.kt

@@ -0,0 +1,211 @@
+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.runtime.LaunchedEffect
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.ExperimentalComposeUiApi
+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
+
+@OptIn(ExperimentalComposeUiApi::class)
+@Composable
+fun NewUserMetadataView(onClose: () -> Unit, account: Account) {
+    val postViewModel: NewUserMetadataViewModel = viewModel()
+
+    LaunchedEffect(Unit) {
+        postViewModel.load(account)
+    }
+
+    Dialog(
+        onDismissRequest = { onClose() },
+        properties = DialogProperties(
+            usePlatformDefaultWidth = false,
+            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.userName.value.isNotBlank()
+                    )
+                }
+
+                Spacer(modifier = Modifier.height(10.dp))
+
+                Row(modifier = Modifier.fillMaxWidth(1f), verticalAlignment = Alignment.CenterVertically) {
+                    OutlinedTextField(
+                        label = { Text(text = "Display Name") },
+                        modifier =  Modifier.weight(1f),
+                        value = postViewModel.displayName.value,
+                        onValueChange = { postViewModel.displayName.value = it },
+                        placeholder = {
+                            Text(
+                                text = "My display name",
+                                color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                            )
+                        },
+                        keyboardOptions = KeyboardOptions.Default.copy(
+                            capitalization = KeyboardCapitalization.Sentences
+                        ),
+                        singleLine = true
+                    )
+
+                    Text("@", Modifier.padding(5.dp))
+
+                    OutlinedTextField(
+                        label = { Text(text = "Username") },
+                        modifier = Modifier.weight(1f),
+                        value = postViewModel.userName.value,
+                        onValueChange = { postViewModel.userName.value = it },
+                        placeholder = {
+                            Text(
+                                text = "My username",
+                                color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                            )
+                        },
+                        singleLine = true
+                    )
+                }
+
+                Spacer(modifier = Modifier.height(10.dp))
+
+                OutlinedTextField(
+                    label = { Text(text = "About me") },
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .height(100.dp),
+                    value = postViewModel.about.value,
+                    onValueChange = { postViewModel.about.value = it },
+                    placeholder = {
+                        Text(
+                            text = "About me",
+                            color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                        )
+                    },
+                    keyboardOptions = KeyboardOptions.Default.copy(
+                        capitalization = KeyboardCapitalization.Sentences
+                    ),
+                    maxLines = 10
+                )
+
+                Spacer(modifier = Modifier.height(10.dp))
+
+                OutlinedTextField(
+                    label = { Text(text = "Avatar URL") },
+                    modifier = Modifier.fillMaxWidth(),
+                    value = postViewModel.picture.value,
+                    onValueChange = { postViewModel.picture.value = it },
+                    placeholder = {
+                        Text(
+                            text = "https://mywebsite.com/me.jpg",
+                            color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                        )
+                    },
+                    singleLine = true
+                )
+
+                Spacer(modifier = Modifier.height(10.dp))
+
+                OutlinedTextField(
+                    label = { Text(text = "Banner URL") },
+                    modifier = Modifier.fillMaxWidth(),
+                    value = postViewModel.banner.value,
+                    onValueChange = { postViewModel.banner.value = it },
+                    placeholder = {
+                        Text(
+                            text = "https://mywebsite.com/mybanner.jpg",
+                            color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                        )
+                    },
+                    singleLine = true
+                )
+
+                Spacer(modifier = Modifier.height(10.dp))
+
+                OutlinedTextField(
+                    label = { Text(text = "Website URL") },
+                    modifier = Modifier.fillMaxWidth(),
+                    value = postViewModel.website.value,
+                    onValueChange = { postViewModel.website.value = it },
+                    placeholder = {
+                        Text(
+                            text = "https://mywebsite.com",
+                            color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                        )
+                    },
+                    singleLine = true
+                )
+
+                Spacer(modifier = Modifier.height(10.dp))
+
+                OutlinedTextField(
+                    label = { Text(text = "NIP-05") },
+                    modifier = Modifier.fillMaxWidth(),
+                    value = postViewModel.nip05.value,
+                    onValueChange = { postViewModel.nip05.value = it },
+                    placeholder = {
+                        Text(
+                            text = "_@mywebsite.com",
+                            color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                        )
+                    },
+                    singleLine = true
+                )
+
+                Spacer(modifier = Modifier.height(10.dp))
+                OutlinedTextField(
+                    label = { Text(text = "LN Address") },
+                    modifier = Modifier.fillMaxWidth(),
+                    value = postViewModel.lnAddress.value,
+                    onValueChange = { postViewModel.lnAddress.value = it },
+                    placeholder = {
+                        Text(
+                            text = "me@mylightiningnode.com",
+                            color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                        )
+                    },
+                    singleLine = true
+                )
+
+            }
+        }
+    }
+}

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

@@ -0,0 +1,79 @@
+package com.vitorpamplona.amethyst.ui.actions
+
+import androidx.compose.runtime.mutableStateOf
+import androidx.lifecycle.ViewModel
+import com.fasterxml.jackson.databind.ObjectMapper
+import com.fasterxml.jackson.databind.node.ObjectNode
+import com.vitorpamplona.amethyst.model.Account
+import java.io.ByteArrayInputStream
+import java.io.StringWriter
+
+class NewUserMetadataViewModel: ViewModel() {
+    private lateinit var account: Account
+
+    val userName = mutableStateOf("")
+    val displayName = mutableStateOf("")
+    val about = mutableStateOf("")
+
+    val picture = mutableStateOf("")
+    val banner = mutableStateOf("")
+
+    val website = mutableStateOf("")
+    val nip05 = mutableStateOf("")
+    val lnAddress = mutableStateOf("")
+
+    fun load(account: Account) {
+        this.account = account
+
+        account.userProfile().let {
+            userName.value = it.bestUsername() ?: ""
+            displayName.value = it.bestDisplayName() ?: ""
+            about.value = it.info.about ?: ""
+            picture.value = it.info.picture ?: ""
+            banner.value = it.info.banner ?: ""
+            website.value = it.info.website ?: ""
+            nip05.value = it.info.nip05 ?: ""
+            lnAddress.value = it.info.lud16 ?: ""
+        }
+    }
+
+    fun create() {
+        // Tries to not delete any existing attribute that we do not work with.
+        val latest = account.userProfile().latestMetadata
+        val currentJson = if (latest != null) {
+            ObjectMapper().readTree(
+                ByteArrayInputStream(latest.content.toByteArray(Charsets.UTF_8))
+            ) as ObjectNode
+        } else {
+            ObjectMapper().createObjectNode()
+        }
+        currentJson.put("name", userName.value)
+        currentJson.put("username", userName.value)
+        currentJson.put("display_name", displayName.value)
+        currentJson.put("displayName", displayName.value)
+        currentJson.put("picture", picture.value)
+        currentJson.put("banner", banner.value)
+        currentJson.put("website", website.value)
+        currentJson.put("about", about.value)
+        currentJson.put("nip05", nip05.value)
+        currentJson.put("lud06", lnAddress.value)
+
+        val writer = StringWriter()
+        ObjectMapper().writeValue(writer, currentJson)
+
+        account.sendNewUserMetadata(writer.buffer.toString())
+
+        clear()
+    }
+
+    fun clear() {
+        userName.value = ""
+        displayName.value = ""
+        about.value = ""
+        picture.value = ""
+        banner.value = ""
+        website.value = ""
+        nip05.value = ""
+        lnAddress.value = ""
+    }
+}

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

@@ -20,7 +20,6 @@ import androidx.compose.ui.unit.dp
 import com.google.accompanist.permissions.ExperimentalPermissionsApi
 import com.google.accompanist.permissions.isGranted
 import com.google.accompanist.permissions.rememberPermissionState
-import com.google.accompanist.permissions.shouldShowRationale
 
 @OptIn(ExperimentalPermissionsApi::class)
 @Composable
@@ -49,14 +48,14 @@ fun UploadFromGallery(onImageChosen: (Uri) -> Unit) {
                         showGallerySelect = true
                     }
                 ) {
-                    Text("Add Image from Gallery")
+                    Text("Upload Image")
                 }
             }
         }
     } else {
         Column {
             Button(onClick = { cameraPermissionState.launchPermissionRequest() }) {
-                Text("Add Image from Gallery")
+                Text("Upload Image")
             }
         }
     }

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

@@ -3,10 +3,8 @@ package com.vitorpamplona.amethyst.ui.components
 import android.content.Intent
 import android.net.Uri
 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.aspectRatio
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
@@ -29,10 +27,16 @@ 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) {
-  val amount = LnInvoiceUtil.getAmountInSats(lnInvoice)
+  val amount = try {
+    LnInvoiceUtil.getAmountInSats(lnInvoice)
+  } catch (e: Exception) {
+    e.printStackTrace()
+    null
+  }
 
   val context = LocalContext.current
 
@@ -72,14 +76,16 @@ fun InvoicePreview(lnInvoice: String) {
 
       Divider()
 
-      Text(
-        text = "${amount.toInt()} sats",
-        fontSize = 25.sp,
-        fontWeight = FontWeight.W500,
-        modifier = Modifier
-          .fillMaxWidth()
-          .padding(vertical = 10.dp),
-      )
+      amount?.let {
+        Text(
+          text = "${amount.toInt()} sats",
+          fontSize = 25.sp,
+          fontWeight = FontWeight.W500,
+          modifier = Modifier
+            .fillMaxWidth()
+            .padding(vertical = 10.dp),
+        )
+      } 
 
       Button(
         modifier = Modifier.fillMaxWidth().padding(vertical = 10.dp),

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

@@ -1,32 +1,28 @@
 package com.vitorpamplona.amethyst.ui.components
 
 import android.util.Patterns
-import androidx.compose.foundation.border
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.shape.RoundedCornerShape
-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.layout.ContentScale
 import androidx.compose.ui.unit.dp
-import coil.compose.AsyncImage
+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.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]*)\\]")
+val tagIndex = Pattern.compile(".*\\#\\[([0-9]+)\\].*")
 
 val mentionsPattern: Pattern = Pattern.compile("@([A-Za-z0-9_-]+)")
 val hashTagsPattern: Pattern = Pattern.compile("#([A-Za-z0-9_-]+)")
@@ -44,7 +40,7 @@ fun isValidURL(url: String?): Boolean {
 }
 
 @Composable
-fun RichTextViewer(content: String, tags: List<List<String>>?) {
+fun RichTextViewer(content: String, tags: List<List<String>>?, note: Note, accountViewModel: AccountViewModel, navController: NavController) {
   Column(modifier = Modifier.padding(top = 5.dp)) {
     // FlowRow doesn't work well with paragraphs. So we need to split them
     content.split('\n').forEach { paragraph ->
@@ -58,25 +54,20 @@ fun RichTextViewer(content: String, tags: List<List<String>>?) {
           } else if (isValidURL(word)) {
             val removedParamsFromUrl = word.split("?")[0].toLowerCase()
             if (imageExtension.matcher(removedParamsFromUrl).matches()) {
-              AsyncImage(
-                model = word,
-                contentDescription = word,
-                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))
-              )
+              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) {
-            TagLink(word, tags)
+            TagLink(word, tags, navController)
           } else {
             Text(text = "$word ")
           }
@@ -88,7 +79,7 @@ fun RichTextViewer(content: String, tags: List<List<String>>?) {
 }
 
 @Composable
-fun TagLink(word: String, tags: List<List<String>>) {
+fun TagLink(word: String, tags: List<List<String>>, navController: NavController) {
   val matcher = tagIndex.matcher(word)
 
   val index = try {
@@ -103,24 +94,23 @@ fun TagLink(word: String, tags: List<List<String>>) {
     return Text(text = "$word ")
   }
 
-  if (index > 0 && index < tags.size) {
+  if (index >= 0 && index < tags.size) {
     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()
-        Text(
-          "${innerNoteState?.note?.idDisplayHex}"
-        )
+        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,34 +1,12 @@
 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.CircleShape
-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.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.BahaUrlPreview
 import com.baha.url.preview.IUrlPreviewCallback
 import com.baha.url.preview.UrlInfoItem
 import com.vitorpamplona.amethyst.model.UrlCachedPreviewer
@@ -38,8 +16,6 @@ import com.vitorpamplona.amethyst.model.UrlCachedPreviewer
 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/VideoView.kt

@@ -1,19 +1,12 @@
 package com.vitorpamplona.amethyst.ui.components
 
-import android.media.browse.MediaBrowser
 import android.view.ViewGroup
 import android.widget.FrameLayout
-import androidx.compose.foundation.layout.IntrinsicSize
-import androidx.compose.foundation.layout.aspectRatio
-import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.wrapContentHeight
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.unit.dp
 import androidx.compose.ui.viewinterop.AndroidView
 import com.google.android.exoplayer2.C
 import com.google.android.exoplayer2.ExoPlayer
@@ -27,7 +20,6 @@ fun VideoView(videoUri: String) {
   val context = LocalContext.current
 
   val exoPlayer = ExoPlayer.Builder(LocalContext.current).build().apply {
-    playWhenReady = true
     repeatMode = Player.REPEAT_MODE_ALL
     videoScalingMode = C.VIDEO_SCALING_MODE_SCALE_TO_FIT_WITH_CROPPING
     setMediaItem(MediaItem.fromUri(videoUri))

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

@@ -0,0 +1,59 @@
+package com.vitorpamplona.amethyst.ui.components
+
+import androidx.compose.foundation.gestures.awaitFirstDown
+import androidx.compose.foundation.gestures.calculatePan
+import androidx.compose.foundation.gestures.calculateZoom
+import androidx.compose.foundation.gestures.forEachGesture
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.graphicsLayer
+import androidx.compose.ui.input.pointer.pointerInput
+import androidx.compose.ui.layout.ContentScale
+import coil.compose.AsyncImage
+
+@Composable
+fun ZoomableAsyncImage(imageUrl: String) {
+    var scale by remember { mutableStateOf(1f) }
+    var offsetX by remember { mutableStateOf(0f) }
+    var offsetY by remember { mutableStateOf(0f) }
+
+    Column(
+        verticalArrangement = Arrangement.Center,
+        horizontalAlignment = Alignment.CenterHorizontally,
+        modifier = Modifier
+            .pointerInput(Unit) {
+                forEachGesture {
+                    awaitPointerEventScope {
+                        awaitFirstDown()
+                        do {
+                            val event = awaitPointerEvent()
+                            scale *= event.calculateZoom()
+                            val offset = event.calculatePan()
+                            offsetX += offset.x
+                            offsetY += offset.y
+                        } while (event.changes.any { it.pressed })
+                    }
+                }
+            }
+    ) {
+        AsyncImage(
+            model = imageUrl,
+            contentDescription = "Profile Image",
+            contentScale = ContentScale.FillWidth,
+            modifier = Modifier.fillMaxSize().graphicsLayer(
+                scaleX = scale,
+                scaleY = scale,
+                translationX = offsetX,
+                translationY = offsetY
+            ),
+        )
+    }
+}

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

@@ -0,0 +1,85 @@
+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
+import androidx.compose.foundation.layout.fillMaxSize
+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.Surface
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.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, ExperimentalFoundationApi::class)
+fun ZoomableImageView(word: String) {
+  val clipboardManager = LocalClipboardManager.current
+
+  // store the dialog open or close state
+  var dialogOpen by remember {
+    mutableStateOf(false)
+  }
+
+  AsyncImage(
+    model = word,
+    contentDescription = word,
+    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))
+      .combinedClickable(
+        onClick = { dialogOpen = true },
+        onLongClick = { clipboardManager.setText(AnnotatedString(word)) },
+      )
+  )
+
+  if (dialogOpen) {
+    Dialog(
+      onDismissRequest = { dialogOpen = false },
+      properties = DialogProperties(usePlatformDefaultWidth = false)
+    ) {
+      Surface(modifier = Modifier.fillMaxSize(), color = MaterialTheme.colors.background) {
+        Column(
+          modifier = Modifier.padding(10.dp)
+        ) {
+          Row(
+            modifier = Modifier
+              .fillMaxWidth(),
+            horizontalArrangement = Arrangement.SpaceBetween,
+            verticalAlignment = Alignment.CenterVertically
+          ) {
+            CloseButton(onCancel = {
+              dialogOpen = false
+            })
+          }
+
+          ZoomableAsyncImage(word)
+        }
+      }
+    }
+  }
+}

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

@@ -47,10 +47,25 @@ fun AppBottomBar(navController: NavHostController) {
                     selected = currentRoute == item.route,
                     onClick = {
                         if (currentRoute != item.route) {
-                            navController.navigate(item.route)
+                            navController.navigate(item.route){
+                                navController.graph.startDestinationRoute?.let { start ->
+                                    popUpTo(start)
+                                    restoreState = true
+                                }
+                                launchSingleTop = true
+                                restoreState = true
+                            }
                         } else {
                             // TODO: Make it scrool to the top
-                            navController.navigate(item.route)
+                            navController.navigate(item.route){
+                                navController.graph.startDestinationRoute?.let { start ->
+                                    popUpTo(start) { inclusive = item.route == Route.Home.route }
+                                    restoreState = true
+                                }
+
+                                launchSingleTop = true
+                                restoreState = true
+                            }
                         }
                     }
                 )

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

@@ -4,17 +4,18 @@ import androidx.compose.runtime.Composable
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
-import androidx.navigation.compose.rememberNavController
+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

@@ -3,6 +3,7 @@ package com.vitorpamplona.amethyst.ui.navigation
 import android.util.Log
 import androidx.compose.foundation.layout.Column
 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
@@ -30,7 +31,21 @@ 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.service.relays.RelayPool
 import com.vitorpamplona.amethyst.ui.screen.RelayPoolViewModel
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import kotlinx.coroutines.launch
@@ -38,22 +53,22 @@ import kotlinx.coroutines.launch
 @Composable
 fun AppTopBar(navController: NavHostController, scaffoldState: ScaffoldState, accountViewModel: AccountViewModel) {
     when (currentRoute(navController)) {
-        Route.Profile.route,
-        Route.Lists.route,
-        Route.Topics.route,
-        Route.Bookmarks.route,
-        Route.Moments.route -> TopBarWithBackButton(navController)
+        //Route.Profile.route -> TopBarWithBackButton(navController)
         else -> MainTopBar(scaffoldState, accountViewModel)
     }
 }
 
 @Composable
 fun MainTopBar(scaffoldState: ScaffoldState, accountViewModel: AccountViewModel) {
-    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
 
     val relayViewModel: RelayPoolViewModel = viewModel { RelayPoolViewModel() }
-    val relayPoolLiveData by relayViewModel.relayPoolLiveData.observeAsState()
+    val connectedRelaysLiveData by relayViewModel.connectedRelaysLiveData.observeAsState()
+    val availableRelaysLiveData by relayViewModel.availableRelaysLiveData.observeAsState()
 
     val coroutineScope = rememberCoroutineScope()
 
@@ -70,20 +85,38 @@ 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()
+
+                            println("AAA: " + RelayPool.connectedRelays())
                         }
                     ) {
                         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(
@@ -98,15 +131,15 @@ fun MainTopBar(scaffoldState: ScaffoldState, accountViewModel: AccountViewModel)
                         model = accountUser?.profilePicture() ?: "https://robohash.org/ohno.png",
                         contentDescription = "Profile Image",
                         modifier = Modifier
-                            .width(34.dp)
+                            .width(34.dp).height(34.dp)
                             .clip(shape = CircleShape),
                     )
                 }
             },
             actions = {
                 Text(
-                    relayPoolLiveData ?: "--/--",
-                    color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                    "${connectedRelaysLiveData ?: "--"}/${availableRelaysLiveData ?: "--"}",
+                    color = if (connectedRelaysLiveData == 0) Color.Red else MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
                 )
 
                 IconButton(

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

@@ -8,15 +8,14 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 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.items
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material.Divider
 import androidx.compose.material.Icon
-import androidx.compose.material.IconButton
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.ScaffoldState
 import androidx.compose.material.Surface
@@ -35,6 +34,7 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.font.FontWeight.Companion.W500
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import androidx.navigation.NavController
 import androidx.navigation.NavHostController
 import coil.compose.AsyncImage
 import com.vitorpamplona.amethyst.R
@@ -43,21 +43,16 @@ import com.vitorpamplona.amethyst.ui.screen.AccountStateViewModel
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import kotlinx.coroutines.launch
 
-val bottomNavigations = listOf(
-    Route.Profile,
-    Route.Lists,
-    //Route.Topics,
-    Route.Bookmarks,
-    //Route.Moments
-)
-
 @Composable
 fun DrawerContent(navController: NavHostController,
                   scaffoldState: ScaffoldState,
                   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(
@@ -66,19 +61,35 @@ fun DrawerContent(navController: NavHostController,
     ) {
         Column() {
             Box {
-                Image(
-                    painter = painterResource(R.drawable.profile_banner),
-                    contentDescription = "Profile Banner",
-                    contentScale = ContentScale.FillWidth,
-                    modifier = Modifier.fillMaxWidth()
-                )
+                val banner = accountUser?.info?.banner
+                if (banner != null && banner.isNotBlank()) {
+                    AsyncImage(
+                        model = banner,
+                        contentDescription = "Profile Image",
+                        contentScale = ContentScale.FillWidth,
+                        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)
+                    )
+                }
 
                 ProfileContent(
                     accountUser,
                     modifier = Modifier
                         .fillMaxWidth()
                         .padding(horizontal = 25.dp)
-                        .padding(top = 125.dp)
+                        .padding(top = 100.dp),
+                    scaffoldState,
+                    navController
                 )
             }
             Divider(
@@ -86,6 +97,7 @@ fun DrawerContent(navController: NavHostController,
                 modifier = Modifier.padding(top = 20.dp)
             )
             ListContent(
+                accountUser,
                 navController,
                 scaffoldState,
                 modifier = Modifier
@@ -98,16 +110,27 @@ fun DrawerContent(navController: NavHostController,
 }
 
 @Composable
-fun ProfileContent(accountUser: User?, modifier: Modifier = Modifier) {
+fun ProfileContent(accountUser: User?, modifier: Modifier = Modifier, scaffoldState: ScaffoldState, navController: NavController) {
+    val coroutineScope = rememberCoroutineScope()
+
     Column(modifier = modifier) {
         AsyncImage(
             model = accountUser?.profilePicture() ?: "https://robohash.org/ohno.png",
             contentDescription = "Profile Image",
             modifier = Modifier
                 .width(100.dp)
+                .height(100.dp)
                 .clip(shape = CircleShape)
                 .border(3.dp, MaterialTheme.colors.background, CircleShape)
                 .background(MaterialTheme.colors.background)
+                .clickable(onClick = {
+                    accountUser?.let {
+                        navController.navigate("User/${it.pubkeyHex}")
+                    }
+                    coroutineScope.launch {
+                        scaffoldState.drawerState.close()
+                    }
+                })
         )
         Text(
             accountUser?.bestDisplayName() ?: "",
@@ -118,11 +141,11 @@ fun ProfileContent(accountUser: User?, modifier: Modifier = Modifier) {
         Text(" @${accountUser?.bestUsername()}", color = Color.LightGray)
         Row(modifier = Modifier.padding(top = 15.dp)) {
             Row() {
-                Text("${accountUser?.follows?.size}", fontWeight = FontWeight.Bold)
+                Text("${accountUser?.follows?.size ?: "--"}", fontWeight = FontWeight.Bold)
                 Text(" Following")
             }
             Row(modifier = Modifier.padding(start = 10.dp)) {
-                Text("${accountUser?.follower ?: "--"}", fontWeight = FontWeight.Bold)
+                Text("${accountUser?.followers?.size ?: "--"}", fontWeight = FontWeight.Bold)
                 Text(" Followers")
             }
         }
@@ -131,21 +154,25 @@ fun ProfileContent(accountUser: User?, modifier: Modifier = Modifier) {
 
 @Composable
 fun ListContent(
+    accountUser: User?,
     navController: NavHostController,
     scaffoldState: ScaffoldState,
     modifier: Modifier,
     accountViewModel: AccountStateViewModel
 ) {
-    Column(
-        modifier = modifier
-    ) {
+    Column(modifier = modifier) {
         LazyColumn() {
-            items(items = bottomNavigations) {
-                NavigationRow(navController, scaffoldState, it)
-            }
             item {
+                if (accountUser != null)
+                    NavigationRow(navController,
+                        scaffoldState,
+                        "User/${accountUser.pubkeyHex}",
+                        Route.Profile.icon,
+                        "Profile"
+                    )
+
                 Divider(
-                    modifier = Modifier.padding(vertical = 15.dp),
+                    modifier = Modifier.padding(bottom = 15.dp),
                     thickness = 0.25.dp
                 )
                 Column(modifier = modifier.padding(horizontal = 25.dp)) {
@@ -171,31 +198,37 @@ fun ListContent(
 }
 
 @Composable
-fun NavigationRow(navController: NavHostController, scaffoldState: ScaffoldState, route: Route) {
+fun NavigationRow(navController: NavHostController, scaffoldState: ScaffoldState, route: String, icon: Int, title: String) {
     val coroutineScope = rememberCoroutineScope()
     val currentRoute = currentRoute(navController)
-    Row(
-        modifier = Modifier
-            .padding(vertical = 15.dp, horizontal = 25.dp)
-            .clickable(onClick = {
-                if (currentRoute != route.route) {
-                    navController.navigate(route.route)
-                }
-                coroutineScope.launch {
-                    scaffoldState.drawerState.close()
-                }
-            }),
-        verticalAlignment = Alignment.CenterVertically
+    Row(modifier = Modifier
+        .fillMaxWidth()
+        .clickable(onClick = {
+            if (currentRoute != route) {
+                navController.navigate(route)
+            }
+            coroutineScope.launch {
+                scaffoldState.drawerState.close()
+            }
+        })
     ) {
-        Icon(
-            painter = painterResource(route.icon), null,
-            modifier = Modifier.size(22.dp),
-            tint = MaterialTheme.colors.primary
-        )
-        Text(
-            modifier = Modifier.padding(start = 16.dp),
-            text = route.route,
-            fontSize = 18.sp,
-        )
+        Row(
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(vertical = 15.dp, horizontal = 25.dp),
+            verticalAlignment = Alignment.CenterVertically
+        ) {
+            Icon(
+                painter = painterResource(icon), null,
+                modifier = Modifier.size(22.dp),
+                tint = MaterialTheme.colors.primary
+            )
+            Text(
+                modifier = Modifier.padding(start = 16.dp),
+                text = title,
+                fontSize = 18.sp,
+            )
+        }
     }
+
 }

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

@@ -10,12 +10,15 @@ 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
-import com.vitorpamplona.amethyst.ui.screen.MessageScreen
-import com.vitorpamplona.amethyst.ui.screen.ThreadScreen
 import com.vitorpamplona.amethyst.ui.screen.NotificationScreen
 import com.vitorpamplona.amethyst.ui.screen.ProfileScreen
 import com.vitorpamplona.amethyst.ui.screen.SearchScreen
+import com.vitorpamplona.amethyst.ui.screen.ThreadScreen
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 
 
@@ -23,21 +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 -> { _ -> MessageScreen(acc) }})
-    object Profile : Route("Profile", R.drawable.ic_profile, buildScreen = { acc, nav -> { _ -> ProfileScreen(acc) }})
-    object Lists : Route("Lists", R.drawable.ic_lists, buildScreen = { acc, nav -> { _ -> ProfileScreen(acc) }})
-    object Topics : Route("Topics", R.drawable.ic_topics, buildScreen = { acc, nav -> { _ -> ProfileScreen(acc) }})
-    object Bookmarks : Route("Bookmarks", R.drawable.ic_bookmarks, buildScreen = { acc, nav -> { _ -> ProfileScreen(acc) }})
-    object Moments : Route("Moments", R.drawable.ic_moments, buildScreen = { acc, nav -> { _ -> ProfileScreen(acc) }})
+    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, 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, 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) }}
     )
 }
 
@@ -50,13 +63,9 @@ val Routes = listOf(
 
     //drawer
     Route.Profile,
-    Route.Lists,
-    Route.Topics,
-    Route.Bookmarks,
-    Route.Moments,
-
-    //inner
-    Route.Note
+    Route.Note,
+    Route.Room,
+    Route.Channel
 )
 
 @Composable

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

@@ -1,9 +1,6 @@
 package com.vitorpamplona.amethyst.ui.note
 
-import android.text.format.DateUtils
-import android.text.format.DateUtils.getRelativeTimeSpanString
-import androidx.compose.foundation.background
-import androidx.compose.foundation.border
+import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
@@ -12,10 +9,7 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.material.Divider
 import androidx.compose.material.Icon
-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
@@ -24,20 +18,13 @@ 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.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.navigation.NavController
 import coil.compose.AsyncImage
 import com.google.accompanist.flowlayout.FlowRow
 import com.vitorpamplona.amethyst.R
-import com.vitorpamplona.amethyst.model.Note
-import com.vitorpamplona.amethyst.service.model.ReactionEvent
-import com.vitorpamplona.amethyst.service.model.RepostEvent
-import com.vitorpamplona.amethyst.ui.components.RichTextViewer
 import com.vitorpamplona.amethyst.ui.screen.BoostSetCard
-import com.vitorpamplona.amethyst.ui.screen.LikeSetCard
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
-import nostr.postr.events.TextNoteEvent
 
 @Composable
 fun BoostSetCompose(likeSetCard: BoostSetCard, isInnerNote: Boolean = false, accountViewModel: AccountViewModel, navController: NavController) {
@@ -85,6 +72,11 @@ fun BoostSetCompose(likeSetCard: BoostSetCard, isInnerNote: Boolean = false, acc
                                         .width(35.dp)
                                         .height(35.dp)
                                         .clip(shape = CircleShape)
+                                        .clickable(onClick = {
+                                            userState?.let {
+                                                navController.navigate("User/${it.user.pubkeyHex}")
+                                            }
+                                        })
                                 )
                             }
                         }

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

@@ -0,0 +1,162 @@
+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
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.material.Divider
+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.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.service.model.ChannelCreateEvent
+import com.vitorpamplona.amethyst.service.model.ChannelMetadataEvent
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
+
+@Composable
+fun ChatroomCompose(baseNote: Note, accountViewModel: AccountViewModel, navController: NavController) {
+    val noteState by baseNote.live.observeAsState()
+    val note = noteState?.note
+
+    val accountState by accountViewModel.accountLiveData.observeAsState()
+    val account = accountState?.account ?: return
+
+    val accountUserState by account.userProfile().live.observeAsState()
+    val accountUser = accountUserState?.user
+
+    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 { channel ->
+            ChannelName(
+                channelPicture = channel.profilePicture(),
+                channelTitle = {
+                    Text(
+                        "${channel.info.name}",
+                        fontWeight = FontWeight.Bold,
+                        modifier = it
+                    )
+                },
+                channelLastTime = note.event?.createdAt,
+                channelLastContent = "${author?.toBestDisplayName()}: " + description,
+                onClick = { navController.navigate("Channel/${channel.idHex}") })
+        }
+
+    } else {
+        val authorState by note.author!!.live.observeAsState()
+        val author = authorState?.user
+
+        val replyAuthorBase = note.mentions?.first()
+
+        var userToComposeOn = author
+
+        if ( replyAuthorBase != null ) {
+            val replyAuthorState by replyAuthorBase.live.observeAsState()
+            val replyAuthor = replyAuthorState?.user
+
+            if (author == accountUser) {
+                userToComposeOn = replyAuthor
+            }
+        }
+
+        userToComposeOn?.let { user ->
+            ChannelName(
+                channelPicture = user.profilePicture(),
+                channelTitle = { UsernameDisplay(user, it) },
+                channelLastTime = note.event?.createdAt,
+                channelLastContent = accountViewModel.decrypt(note),
+                onClick = { navController.navigate("Room/${user.pubkeyHex}") })
+        }
+    }
+
+}
+
+@Composable
+fun ChannelName(
+    channelPicture: String,
+    channelTitle: @Composable (Modifier) -> 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)
+        ) {
+
+            AsyncImage(
+                model = channelPicture,
+                contentDescription = "Profile Image",
+                modifier = Modifier
+                    .width(55.dp)
+                    .height(55.dp)
+                    .clip(shape = CircleShape)
+            )
+
+            Column(modifier = Modifier.padding(start = 10.dp),
+            verticalArrangement = Arrangement.SpaceAround) {
+                Row(
+                    verticalAlignment = Alignment.CenterVertically,
+                    modifier = Modifier.padding(bottom = 4.dp)
+                ) {
+                    channelTitle(Modifier.weight(1f))
+
+                    channelLastTime?.let {
+                        Text(
+                            timeAgo(channelLastTime),
+                            color = MaterialTheme.colors.onSurface.copy(alpha = 0.52f)
+                        )
+                    }
+
+                }
+
+                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

@@ -0,0 +1,213 @@
+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
+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.service.model.ReactionEvent
+import com.vitorpamplona.amethyst.service.model.RepostEvent
+import com.vitorpamplona.amethyst.ui.components.RichTextViewer
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
+
+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, innerQuote: Boolean = false, accountViewModel: AccountViewModel, navController: NavController) {
+    val noteState by baseNote.live.observeAsState()
+    val note = noteState?.note
+
+    val accountState by accountViewModel.accountLiveData.observeAsState()
+    val account = accountState?.account ?: return
+
+    val accountUserState by account.userProfile().live.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() {
+            Row(
+                modifier = Modifier.fillMaxWidth(1f).padding(
+                    start = 12.dp,
+                    end = 12.dp,
+                    top = 5.dp,
+                    bottom = 5.dp
+                ),
+                horizontalArrangement = alignment
+            ) {
+                Row(
+                    horizontalArrangement = alignment,
+                    modifier = Modifier.fillMaxWidth(if (innerQuote) 1f else 0.85f)
+                ) {
+
+                    Surface(
+                        color = backgroundBubbleColor,
+                        shape = shape,
+                        modifier = Modifier
+                            .combinedClickable(
+                                onClick = { },
+                                onLongClick = { popupExpanded = true }
+                            )
+                    ) {
+                        Column(
+                            modifier = Modifier.padding(start = 10.dp, end = 10.dp, bottom = 5.dp),
+                        ) {
+
+                            if (innerQuote || 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}")
+                                                }
+                                            })
+                                    )
+                                }
+                            }
+
+                            val replyTo = note.replyTo
+                            if (replyTo != null && replyTo.isNotEmpty()) {
+                                Row(verticalAlignment = Alignment.CenterVertically) {
+                                    replyTo.mapIndexed { index, note ->
+                                        ChatroomMessageCompose(
+                                            note,
+                                            innerQuote = true,
+                                            accountViewModel = accountViewModel,
+                                            navController = navController
+                                        )
+                                    }
+                                }
+                            }
+
+                            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 = Arrangement.End,
+                                modifier = Modifier.padding(top = 2.dp)
+                            ) {
+                                Text(
+                                    timeAgoLong(note.event?.createdAt),
+                                    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/LikeSetCompose.kt

@@ -1,9 +1,6 @@
 package com.vitorpamplona.amethyst.ui.note
 
-import android.text.format.DateUtils
-import android.text.format.DateUtils.getRelativeTimeSpanString
-import androidx.compose.foundation.background
-import androidx.compose.foundation.border
+import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
@@ -12,10 +9,7 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.material.Divider
 import androidx.compose.material.Icon
-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
@@ -24,26 +18,20 @@ 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.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.navigation.NavController
 import coil.compose.AsyncImage
 import com.google.accompanist.flowlayout.FlowRow
 import com.vitorpamplona.amethyst.R
-import com.vitorpamplona.amethyst.model.Note
-import com.vitorpamplona.amethyst.service.model.ReactionEvent
-import com.vitorpamplona.amethyst.service.model.RepostEvent
-import com.vitorpamplona.amethyst.ui.components.RichTextViewer
 import com.vitorpamplona.amethyst.ui.screen.LikeSetCard
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
-import nostr.postr.events.TextNoteEvent
 
 @Composable
 fun LikeSetCompose(likeSetCard: LikeSetCard, modifier: Modifier = Modifier, isInnerNote: Boolean = false, accountViewModel: AccountViewModel, navController: NavController) {
     val noteState by likeSetCard.note.live.observeAsState()
     val note = noteState?.note
 
-    if (note?.event == null) {
+    if (note == null) {
         BlankNote(Modifier, isInnerNote)
     } else {
         Column(modifier = modifier) {
@@ -81,9 +69,14 @@ fun LikeSetCompose(likeSetCard: LikeSetCard, modifier: Modifier = Modifier, isIn
                                     model = userState?.user?.profilePicture(),
                                     contentDescription = "Profile Image",
                                     modifier = Modifier
-                                        .width(35.dp)
+                                        .width(35.dp).height(35.dp)
                                         .height(35.dp)
                                         .clip(shape = CircleShape)
+                                        .clickable(onClick = {
+                                            userState?.let {
+                                                navController.navigate("User/${it.user.pubkeyHex}")
+                                            }
+                                        })
                                 )
                             }
                         }

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

@@ -1,6 +1,5 @@
 package com.vitorpamplona.amethyst.ui.note
 
-import android.text.format.DateUtils.getRelativeTimeSpanString
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
@@ -9,6 +8,7 @@ import androidx.compose.foundation.combinedClickable
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.shape.CircleShape
@@ -29,13 +29,12 @@ import androidx.compose.ui.draw.clip
 import androidx.compose.ui.platform.LocalClipboardManager
 import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.unit.DpOffset
 import androidx.compose.ui.unit.dp
 import androidx.navigation.NavController
-import androidx.navigation.compose.rememberNavController
 import coil.compose.AsyncImage
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.model.toNote
+import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
 import com.vitorpamplona.amethyst.service.model.ReactionEvent
 import com.vitorpamplona.amethyst.service.model.RepostEvent
 import com.vitorpamplona.amethyst.ui.components.RichTextViewer
@@ -52,14 +51,25 @@ fun NoteCompose(baseNote: Note, modifier: Modifier = Modifier, isInnerNote: Bool
     var popupExpanded by remember { mutableStateOf(false) }
 
     if (note?.event == null) {
-        BlankNote(modifier, isInnerNote)
+        BlankNote(modifier.combinedClickable(
+            onClick = {  },
+            onLongClick = { popupExpanded = true },
+        ), isInnerNote)
     } else {
         val authorState by note.author!!.live.observeAsState()
         val author = authorState?.user
 
         Column(modifier =
             modifier.combinedClickable(
-                onClick = { navController.navigate("Note/${note.idHex}") },
+                onClick = {
+                    if (note.event !is ChannelMessageEvent) {
+                        navController.navigate("Note/${note.idHex}")
+                    } else {
+                        note.channel?.let {
+                            navController.navigate("Channel/${it.idHex}")
+                        }
+                    }
+                },
                 onLongClick = { popupExpanded = true },
             )
         ) {
@@ -78,8 +88,13 @@ fun NoteCompose(baseNote: Note, modifier: Modifier = Modifier, isInnerNote: Bool
                             model = author?.profilePicture(),
                             contentDescription = "Profile Image",
                             modifier = Modifier
-                                .width(55.dp)
+                                .width(55.dp).height(55.dp)
                                 .clip(shape = CircleShape)
+                                .clickable(onClick = {
+                                    author?.let {
+                                        navController.navigate("User/${it.pubkeyHex}")
+                                    }
+                                })
                         )
 
                         // boosted picture
@@ -89,11 +104,16 @@ fun NoteCompose(baseNote: Note, modifier: Modifier = Modifier, isInnerNote: Bool
                                 model = boostedPosts[0].author?.profilePicture(),
                                 contentDescription = "Profile Image",
                                 modifier = Modifier
-                                    .width(35.dp)
+                                    .width(35.dp).height(35.dp)
                                     .clip(shape = CircleShape)
                                     .align(Alignment.BottomEnd)
                                     .background(MaterialTheme.colors.background)
                                     .border(2.dp, MaterialTheme.colors.primary, CircleShape)
+                                    .clickable(onClick = {
+                                        boostedPosts[0].author?.let {
+                                            navController.navigate("User/${it.pubkeyHex}")
+                                        }
+                                    })
                             )
                         }
                     }
@@ -102,12 +122,13 @@ fun NoteCompose(baseNote: Note, modifier: Modifier = Modifier, isInnerNote: Bool
                 Column(modifier = Modifier.padding(start = if (!isInnerNote) 10.dp else 0.dp)) {
                     Row(verticalAlignment = Alignment.CenterVertically) {
                         if (author != null)
-                            UserDisplay(author)
+                            UsernameDisplay(author, Modifier.weight(1f))
 
                         if (note.event !is RepostEvent) {
                             Text(
                                 timeAgo(note.event?.createdAt),
-                                color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                                color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f),
+                                maxLines = 1
                             )
                         } else {
                             Text(
@@ -119,7 +140,11 @@ 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)
+                    } else if (note.event is ChannelMessageEvent && (note.replyTo != null || note.mentions != null)) {
+                        note.channel?.let {
+                            ReplyInformationChannel(note.replyTo, note.mentions, it, navController)
+                        }
                     }
 
                     if (note.event is ReactionEvent || note.event is RepostEvent) {
@@ -145,9 +170,11 @@ fun NoteCompose(baseNote: Note, modifier: Modifier = Modifier, isInnerNote: Bool
                     } else {
                         val eventContent = note.event?.content
                         if (eventContent != null)
-                            RichTextViewer(eventContent, note.event?.tags)
+                            RichTextViewer(eventContent, note.event?.tags, note, accountViewModel, navController)
 
-                        ReactionsRowState(note, accountViewModel)
+                        if (note.event !is ChannelMessageEvent) {
+                            ReactionsRowState(note, accountViewModel)
+                        }
 
                         Divider(
                             modifier = Modifier.padding(top = 10.dp),
@@ -170,7 +197,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/ReactionsRow.kt

@@ -1,6 +1,8 @@
 package com.vitorpamplona.amethyst.ui.note
 
+import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.material.Icon
@@ -34,88 +36,87 @@ fun ReactionsRow(note: Note, account: Account, boost: (Note) -> Unit, reactTo: (
   if (wantsToReplyTo != null)
     NewPostView({ wantsToReplyTo = null }, wantsToReplyTo, account)
 
-  Row(modifier = Modifier.padding(top = 8.dp)) {
-    Row(verticalAlignment = Alignment.CenterVertically) {
-      IconButton(
-        modifier = Modifier.then(Modifier.size(24.dp)),
-        onClick = { if (account.isWriteable()) wantsToReplyTo = note }
-      ) {
+  Row(
+    modifier = Modifier.padding(top = 8.dp).fillMaxWidth(),
+    verticalAlignment = Alignment.CenterVertically,
+    horizontalArrangement = Arrangement.SpaceBetween
+  ) {
+    IconButton(
+      modifier = Modifier.then(Modifier.size(24.dp)),
+      onClick = { if (account.isWriteable()) wantsToReplyTo = note }
+    ) {
+      Icon(
+        painter = painterResource(R.drawable.ic_comment),
+        null,
+        modifier = Modifier.size(15.dp),
+        tint = grayTint,
+      )
+    }
+
+    Text(
+      "  ${showCount(note.replies?.size)}",
+      fontSize = 14.sp,
+      color = grayTint,
+      modifier = Modifier.weight(1f)
+    )
+
+    IconButton(
+      modifier = Modifier.then(Modifier.size(24.dp)),
+      onClick = { if (account.isWriteable()) boost(note) }
+    ) {
+      if (note.isBoostedBy(account.userProfile())) {
         Icon(
-          painter = painterResource(R.drawable.ic_comment),
+          painter = painterResource(R.drawable.ic_retweeted),
           null,
-          modifier = Modifier.size(15.dp),
-          tint = grayTint,
+          modifier = Modifier.size(20.dp),
+          tint = Color.Unspecified
+        )
+      } else {
+        Icon(
+          painter = painterResource(R.drawable.ic_retweet),
+          null,
+          modifier = Modifier.size(20.dp),
+          tint = grayTint
         )
       }
-
-      Text(
-        "  ${showCount(note.replies?.size)}",
-        fontSize = 14.sp,
-        color = grayTint
-      )
     }
-    Row(
-      modifier = Modifier.padding(start = 40.dp),
-      verticalAlignment = Alignment.CenterVertically
+
+    Text(
+      "  ${showCount(note.boosts?.size)}",
+      fontSize = 14.sp,
+      color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f),
+      modifier = Modifier.weight(1f)
+    )
+
+    IconButton(
+      modifier = Modifier.then(Modifier.size(24.dp)),
+      onClick = { if (account.isWriteable()) reactTo(note) }
     ) {
-      IconButton(
-        modifier = Modifier.then(Modifier.size(24.dp)),
-        onClick = { if (account.isWriteable()) boost(note) }
-      ) {
-        if (note.isBoostedBy(account.userProfile())) {
-          Icon(
-            painter = painterResource(R.drawable.ic_retweeted),
-            null,
-            modifier = Modifier.size(20.dp),
-            tint = Color.Unspecified
-          )
-        } else {
-          Icon(
-            painter = painterResource(R.drawable.ic_retweet),
-            null,
-            modifier = Modifier.size(20.dp),
-            tint = grayTint
-          )
-        }
+      if (note.isReactedBy(account.userProfile())) {
+        Icon(
+          painter = painterResource(R.drawable.ic_liked),
+          null,
+          modifier = Modifier.size(16.dp),
+          tint = Color.Unspecified
+        )
+      } else {
+        Icon(
+          painter = painterResource(R.drawable.ic_like),
+          null,
+          modifier = Modifier.size(16.dp),
+          tint = grayTint
+        )
       }
-
-      Text(
-        "  ${showCount(note.boosts?.size)}",
-        fontSize = 14.sp,
-        color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
-      )
     }
-    Row(
-      modifier = Modifier.padding(start = 40.dp),
-      verticalAlignment = Alignment.CenterVertically
-    ) {
-      IconButton(
-        modifier = Modifier.then(Modifier.size(24.dp)),
-        onClick = { if (account.isWriteable()) reactTo(note) }
-      ) {
-        if (note.isReactedBy(account.userProfile())) {
-          Icon(
-            painter = painterResource(R.drawable.ic_liked),
-            null,
-            modifier = Modifier.size(16.dp),
-            tint = Color.Unspecified
-          )
-        } else {
-          Icon(
-            painter = painterResource(R.drawable.ic_like),
-            null,
-            modifier = Modifier.size(16.dp),
-            tint = grayTint
-          )
-        }
-      }
 
-      Text(
-        "  ${showCount(note.reactions?.size)}",
-        fontSize = 14.sp,
-        color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
-      )
-    }
+    Text(
+      "  ${showCount(note.reactions?.size)}",
+      fontSize = 14.sp,
+      color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f),
+      modifier = Modifier.weight(1f)
+    )
+
+    /*
     Row(
       modifier = Modifier.padding(start = 40.dp),
       verticalAlignment = Alignment.CenterVertically
@@ -132,6 +133,8 @@ fun ReactionsRow(note: Note, account: Account, boost: (Note) -> Unit, reactTo: (
         )
       }
     }
+
+     */
   }
 }
 

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

@@ -1,61 +1,145 @@
 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.Channel
 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)
+              )
+            }
+          }
+        }
+      }
+    }
+  }
+}
+
+
+@Composable
+fun ReplyInformationChannel(replyTo: MutableList<Note>?, mentions: List<User>?, channel: Channel, navController: NavController) {
+  ReplyInformationChannel(replyTo, mentions, channel,
+    onUserTagClick = {
+      navController.navigate("User/${it.pubkeyHex}")
+    },
+    onChannelTagClick = {
+      navController.navigate("Channel/${it.idHex}")
+    }
+  )
+}
+
+
+@Composable
+fun ReplyInformationChannel(replyTo: MutableList<Note>?,
+                     mentions: List<User>?,
+                     channel: Channel,
+                     prefix: String = "",
+                     onUserTagClick: (User) -> Unit,
+                     onChannelTagClick: (Channel) -> Unit
+) {
+  FlowRow() {
+    if (mentions != null && mentions.isNotEmpty()) {
+      if (replyTo != null && replyTo.isNotEmpty()) {
+        Text(
+          "in channel ",
+          fontSize = 13.sp,
+          color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+        )
+
+        ClickableText(
+          AnnotatedString("${channel.info.name} "),
+          style = LocalTextStyle.current.copy(color = MaterialTheme.colors.primary.copy(alpha = 0.52f), fontSize = 13.sp),
+          onClick = { onChannelTagClick(channel) }
+        )
+
+        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()
+          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,6 +18,7 @@ fun timeAgo(mills: Long?): String {
   return " • " + humanReadable
     .replace(" hr. ago", "h")
     .replace(" min. ago", "m")
+    .replace(" days ago", "d")
 }
 
 fun timeAgoLong(mills: Long?): String {

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

@@ -0,0 +1,80 @@
+package com.vitorpamplona.amethyst.ui.note
+
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+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.material.Divider
+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.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.unit.dp
+import androidx.navigation.NavController
+import coil.compose.AsyncImage
+import com.vitorpamplona.amethyst.model.User
+import com.vitorpamplona.amethyst.ui.screen.FollowButton
+import com.vitorpamplona.amethyst.ui.screen.UnfollowButton
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
+
+@Composable
+fun UserCompose(baseUser: User, accountViewModel: AccountViewModel, navController: NavController) {
+    val accountState by accountViewModel.accountLiveData.observeAsState()
+
+    val userState by baseUser.live.observeAsState()
+    val user = userState?.user ?: return
+
+    Column(modifier =
+        Modifier.clickable(
+            onClick = { navController.navigate("User/${user.pubkeyHex}") }
+        )
+    ) {
+        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)
+                )
+            }
+
+            Column(modifier = Modifier.padding(start = 10.dp)) {
+                if (accountState?.account?.userProfile()?.isFollowing(user) == true) {
+                    UnfollowButton { accountState?.account?.unfollow(user) }
+                } else {
+                    FollowButton { accountState?.account?.follow(user) }
+                }
+            }
+        }
+
+        Divider(
+            modifier = Modifier.padding(top = 10.dp),
+            thickness = 0.25.dp
+        )
+    }
+}

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

@@ -1,26 +0,0 @@
-package com.vitorpamplona.amethyst.ui.note
-
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.text.font.FontWeight
-import com.vitorpamplona.amethyst.model.User
-
-@Composable
-fun UserDisplay(user: User) {
-    if (user.bestUsername() != null || user.bestDisplayName() != null) {
-      Text(
-        user.bestDisplayName() ?: "",
-        fontWeight = FontWeight.Bold,
-      )
-      Text(
-        "@${(user.bestUsername() ?: "")}",
-        color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f),
-      )
-    } else {
-      Text(
-        user.pubkeyDisplayHex,
-        fontWeight = FontWeight.Bold,
-      )
-    }
-}

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

@@ -0,0 +1,44 @@
+package com.vitorpamplona.amethyst.ui.note
+
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextOverflow
+import com.vitorpamplona.amethyst.model.User
+
+@Composable
+fun UsernameDisplay(user: User, weight: Modifier = Modifier) {
+    if (user.bestUsername() != null || user.bestDisplayName() != null) {
+      if (user.bestDisplayName().isNullOrBlank()) {
+        Text(
+          "@${(user.bestUsername() ?: "")}",
+          fontWeight = FontWeight.Bold,
+          maxLines = 1,
+          overflow = TextOverflow.Ellipsis,
+          modifier = weight
+        )
+      } else {
+        Text(
+          user.bestDisplayName() ?: "",
+          fontWeight = FontWeight.Bold,
+        )
+        Text(
+          "@${(user.bestUsername() ?: "")}",
+          color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f),
+          maxLines = 1,
+          overflow = TextOverflow.Ellipsis,
+          modifier = weight
+        )
+      }
+    } else {
+      Text(
+        user.pubkeyDisplayHex,
+        fontWeight = FontWeight.Bold,
+        maxLines = 1,
+        overflow = TextOverflow.Ellipsis,
+        modifier = weight
+      )
+    }
+}

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

@@ -4,11 +4,9 @@ import androidx.compose.animation.Crossfade
 import androidx.compose.foundation.layout.Column
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
-import androidx.lifecycle.compose.ExperimentalLifecycleComposeApi
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 
-@OptIn(ExperimentalLifecycleComposeApi::class)
 @Composable
 fun AccountScreen(accountStateViewModel: AccountStateViewModel) {
   val accountState by accountStateViewModel.accountContent.collectAsStateWithLifecycle()

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.NostrChatroomListDataSource
 import com.vitorpamplona.amethyst.service.NostrGlobalDataSource
 import com.vitorpamplona.amethyst.service.NostrHomeDataSource
 import com.vitorpamplona.amethyst.service.NostrNotificationDataSource
@@ -26,39 +28,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
+    NostrAccountDataSource.account = account
+    NostrHomeDataSource.account = account
+    NostrNotificationDataSource.account = account
+    NostrChatroomListDataSource.account = account
 
     NostrAccountDataSource.start()
     NostrGlobalDataSource.start()
@@ -67,10 +77,7 @@ class AccountStateViewModel(private val encryptedPreferences: EncryptedSharedPre
     NostrSingleEventDataSource.start()
     NostrSingleUserDataSource.start()
     NostrThreadDataSource.start()
-  }
-
-  fun newKey() {
-    login(Persona())
+    NostrChatroomListDataSource.start()
   }
 
   fun logOff() {
@@ -86,20 +93,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/CardFeedView.kt

@@ -1,27 +1,19 @@
 package com.vitorpamplona.amethyst.ui.screen
 
 import androidx.compose.animation.Crossfade
-import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
-import androidx.compose.foundation.layout.fillMaxHeight
-import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.foundation.lazy.rememberLazyListState
-import androidx.compose.material.Button
-import androidx.compose.material.OutlinedButton
-import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
-import androidx.lifecycle.compose.ExperimentalLifecycleComposeApi
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.navigation.NavController
 import com.google.accompanist.swiperefresh.SwipeRefresh
@@ -31,10 +23,9 @@ import com.vitorpamplona.amethyst.ui.note.LikeSetCompose
 import com.vitorpamplona.amethyst.ui.note.NoteCompose
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 
-@OptIn(ExperimentalLifecycleComposeApi::class)
 @Composable
 fun CardFeedView(viewModel: CardFeedViewModel, accountViewModel: AccountViewModel, navController: NavController) {
-    val feedState by viewModel.feedContent.collectAsStateWithLifecycle()
+    val feedState by viewModel.feedContent.collectAsState()
 
     var isRefreshing by remember { mutableStateOf(false) }
     val swipeRefreshState = rememberSwipeRefreshState(isRefreshing)

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,26 +10,30 @@ 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
 import kotlinx.coroutines.launch
 
-class CardFeedViewModel(val dataSource: NostrDataSource): ViewModel() {
+class CardFeedViewModel(val dataSource: NostrDataSource<Note>): ViewModel() {
     private val _feedContent = MutableStateFlow<CardFeedState>(CardFeedState.Loading)
     val feedContent = _feedContent.asStateFlow()
 
     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): 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) }
+    var handlerWaiting = false
+    @Synchronized
+    fun invalidateData() {
+        if (handlerWaiting) return
+
+        handlerWaiting = true
+        val scope = CoroutineScope(Job() + Dispatchers.IO)
+        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

@@ -0,0 +1,83 @@
+package com.vitorpamplona.amethyst.ui.screen
+
+import androidx.compose.animation.Crossfade
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.itemsIndexed
+import androidx.compose.foundation.lazy.rememberLazyListState
+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.unit.dp
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import androidx.navigation.NavController
+import com.google.accompanist.swiperefresh.SwipeRefresh
+import com.google.accompanist.swiperefresh.rememberSwipeRefreshState
+import com.vitorpamplona.amethyst.ui.note.ChatroomMessageCompose
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
+
+@Composable
+fun ChatroomFeedView(viewModel: FeedViewModel, accountViewModel: AccountViewModel, navController: NavController) {
+    val feedState by viewModel.feedContent.collectAsStateWithLifecycle()
+
+    var isRefreshing by remember { mutableStateOf(false) }
+    val swipeRefreshState = rememberSwipeRefreshState(isRefreshing)
+
+    val listState = rememberLazyListState()
+
+    LaunchedEffect(isRefreshing) {
+        if (isRefreshing) {
+            viewModel.refresh()
+            isRefreshing = false
+        }
+    }
+
+    SwipeRefresh(
+        state = swipeRefreshState,
+        onRefresh = {
+            isRefreshing = true
+        },
+    ) {
+        Column() {
+            Crossfade(targetState = feedState) { state ->
+                when (state) {
+                    is FeedState.Empty -> {
+                        FeedEmpty {
+                            isRefreshing = true
+                        }
+                    }
+                    is FeedState.FeedError -> {
+                        FeedError(state.errorMessage) {
+                            isRefreshing = true
+                        }
+                    }
+                    is FeedState.Loaded -> {
+                        LazyColumn(
+                            contentPadding = PaddingValues(
+                                top = 10.dp,
+                                bottom = 10.dp
+                            ),
+                            state = listState
+                        ) {
+                            var previousDate: String = ""
+                            itemsIndexed(state.feed, key = { _, item -> item.idHex }) { index, item ->
+                                ChatroomMessageCompose(item, accountViewModel = accountViewModel, navController = navController)
+                            }
+                        }
+
+                        LaunchedEffect(Unit) {
+                            listState.animateScrollToItem(state.feed.size-1, 0)
+                        }
+                    }
+                    FeedState.Loading -> {
+                        LoadingFeed()
+                    }
+                }
+            }
+        }
+    }
+}

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

@@ -0,0 +1,78 @@
+package com.vitorpamplona.amethyst.ui.screen
+
+import androidx.compose.animation.Crossfade
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.itemsIndexed
+import androidx.compose.foundation.lazy.rememberLazyListState
+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.unit.dp
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import androidx.navigation.NavController
+import com.google.accompanist.swiperefresh.SwipeRefresh
+import com.google.accompanist.swiperefresh.rememberSwipeRefreshState
+import com.vitorpamplona.amethyst.ui.note.ChatroomCompose
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
+
+@Composable
+fun ChatroomListFeedView(viewModel: FeedViewModel, accountViewModel: AccountViewModel, navController: NavController) {
+    val feedState by viewModel.feedContent.collectAsStateWithLifecycle()
+
+    var isRefreshing by remember { mutableStateOf(false) }
+    val swipeRefreshState = rememberSwipeRefreshState(isRefreshing)
+
+    val listState = rememberLazyListState()
+
+    LaunchedEffect(isRefreshing) {
+        if (isRefreshing) {
+            viewModel.refresh()
+            isRefreshing = false
+        }
+    }
+
+    SwipeRefresh(
+        state = swipeRefreshState,
+        onRefresh = {
+            isRefreshing = true
+        },
+    ) {
+        Column() {
+            Crossfade(targetState = feedState) { state ->
+                when (state) {
+                    is FeedState.Empty -> {
+                        FeedEmpty {
+                            isRefreshing = true
+                        }
+                    }
+                    is FeedState.FeedError -> {
+                        FeedError(state.errorMessage) {
+                            isRefreshing = true
+                        }
+                    }
+                    is FeedState.Loaded -> {
+                        LazyColumn(
+                            contentPadding = PaddingValues(
+                                top = 10.dp,
+                                bottom = 10.dp
+                            ),
+                            state = listState
+                        ) {
+                            itemsIndexed(state.feed, key = { _, item -> item.idHex }) { index, item ->
+                                ChatroomCompose(item, accountViewModel = accountViewModel, navController = navController)
+                            }
+                        }
+                    }
+                    FeedState.Loading -> {
+                        LoadingFeed()
+                    }
+                }
+            }
+        }
+    }
+}

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

@@ -14,6 +14,7 @@ import androidx.compose.material.OutlinedButton
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
@@ -21,7 +22,6 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
-import androidx.lifecycle.compose.ExperimentalLifecycleComposeApi
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.navigation.NavController
 import com.google.accompanist.swiperefresh.SwipeRefresh
@@ -29,10 +29,9 @@ import com.google.accompanist.swiperefresh.rememberSwipeRefreshState
 import com.vitorpamplona.amethyst.ui.note.NoteCompose
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 
-@OptIn(ExperimentalLifecycleComposeApi::class)
 @Composable
 fun FeedView(viewModel: FeedViewModel, accountViewModel: AccountViewModel, navController: NavController) {
-    val feedState by viewModel.feedContent.collectAsStateWithLifecycle()
+    val feedState by viewModel.feedContent.collectAsState()
 
     var isRefreshing by remember { mutableStateOf(false) }
     val swipeRefreshState = rememberSwipeRefreshState(isRefreshing)
@@ -41,7 +40,7 @@ fun FeedView(viewModel: FeedViewModel, accountViewModel: AccountViewModel, navCo
 
     LaunchedEffect(isRefreshing) {
         if (isRefreshing) {
-            viewModel.refresh()
+            viewModel.hardRefresh()
             isRefreshing = false
         }
     }
@@ -133,57 +132,4 @@ fun FeedEmpty(onRefresh: () -> Unit) {
             Text(text = "Refresh")
         }
     }
-}
-
-
-// Bosted code to be deleted:
-
-/*
-
-                                Boosted By: removed because it was ugly
-
-                                if (item.event is RepostEvent) {
-                                    Row(
-                                        modifier = Modifier.padding(
-                                            start = 12.dp,
-                                            end = 12.dp,
-                                            bottom = 8.dp
-                                        ),
-                                        verticalAlignment = Alignment.CenterVertically
-                                    ) {
-                                        Icon(
-                                            painter = painterResource(R.drawable.ic_retweet),
-                                            null,
-                                            modifier = Modifier.size(20.dp),
-                                            tint = Color.Gray
-                                        )
-                                        Text(
-                                            text = "Boosted by ${item.author.toBestDisplayName()}",
-                                            modifier = Modifier.padding(start = 10.dp),
-                                            fontWeight = FontWeight.Bold,
-                                            color = Color.Gray,
-                                        )
-                                    }
-                                    val refNote = item.replyTo.firstOrNull()
-                                    if (refNote != null) {
-                                        NoteCompose(index, refNote)
-                                    } else {
-                                        Row(
-                                            modifier = Modifier.padding(
-                                                start = 40.dp,
-                                                end = 40.dp,
-                                                bottom = 25.dp,
-                                                top = 15.dp
-                                            ),
-                                            verticalAlignment = Alignment.CenterVertically
-                                        ) {
-                                            Text(
-                                                text = "Could not find referenced event",
-                                                modifier = Modifier.padding(30.dp),
-                                                color = Color.Gray,
-                                            )
-                                        }
-                                    }
-                                } else {
-                                    NoteCompose(index, item)
-                                }*/
+}

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

@@ -5,35 +5,79 @@ 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 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
+import kotlinx.coroutines.withContext
 
+class NostrChannelFeedViewModel: FeedViewModel(NostrChannelDataSource)
+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): ViewModel() {
+class NostrChatroomListKnownFeedViewModel: FeedViewModel(NostrChatroomListDataSource) {
+    override fun newListFromDataSource(): List<Note> {
+        // Filter: all channels + PMs the account has replied to
+        return super.newListFromDataSource().filter {
+            val me = NostrChatroomListDataSource.account.userProfile()
+            it.channel != null || me.messages[it.author]?.firstOrNull { me == it.author } != null
+        }
+    }
+}
+class NostrChatroomListNewFeedViewModel: FeedViewModel(NostrChatroomListDataSource) {
+    override fun newListFromDataSource(): List<Note> {
+        // Filter: no channels + PMs the account has never replied to
+        return super.newListFromDataSource().filter {
+            val me = NostrChatroomListDataSource.account.userProfile()
+            it.channel == null && me.messages[it.author]?.firstOrNull { me == it.author } == null
+        }
+    }
+}
+
+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()
-        }
+    open fun newListFromDataSource(): List<Note> {
+        return dataSource.loadTop()
     }
 
-    fun refreshSuspend() {
-        val notes = dataSource.loadTop()
+    fun hardRefresh() {
+        dataSource.resetFilters()
+    }
 
-        val oldNotesState = feedContent.value
-        if (oldNotesState is FeedState.Loaded) {
-            if (notes != oldNotesState.feed) {
-                updateFeed(notes)
+    fun refresh() {
+        viewModelScope.launch(Dispatchers.IO) {
+            val notes = newListFromDataSource()
+
+            val oldNotesState = feedContent.value
+            if (oldNotesState is FeedState.Loaded) {
+                if (notes != oldNotesState.feed) {
+                    withContext(Dispatchers.Main) {
+                        updateFeed(notes)
+                    }
+                }
+            } else {
+                withContext(Dispatchers.Main) {
+                    updateFeed(notes)
+                }
             }
-        } else {
-            updateFeed(notes)
         }
     }
 
@@ -45,15 +89,22 @@ class FeedViewModel(val dataSource: NostrDataSource): ViewModel() {
         }
     }
 
-    fun refreshCurrentList() {
-        val state = feedContent.value
-        if (state is FeedState.Loaded) {
-            _feedContent.update { FeedState.Loaded(state.feed) }
+    var handlerWaiting = false
+    @Synchronized
+    fun invalidateData() {
+        if (handlerWaiting) return
+
+        handlerWaiting = true
+        val scope = CoroutineScope(Job() + Dispatchers.IO)
+        scope.launch {
+            delay(100)
+            refresh()
+            handlerWaiting = false
         }
     }
 
     private val cacheListener: (LocalCacheState) -> Unit = {
-        refresh()
+        invalidateData()
     }
 
     init {

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

@@ -6,7 +6,10 @@ import androidx.lifecycle.ViewModel
 import com.vitorpamplona.amethyst.service.relays.RelayPool
 
 class RelayPoolViewModel: ViewModel() {
-  val relayPoolLiveData: LiveData<String> = Transformations.map(RelayPool.live) {
-    it.relays.report()
+  val connectedRelaysLiveData: LiveData<Int> = Transformations.map(RelayPool.live) {
+    it.relays.connectedRelays()
+  }
+  val availableRelaysLiveData: LiveData<Int> = Transformations.map(RelayPool.live) {
+    it.relays.availableRelays()
   }
 }

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

@@ -1,16 +1,10 @@
 package com.vitorpamplona.amethyst.ui.screen
 
-import android.content.res.Resources.Theme
 import androidx.compose.animation.Crossfade
-import androidx.compose.foundation.background
-import androidx.compose.foundation.border
 import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.IntrinsicSize
 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.height
 import androidx.compose.foundation.layout.padding
@@ -19,20 +13,15 @@ import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.foundation.shape.GenericShape
-import androidx.compose.material.Button
 import androidx.compose.material.Divider
 import androidx.compose.material.MaterialTheme
-import androidx.compose.material.OutlinedButton
 import androidx.compose.material.Text
-import androidx.compose.material.rememberScaffoldState
 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.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -40,29 +29,21 @@ import androidx.compose.ui.draw.clip
 import androidx.compose.ui.draw.drawBehind
 import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.Shape
-import androidx.compose.ui.graphics.drawscope.DrawScope
-import androidx.compose.ui.platform.debugInspectorInfo
 import androidx.compose.ui.unit.dp
-import androidx.lifecycle.compose.ExperimentalLifecycleComposeApi
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.navigation.NavController
 import coil.compose.AsyncImage
 import com.google.accompanist.swiperefresh.SwipeRefresh
 import com.google.accompanist.swiperefresh.rememberSwipeRefreshState
-import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.Note
 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.timeAgo
+import com.vitorpamplona.amethyst.ui.note.UsernameDisplay
 import com.vitorpamplona.amethyst.ui.note.timeAgoLong
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
-import kotlinx.coroutines.launch
 
-@OptIn(ExperimentalLifecycleComposeApi::class)
 @Composable
 fun ThreadFeedView(noteId: String, viewModel: FeedViewModel, accountViewModel: AccountViewModel, navController: NavController) {
     val feedState by viewModel.feedContent.collectAsStateWithLifecycle()
@@ -184,20 +165,27 @@ fun NoteMaster(baseNote: Note, accountViewModel: AccountViewModel, navController
             Modifier
                 .fillMaxWidth()
                 .padding(top = 10.dp)) {
-            Row(modifier = Modifier.padding(start = 12.dp, end = 12.dp)) {
+            Row(modifier = Modifier
+                .padding(start = 12.dp, end = 12.dp)
+                .clickable(onClick = {
+                    author?.let {
+                        navController.navigate("User/${it.pubkeyHex}")
+                    }
+                })
+            ) {
                 // Draws the boosted picture outside the boosted card.
                 AsyncImage(
                     model = author?.profilePicture(),
                     contentDescription = "Profile Image",
                     modifier = Modifier
-                        .width(55.dp)
+                        .width(55.dp).height(55.dp)
                         .clip(shape = CircleShape)
                 )
 
                 Column(modifier = Modifier.padding(start = 10.dp)) {
                     Row(verticalAlignment = Alignment.CenterVertically) {
                         if (author != null)
-                            UserDisplay(author)
+                            UsernameDisplay(author)
                     }
 
                     Row(verticalAlignment = Alignment.CenterVertically) {
@@ -213,7 +201,7 @@ fun NoteMaster(baseNote: Note, accountViewModel: AccountViewModel, navController
                 Column() {
                     val eventContent = note.event?.content
                     if (eventContent != null)
-                        RichTextViewer(eventContent, note.event?.tags)
+                        RichTextViewer(eventContent, note.event?.tags, note, accountViewModel, navController)
 
                     ReactionsRowState(note, accountViewModel)
 

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

@@ -0,0 +1,10 @@
+package com.vitorpamplona.amethyst.ui.screen
+
+import com.vitorpamplona.amethyst.model.User
+
+sealed class UserFeedState {
+    object Loading : UserFeedState()
+    class Loaded(val feed: List<User>) : UserFeedState()
+    object Empty : UserFeedState()
+    class FeedError(val errorMessage: String) : UserFeedState()
+}

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

@@ -0,0 +1,79 @@
+package com.vitorpamplona.amethyst.ui.screen
+
+import androidx.compose.animation.Crossfade
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.itemsIndexed
+import androidx.compose.foundation.lazy.rememberLazyListState
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.unit.dp
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import androidx.navigation.NavController
+import com.google.accompanist.swiperefresh.SwipeRefresh
+import com.google.accompanist.swiperefresh.rememberSwipeRefreshState
+import com.vitorpamplona.amethyst.ui.note.UserCompose
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
+
+@Composable
+fun UserFeedView(viewModel: UserFeedViewModel, accountViewModel: AccountViewModel, navController: NavController) {
+    val feedState by viewModel.feedContent.collectAsState()
+
+    var isRefreshing by remember { mutableStateOf(false) }
+    val swipeRefreshState = rememberSwipeRefreshState(isRefreshing)
+
+    val listState = rememberLazyListState()
+
+    LaunchedEffect(isRefreshing) {
+        if (isRefreshing) {
+            viewModel.refresh()
+            isRefreshing = false
+        }
+    }
+
+    SwipeRefresh(
+        state = swipeRefreshState,
+        onRefresh = {
+            isRefreshing = true
+        },
+    ) {
+        Column() {
+            Crossfade(targetState = feedState) { state ->
+                when (state) {
+                    is UserFeedState.Empty -> {
+                        FeedEmpty {
+                            isRefreshing = true
+                        }
+                    }
+                    is UserFeedState.FeedError -> {
+                        FeedError(state.errorMessage) {
+                            isRefreshing = true
+                        }
+                    }
+                    is UserFeedState.Loaded -> {
+                        LazyColumn(
+                            contentPadding = PaddingValues(
+                                top = 10.dp,
+                                bottom = 10.dp
+                            ),
+                            state = listState
+                        ) {
+                            itemsIndexed(state.feed, key = { _, item -> item.pubkeyHex }) { index, item ->
+                                UserCompose(item, accountViewModel = accountViewModel, navController = navController)
+                            }
+                        }
+                    }
+                    UserFeedState.Loading -> {
+                        LoadingFeed()
+                    }
+                }
+            }
+        }
+    }
+}

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

@@ -0,0 +1,95 @@
+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.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
+import kotlinx.coroutines.launch
+
+class NostrUserProfileFollowsUserFeedViewModel(): UserFeedViewModel(
+    NostrUserProfileFollowsDataSource
+)
+
+class NostrUserProfileFollowersUserFeedViewModel(): UserFeedViewModel(
+    NostrUserProfileFollowersDataSource
+)
+
+open class UserFeedViewModel(val dataSource: NostrDataSource<User>): ViewModel() {
+    private val _feedContent = MutableStateFlow<UserFeedState>(UserFeedState.Loading)
+    val feedContent = _feedContent.asStateFlow()
+
+    fun refresh() {
+        val scope = CoroutineScope(Job() + Dispatchers.IO)
+        scope.launch {
+            refreshSuspended()
+        }
+    }
+
+    private fun refreshSuspended() {
+        val notes = dataSource.loadTop()
+
+        val oldNotesState = feedContent.value
+        if (oldNotesState is UserFeedState.Loaded) {
+            if (notes != oldNotesState.feed) {
+                updateFeed(notes)
+            }
+        } else {
+            updateFeed(notes)
+        }
+    }
+
+    fun updateFeed(notes: List<User>) {
+        val scope = CoroutineScope(Job() + Dispatchers.Main)
+        scope.launch {
+            if (notes.isEmpty()) {
+                _feedContent.update { UserFeedState.Empty }
+            } else {
+                _feedContent.update { UserFeedState.Loaded(notes) }
+            }
+        }
+    }
+
+    var handlerWaiting = false
+    @Synchronized
+    fun invalidateData() {
+        if (handlerWaiting) return
+
+        handlerWaiting = true
+        val scope = CoroutineScope(Job() + Dispatchers.IO)
+        scope.launch {
+            delay(100)
+            refresh()
+            handlerWaiting = false
+        }
+    }
+
+    private val cacheListener: (LocalCacheState) -> Unit = {
+        invalidateData()
+    }
+
+    init {
+        LocalCache.live.observeForever(cacheListener)
+    }
+
+    override fun onCleared() {
+        LocalCache.live.removeObserver(cacheListener)
+
+        dataSource.stop()
+        viewModelScope.cancel()
+        super.onCleared()
+    }
+}

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

@@ -7,11 +7,9 @@ import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.AccountState
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.model.UserState
-import com.vitorpamplona.amethyst.service.relays.Client
 
 class AccountViewModel(private val account: Account): ViewModel() {
   val accountLiveData: LiveData<AccountState> = Transformations.map(account.live) { it }
-  val userLiveData: LiveData<UserState> = Transformations.map(account.userProfile().live) { it }
 
   fun reactTo(note: Note) {
     account.reactTo(note)
@@ -22,8 +20,10 @@ class AccountViewModel(private val account: Account): ViewModel() {
   }
 
   fun broadcast(note: Note) {
-    note.event?.let {
-      Client.send(it)
-    }
+    account.broadcast(note)
+  }
+
+  fun decrypt(note: Note): String? {
+    return account.decryptContent(note)
   }
 }

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

@@ -0,0 +1,98 @@
+package com.vitorpamplona.amethyst.ui.screen
+
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.Tab
+import androidx.compose.material.TabRow
+import androidx.compose.material.TabRowDefaults
+import androidx.compose.material.Text
+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.rememberCoroutineScope
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
+import androidx.lifecycle.viewmodel.compose.viewModel
+import androidx.navigation.NavController
+import com.google.accompanist.pager.ExperimentalPagerApi
+import com.google.accompanist.pager.HorizontalPager
+import com.google.accompanist.pager.pagerTabIndicatorOffset
+import com.google.accompanist.pager.rememberPagerState
+import com.vitorpamplona.amethyst.model.User
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
+import kotlinx.coroutines.launch
+
+@OptIn(ExperimentalPagerApi::class)
+@Composable
+fun ChatroomListScreen(accountViewModel: AccountViewModel, navController: NavController) {
+    val pagerState = rememberPagerState()
+    val coroutineScope = rememberCoroutineScope()
+
+    Column(Modifier.fillMaxHeight()) {
+        Column(
+            modifier = Modifier.padding(vertical = 0.dp)
+        ) {
+            TabRow(
+                selectedTabIndex = pagerState.currentPage,
+                indicator = { tabPositions ->
+                    TabRowDefaults.Indicator(
+                        Modifier.pagerTabIndicatorOffset(pagerState, tabPositions),
+                        color = MaterialTheme.colors.primary
+                    )
+                },
+            ) {
+                Tab(
+                    selected = pagerState.currentPage == 0,
+                    onClick = { coroutineScope.launch { pagerState.animateScrollToPage(0) } },
+                    text = {
+                        Text(text = "Known")
+                    }
+                )
+
+                Tab(
+                    selected = pagerState.currentPage == 1,
+                    onClick = { coroutineScope.launch { pagerState.animateScrollToPage(1) } },
+                    text = {
+                        Text(text = "New Requests")
+                    }
+                )
+            }
+            HorizontalPager(count = 2, state = pagerState) {
+                when (pagerState.currentPage) {
+                    0 -> TabKnown(accountViewModel, navController)
+                    1 -> TabNew(accountViewModel, navController)
+                }
+            }
+        }
+    }
+}
+
+@Composable
+fun TabKnown(accountViewModel: AccountViewModel, navController: NavController) {
+    val feedViewModel: NostrChatroomListKnownFeedViewModel = viewModel()
+
+
+    Column(Modifier.fillMaxHeight()) {
+        Column(
+            modifier = Modifier.padding(vertical = 0.dp)
+        ) {
+            ChatroomListFeedView(feedViewModel, accountViewModel, navController)
+        }
+    }
+}
+
+@Composable
+fun TabNew(accountViewModel: AccountViewModel, navController: NavController) {
+    val feedViewModel: NostrChatroomListNewFeedViewModel = viewModel()
+
+    Column(Modifier.fillMaxHeight()) {
+        Column(
+            modifier = Modifier.padding(vertical = 0.dp)
+        ) {
+            ChatroomListFeedView(feedViewModel, accountViewModel, navController)
+        }
+    }
+}

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

@@ -0,0 +1,139 @@
+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.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.text.KeyboardOptions
+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.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+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.model.User
+import com.vitorpamplona.amethyst.service.NostrChatRoomDataSource
+import com.vitorpamplona.amethyst.ui.actions.PostButton
+import com.vitorpamplona.amethyst.ui.note.UsernameDisplay
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
+
+@Composable
+fun ChatroomScreen(userId: String?, accountViewModel: AccountViewModel, navController: NavController) {
+    val accountState by accountViewModel.accountLiveData.observeAsState()
+    val account = accountState?.account
+
+    if (account != null && userId != null) {
+        val newPost = remember { mutableStateOf(TextFieldValue("")) }
+
+        NostrChatRoomDataSource.loadMessagesBetween(account, userId)
+
+        val feedViewModel: NostrChatRoomFeedViewModel = viewModel()
+
+        LaunchedEffect(Unit) {
+            feedViewModel.refresh()
+        }
+
+        Column(Modifier.fillMaxHeight()) {
+            NostrChatRoomDataSource.withUser?.let {
+                ChatroomHeader(
+                    it,
+                    accountViewModel = accountViewModel,
+                    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),
+                    placeholder = {
+                        Text(
+                            text = "reply here.. ",
+                            color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                        )
+                    },
+                    trailingIcon = {
+                        PostButton(
+                            onPost = {
+                                account.sendPrivateMeesage(newPost.value.text, userId)
+                                newPost.value = TextFieldValue("")
+                            },
+                            newPost.value.text.isNotBlank(),
+                            modifier = Modifier.padding(end = 10.dp)
+                        )
+                    }
+                )
+            }
+        }
+    }
+}
+
+
+@Composable
+fun ChatroomHeader(baseUser: User, accountViewModel: AccountViewModel, navController: NavController) {
+    val authorState by baseUser.live.observeAsState()
+    val author = authorState?.user
+
+    Column(modifier = Modifier.clickable(
+            onClick = { navController.navigate("User/${author?.pubkeyHex}") }
+        )
+    ) {
+        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)
+                )
+
+                Column(modifier = Modifier.padding(start = 10.dp)) {
+                    Row(verticalAlignment = Alignment.CenterVertically) {
+                        if (author != null)
+                            UsernameDisplay(author)
+                    }
+                }
+            }
+        }
+
+        Divider(
+            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,30 +4,35 @@ 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.compose.ExperimentalLifecycleComposeApi
 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
 
-@OptIn(ExperimentalLifecycleComposeApi::class)
 @Composable
 fun HomeScreen(accountViewModel: AccountViewModel, navController: NavController) {
-    val account by accountViewModel.accountLiveData.observeAsState()
+    val feedViewModel: NostrHomeFeedViewModel = viewModel()
 
-    if (account != null) {
-        val feedViewModel: FeedViewModel = viewModel { FeedViewModel( NostrHomeDataSource ) }
+    LaunchedEffect(Unit) {
+        feedViewModel.refresh()
+    }
 
-        Column(Modifier.fillMaxHeight()) {
-            Column(
-                modifier = Modifier.padding(vertical = 0.dp)
-            ) {
-                FeedView(feedViewModel, accountViewModel, navController)
-            }
+    Column(Modifier.fillMaxHeight()) {
+        Column(
+            modifier = Modifier.padding(vertical = 0.dp)
+        ) {
+            FeedView(feedViewModel, accountViewModel, navController)
         }
     }
 }

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

@@ -5,14 +5,18 @@ import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.statusBarsPadding
-import androidx.compose.material.*
+import androidx.compose.material.DrawerValue
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.Scaffold
+import androidx.compose.material.rememberDrawerState
+import androidx.compose.material.rememberScaffoldState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
-import androidx.lifecycle.compose.ExperimentalLifecycleComposeApi
 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
@@ -46,12 +50,11 @@ fun MainScreen(accountViewModel: AccountViewModel, accountStateViewModel: Accoun
         scaffoldState = scaffoldState
     ) {
         Column(modifier = Modifier.padding(bottom = it.calculateBottomPadding())) {
-            AppNavigation(navController, accountViewModel)
+            AppNavigation(navController, accountViewModel, accountStateViewModel)
         }
     }
 }
 
-@OptIn(ExperimentalLifecycleComposeApi::class)
 @Composable
 fun FloatingButton(navController: NavHostController, accountViewModel: AccountStateViewModel) {
     val accountState by accountViewModel.accountContent.collectAsStateWithLifecycle()
@@ -71,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/MessageScreen.kt

@@ -1,29 +0,0 @@
-package com.vitorpamplona.amethyst.ui.screen
-
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.fillMaxHeight
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.material.Text
-import androidx.compose.material.rememberScaffoldState
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.rememberCoroutineScope
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
-
-@Composable
-fun MessageScreen(accountViewModel: AccountViewModel) {
-    val state = rememberScaffoldState()
-    val scope = rememberCoroutineScope()
-
-    Column(
-        Modifier
-            .fillMaxHeight()
-            .fillMaxWidth(),
-        horizontalAlignment = Alignment.CenterHorizontally,
-        verticalArrangement = Arrangement.Center,
-    ) {
-        Text("Message Screen")
-    }
-}