v0.11.2

RTL Support

PRIVACY.md

@@ -1,11 +1,13 @@
-# Amethyst Privacy Policy
+# Amethyst Privacy Policy & Terms of Use
 
 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. 
+The Amethyst app for Android does not collect or process any personal information from its users. The app is used to connect to third-party Nostr servers (also called Relays) that may or may not collect personal information and are not covered by this privacy policy. Each third-party relay server comes equipped with its own privacy policy and terms of use that can be viewed through the app or through that server's website. The developers of this open source project or maintainers of the distribution channels (app stores) do not have access to the data located in the user's phone. Accounts are fully maintained by the user. We do not have control over them. 
 
 Data from connected accounts is only stored locally on the device when it is required for functionality and performance of Amethyst. This data is strictly confidental and cannot be accessed by other apps (on non-rooted devices). Phone data can be deleted by clearing Amethyst's local storage or uninstalling the app.
 
+You cannot use Amethyst to submit Objectionable Content to relays. Objectionable Content includes, but is not limited to: (i) sexually explicit materials; (ii) obscene, defamatory, libelous, slanderous, violent and/or unlawful content or profanity; (iii) content that infringes upon the rights of any third party, including copyright, trademark, privacy, publicity or other personal or proprietary right, or that is deceptive or fraudulent; (iv) content that promotes the use or sale of illegal or regulated substances, tobacco products, ammunition and/or firearms; and (v) illegal content related to gambling.
+
 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

app/build.gradle

@@ -11,8 +11,8 @@ android {
         applicationId "com.vitorpamplona.amethyst"
         minSdk 26
         targetSdk 33
-        versionCode 20
-        versionName "0.10.2"
+        versionCode 28
+        versionName "0.11.2"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {
@@ -22,8 +22,8 @@ android {
 
     buildTypes {
         release {
-            minifyEnabled true
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+            //minifyEnabled false
+            //proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
     compileOptions {
@@ -37,7 +37,7 @@ android {
         compose true
     }
     composeOptions {
-        kotlinCompilerExtensionVersion '1.3.2'
+        kotlinCompilerExtensionVersion '1.4.0'
     }
     packagingOptions {
         resources {
@@ -48,27 +48,28 @@ android {
 
 dependencies {
     implementation 'androidx.core:core-ktx:1.9.0'
-    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"
-    implementation 'androidx.compose.material:material:1.3.1'
 
     // Navigation
     implementation("androidx.navigation:navigation-compose:$nav_version")
-    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.6.0-alpha04'
+    // Observe Live data as State
+    implementation 'androidx.compose.runtime:runtime-livedata:1.4.0-alpha04'
+
+    implementation 'androidx.compose.material:material:1.4.0-alpha05'
+    implementation "androidx.compose.material:material-icons-extended:1.4.0-alpha05"
+
+    // Lifecycle
+    implementation 'androidx.lifecycle:lifecycle-runtime-compose:2.6.0-alpha05'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-compose:2.6.0-alpha05'
+    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.0-alpha05'
+    implementation 'androidx.lifecycle:lifecycle-livedata:2.6.0-alpha05'
 
     // Swipe Refresh
     implementation 'com.google.accompanist:accompanist-swiperefresh:0.29.0-alpha'
 
-    // Load images from the web.
-    implementation "io.coil-kt:coil-compose:2.2.2"
-
     // Bitcoin secp256k1 bindings to Android
     implementation 'fr.acinq.secp256k1:secp256k1-kmp-jni-android:0.7.1'
 
@@ -86,24 +87,25 @@ dependencies {
     // Json Serialization
     implementation 'com.fasterxml.jackson.module:jackson-module-kotlin:2.14.1'
 
-    // Rendering clickable text
-    implementation "com.google.accompanist:accompanist-flowlayout:0.28.0"
-
     // link preview
     implementation 'tw.com.oneup.www:Baha-UrlPreview:1.0.1'
     implementation 'androidx.security:security-crypto-ktx:1.1.0-alpha04'
 
-    // upload pictures:
-    implementation "com.google.accompanist:accompanist-permissions:0.28.0"
-
     // view videos
     implementation 'com.google.android.exoplayer:exoplayer:2.18.2'
 
+    // Load images from the web.
+    implementation "io.coil-kt:coil-compose:2.2.2"
     // view gifs
     implementation "io.coil-kt:coil-gif:2.2.2"
     // view svgs
     implementation("io.coil-kt:coil-svg:2.2.2")
 
+    // Rendering clickable text
+    implementation "com.google.accompanist:accompanist-flowlayout:$accompanist_version"
+    // Permission to upload pictures:
+    implementation "com.google.accompanist:accompanist-permissions:$accompanist_version"
+
     // tabs for user profiles
     implementation "com.google.accompanist:accompanist-pager:$accompanist_version" // Pager
     implementation "com.google.accompanist:accompanist-pager-indicators:$accompanist_version"

app/proguard-rules.pro

@@ -20,8 +20,12 @@
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
 # For the Secp256k1 library
+-keepattributes InnerClasses
+
 -keep class fr.acinq.secp256k1.jni.** { *; }
 # For the NostrPostr library
 -keep class nostr.postr.** { *; }
+-keep class nostr.postr.events.** { *; }
+-keep class com.google.gson.reflect.** { *; }
 -keep class com.vitorpamplona.amethyst.model.** { *; }
 -keep class com.vitorpamplona.amethyst.service.** { *; }

app/src/main/AndroidManifest.xml

@@ -22,10 +22,16 @@
             android:theme="@style/Theme.Amethyst">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
 
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="nostr" />
+            </intent-filter>
+
             <meta-data
                 android:name="android.app.lib_name"
                 android:value="" />

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

@@ -4,9 +4,9 @@ import android.content.Context
 import androidx.security.crypto.EncryptedSharedPreferences
 import androidx.security.crypto.MasterKeys
 
-class KeyStorage {
+class EncryptedStorage {
 
-  fun encryptedPreferences(context: Context): EncryptedSharedPreferences {
+  fun preferences(context: Context): EncryptedSharedPreferences {
     val secretKey: String = MasterKeys.getOrCreate(MasterKeys.AES256_GCM_SPEC);
     val preferencesName = "secret_keeper"
 

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

@@ -0,0 +1,65 @@
+package com.vitorpamplona.amethyst
+
+import android.content.Context
+import com.vitorpamplona.amethyst.model.Account
+import com.vitorpamplona.amethyst.model.Channel
+import com.vitorpamplona.amethyst.model.DefaultChannels
+import com.vitorpamplona.amethyst.model.User
+import com.vitorpamplona.amethyst.model.toByteArray
+import com.vitorpamplona.amethyst.ui.navigation.Route
+import nostr.postr.Persona
+import nostr.postr.toHex
+
+class LocalPreferences(context: Context) {
+  val encryptedPreferences = EncryptedStorage().preferences(context)
+
+  fun clearEncryptedStorage() {
+    encryptedPreferences.edit().apply {
+      remove("nostr_privkey")
+      remove("nostr_pubkey")
+      remove("following_channels")
+      remove("hidden_users")
+    }.apply()
+  }
+
+  fun saveToEncryptedStorage(account: Account) {
+    encryptedPreferences.edit().apply {
+      account.loggedIn.privKey?.let { putString("nostr_privkey", it.toHex()) }
+      account.loggedIn.pubKey.let { putString("nostr_pubkey", it.toHex()) }
+      account.followingChannels.let { putStringSet("following_channels", it) }
+      account.hiddenUsers.let { putStringSet("hidden_users", it) }
+    }.apply()
+  }
+
+  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()
+      val hiddenUsers = getStringSet("hidden_users", emptySet())?.toMutableSet() ?: mutableSetOf()
+
+      if (pubKey != null) {
+        return Account(
+          Persona(privKey = privKey?.toByteArray(), pubKey = pubKey.toByteArray()),
+          followingChannels,
+          hiddenUsers
+        )
+      } else {
+        return null
+      }
+    }
+  }
+
+  fun saveLastRead(route: String, timestampInSecs: Long) {
+    encryptedPreferences.edit().apply {
+      putLong("last_read_route_${route}", timestampInSecs)
+    }.apply()
+  }
+
+  fun loadLastRead(route: String): Long {
+    encryptedPreferences.run {
+      return getLong("last_read_route_${route}", 0)
+    }
+  }
+
+}

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

@@ -0,0 +1,62 @@
+package com.vitorpamplona.amethyst
+
+import android.content.Context
+import androidx.lifecycle.LiveData
+import com.vitorpamplona.amethyst.model.Note
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+
+object NotificationCache {
+  val lastReadByRoute = mutableMapOf<String, Long>()
+
+  fun markAsRead(route: String, timestampInSecs: Long, context: Context) {
+    val lastTime = lastReadByRoute[route]
+    if (lastTime == null || timestampInSecs > lastTime) {
+      lastReadByRoute.put(route, timestampInSecs)
+
+      val scope = CoroutineScope(Job() + Dispatchers.IO)
+      scope.launch {
+        LocalPreferences(context).saveLastRead(route, timestampInSecs)
+        invalidateData()
+      }
+    }
+  }
+
+  fun load(route: String, context: Context): Long {
+    var lastTime = lastReadByRoute[route]
+    if (lastTime == null) {
+      lastTime = LocalPreferences(context).loadLastRead(route)
+      lastReadByRoute[route] = lastTime
+    }
+    return lastTime
+  }
+
+  // Observers line up here.
+  val live: NotificationLiveData = NotificationLiveData(this)
+
+  // Refreshes observers in batches.
+  var handlerWaiting = false
+  @Synchronized
+  fun invalidateData() {
+    if (handlerWaiting) return
+
+    handlerWaiting = true
+    val scope = CoroutineScope(Job() + Dispatchers.Default)
+    scope.launch {
+      delay(100)
+      live.refresh()
+      handlerWaiting = false
+    }
+  }
+}
+
+class NotificationLiveData(val cache: NotificationCache): LiveData<NotificationState>(NotificationState(cache)) {
+  fun refresh() {
+    postValue(NotificationState(cache))
+  }
+}
+
+class NotificationState(val cache: NotificationCache)

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

@@ -8,6 +8,7 @@ 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.NostrSingleChannelDataSource
 import com.vitorpamplona.amethyst.service.NostrSingleEventDataSource
 import com.vitorpamplona.amethyst.service.NostrSingleUserDataSource
 import com.vitorpamplona.amethyst.service.NostrThreadDataSource
@@ -36,11 +37,19 @@ object ServiceManager {
       NostrNotificationDataSource.account = myAccount
       NostrChatroomListDataSource.account = myAccount
 
+      NostrGlobalDataSource.account = myAccount
+      NostrChannelDataSource.account = myAccount
+
+      NostrUserProfileDataSource.account = myAccount
+      NostrUserProfileFollowsDataSource.account = myAccount
+      NostrUserProfileFollowersDataSource.account = myAccount
+
       NostrAccountDataSource.start()
       NostrGlobalDataSource.start()
       NostrHomeDataSource.start()
       NostrNotificationDataSource.start()
       NostrSingleEventDataSource.start()
+      NostrSingleChannelDataSource.start()
       NostrSingleUserDataSource.start()
       NostrThreadDataSource.start()
       NostrChatroomListDataSource.start()
@@ -61,6 +70,7 @@ object ServiceManager {
 
     NostrGlobalDataSource.stop()
     NostrNotificationDataSource.stop()
+    NostrSingleChannelDataSource.stop()
     NostrSingleEventDataSource.stop()
     NostrSingleUserDataSource.stop()
     NostrThreadDataSource.stop()

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

@@ -1,5 +1,6 @@
 package com.vitorpamplona.amethyst.lnurl
 
+import androidx.compose.ui.text.toLowerCase
 import java.math.BigDecimal
 import java.util.Locale
 import java.util.regex.Pattern
@@ -128,7 +129,7 @@ object LnInvoiceUtil {
   }
 
   private fun multiplier(multiplier: String): BigDecimal {
-    return when (multiplier) {
+    return when (multiplier.toLowerCase()) {
       "m" -> BigDecimal("0.001")
       "u" -> BigDecimal("0.000001")
       "n" -> BigDecimal("0.000000001")

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

@@ -10,8 +10,12 @@ import com.vitorpamplona.amethyst.service.model.RepostEvent
 import com.vitorpamplona.amethyst.service.relays.Client
 import com.vitorpamplona.amethyst.service.relays.Relay
 import com.vitorpamplona.amethyst.service.relays.RelayPool
-import com.vitorpamplona.amethyst.ui.screen.AccountStateViewModel
 import java.util.Date
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
 import nostr.postr.Contact
 import nostr.postr.Persona
 import nostr.postr.Utils
@@ -27,8 +31,11 @@ val DefaultChannels = setOf(
   "42224859763652914db53052103f0b744df79dfc4efef7e950fc0802fc3df3c5"  // -> Amethyst's Group
 )
 
-class Account(val loggedIn: Persona, val followingChannels: MutableSet<String> = DefaultChannels.toMutableSet()) {
-  var seeReplies: Boolean = true
+class Account(
+  val loggedIn: Persona,
+  val followingChannels: MutableSet<String> = DefaultChannels.toMutableSet(),
+  val hiddenUsers: MutableSet<String> = mutableSetOf()
+) {
 
   fun userProfile(): User {
     return LocalCache.getOrCreateUser(loggedIn.pubKey)
@@ -38,6 +45,10 @@ class Account(val loggedIn: Persona, val followingChannels: MutableSet<String> =
     return followingChannels.map { LocalCache.getOrCreateChannel(it) }
   }
 
+  fun hiddenUsers(): List<User> {
+    return hiddenUsers.map { LocalCache.getOrCreateUser(it.toByteArray()) }
+  }
+
   fun isWriteable(): Boolean {
     return loggedIn.privKey != null
   }
@@ -79,7 +90,7 @@ class Account(val loggedIn: Persona, val followingChannels: MutableSet<String> =
   fun reactTo(note: Note) {
     if (!isWriteable()) return
 
-    if (note.reactions.firstOrNull { it.author == userProfile() } != null) {
+    if (note.reactions.firstOrNull { it.author == userProfile() && it.event?.content == "+" } != null) {
       // has already liked this note
       return
     }
@@ -91,9 +102,35 @@ class Account(val loggedIn: Persona, val followingChannels: MutableSet<String> =
     }
   }
 
+  fun report(note: Note) {
+    if (!isWriteable()) return
+
+    if (
+      note.reactions.firstOrNull { it.author == userProfile() && it.event?.content == "⚠️"} != null
+    ) {
+      // has already liked this note
+      return
+    }
+
+    note.event?.let {
+      val event = ReactionEvent.createWarning(it, loggedIn.privKey!!)
+      Client.send(event)
+      LocalCache.consume(event)
+    }
+  }
+
   fun boost(note: Note) {
     if (!isWriteable()) return
 
+    val currentTime = Date().time / 1000
+
+    if (
+      note.boosts.firstOrNull { it.author == userProfile() && (it?.event?.createdAt ?: 0) > currentTime - (60 * 5)} != null // 5 minute protection
+    ) {
+      // has already bosted in the past 5mins 
+      return
+    }
+
     note.event?.let {
       val event = RepostEvent.create(it, loggedIn.privKey!!)
       Client.send(event)
@@ -159,12 +196,17 @@ class Account(val loggedIn: Persona, val followingChannels: MutableSet<String> =
     LocalCache.consume(signedEvent)
   }
 
-  fun sendChannelMeesage(message: String, toChannel: String, replyingTo: Note? = null) {
+  fun sendChannelMeesage(message: String, toChannel: String, replyingTo: Note? = null, mentions: List<User>?) {
     if (!isWriteable()) return
 
+    val repliesToHex = listOfNotNull(replyingTo?.idHex).ifEmpty { null }
+    val mentionsHex = mentions?.map { it.pubkeyHex }
+
     val signedEvent = ChannelMessageEvent.create(
       message = message,
       channel = toChannel,
+      replyTos = repliesToHex,
+      mentions = mentionsHex,
       privateKey = loggedIn.privKey!!
     )
     Client.send(signedEvent)
@@ -186,7 +228,7 @@ class Account(val loggedIn: Persona, val followingChannels: MutableSet<String> =
     LocalCache.consume(signedEvent)
   }
 
-  fun sendCreateNewChannel(name: String, about: String, picture: String, accountStateViewModel: AccountStateViewModel) {
+  fun sendCreateNewChannel(name: String, about: String, picture: String) {
     if (!isWriteable()) return
 
     val metadata = ChannelCreateEvent.ChannelData(
@@ -201,17 +243,27 @@ class Account(val loggedIn: Persona, val followingChannels: MutableSet<String> =
     Client.send(event)
     LocalCache.consume(event)
 
-    joinChannel(event.id.toHex(), accountStateViewModel)
+    joinChannel(event.id.toHex())
   }
 
-  fun joinChannel(idHex: String, accountStateViewModel: AccountStateViewModel) {
+  fun joinChannel(idHex: String) {
     followingChannels.add(idHex)
-    accountStateViewModel.saveToEncryptedStorage(this)
+    invalidateData()
   }
 
-  fun leaveChannel(idHex: String, accountStateViewModel: AccountStateViewModel) {
+  fun leaveChannel(idHex: String) {
     followingChannels.remove(idHex)
-    accountStateViewModel.saveToEncryptedStorage(this)
+    invalidateData()
+  }
+
+  fun hideUser(pubkeyHex: String) {
+    hiddenUsers.add(pubkeyHex)
+    invalidateData()
+  }
+
+  fun showUser(pubkeyHex: String) {
+    hiddenUsers.remove(pubkeyHex)
+    invalidateData()
   }
 
   fun sendChangeChannel(name: String, about: String, picture: String, channel: Channel) {
@@ -280,25 +332,44 @@ class Account(val loggedIn: Persona, val followingChannels: MutableSet<String> =
   // Observers line up here.
   val live: AccountLiveData = AccountLiveData(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.Default)
+    scope.launch {
+      delay(100)
+      live.refresh()
+      handlerWaiting = false
+    }
   }
 
 
+  fun isAcceptable(user: User): Boolean {
+    return user !in hiddenUsers()  // if user hasn't hided this author
+  }
+
+  fun isAcceptableDirect(note: Note): Boolean {
+    return note.reports.firstOrNull { it.author == userProfile() } == null // if user has not reported this post
+        && note.reports.filter { it.author in userProfile().follows }.size < 5 // if it has 5 reports by reliable users
+  }
+
+  fun isAcceptable(note: Note): Boolean {
+    return note.author?.let { isAcceptable(it) } ?: true // if user hasn't hided this author
+        && isAcceptableDirect(note)
+        && (note.event !is RepostEvent
+          || (note.event is RepostEvent && note.replyTo?.firstOrNull { isAcceptableDirect(note) } != null)
+        ) // is not a reaction about a blocked post
+  }
 }
 
 class AccountLiveData(private val account: Account): LiveData<AccountState>(AccountState(account)) {
   fun refresh() {
     postValue(AccountState(account))
   }
-
-  override fun onActive() {
-    super.onActive()
-  }
-
-  override fun onInactive() {
-    super.onInactive()
-  }
 }
 
 class AccountState(val account: Account)

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

@@ -1,13 +1,10 @@
 package com.vitorpamplona.amethyst.model
 
 import androidx.lifecycle.LiveData
-import com.vitorpamplona.amethyst.service.NostrSingleUserDataSource
+import com.vitorpamplona.amethyst.service.NostrSingleEventDataSource
 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()
@@ -21,12 +18,8 @@ class Channel(val id: ByteArray) {
     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 addNote(note: Note) {
+        notes[note.idHex] = note
     }
 
     fun updateChannelInfo(creator: User, channelInfo: ChannelCreateEvent.ChannelData, updatedAt: Long) {
@@ -60,6 +53,16 @@ class ChannelLiveData(val channel: Channel): LiveData<ChannelState>(ChannelState
     fun refresh() {
         postValue(ChannelState(channel))
     }
+
+    override fun onActive() {
+        super.onActive()
+        NostrSingleEventDataSource.add(channel.idHex)
+    }
+
+    override fun onInactive() {
+        super.onInactive()
+        NostrSingleEventDataSource.remove(channel.idHex)
+    }
 }
 
 class ChannelState(val channel: Channel)

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

@@ -250,12 +250,27 @@ object LocalCache {
       it.author?.addTaggedPost(note)
     }
 
-    if (event.content == "" || event.content == "+" || event.content == "\uD83E\uDD19") {
+    if (
+      event.content == "" ||
+      event.content == "+" ||
+      event.content == "\u2764\uFE0F" || // red heart
+      event.content == "\uD83E\uDD19" || // call me hand
+      event.content == "\uD83D\uDC4D" // thumbs up
+    ) {
       // Counts the replies
       repliesTo.forEach {
         it.addReaction(note)
       }
     }
+
+    if (event.content == "!" // nostr_console hide.
+      || event.content == "\u26A0\uFE0F"  // Warning sign
+    ) {
+      // Counts the replies
+      repliesTo.forEach {
+        it.addReport(note)
+      }
+    }
   }
 
   fun consume(event: ChannelCreateEvent) {
@@ -267,7 +282,8 @@ object LocalCache {
       if (oldChannel.creator == null || oldChannel.creator == author) {
         oldChannel.updateChannelInfo(author, event.channelInfo, event.createdAt)
 
-        val note = oldChannel.getOrCreateNote(event.id.toHex())
+        val note = getOrCreateNote(event.id.toHex())
+        oldChannel.addNote(note)
         note.channel = oldChannel
         note.loadEvent(event, author, emptyList(), mutableListOf())
 
@@ -288,7 +304,8 @@ object LocalCache {
       if (oldChannel.creator == null || oldChannel.creator == author) {
         oldChannel.updateChannelInfo(author, event.channelInfo, event.createdAt)
 
-        val note = oldChannel.getOrCreateNote(event.id.toHex())
+        val note = getOrCreateNote(event.id.toHex())
+        oldChannel.addNote(note)
         note.channel = oldChannel
         note.loadEvent(event, author, emptyList(), mutableListOf())
 
@@ -304,7 +321,8 @@ object LocalCache {
 
     val channel = getOrCreateChannel(event.channel)
 
-    val note = channel.getOrCreateNote(event.id.toHex())
+    val note = getOrCreateNote(event.id.toHex())
+    channel.addNote(note)
 
     // Already processed this event.
     if (note.event != null) return
@@ -313,7 +331,7 @@ object LocalCache {
     val mentions = Collections.synchronizedList(event.mentions.map { getOrCreateUser(decodePublicKey(it)) })
     val replyTo = Collections.synchronizedList(
       event.replyTos
-        .map { channel.getOrCreateNote(it) }
+        .map { getOrCreateNote(it) }
         .filter { it.event !is ChannelCreateEvent }
         .toMutableList()
     )
@@ -357,7 +375,8 @@ object LocalCache {
 
   fun findNotesStartingWith(text: String): List<Note> {
     return notes.values.filter {
-      (it.event is TextNoteEvent && it.event?.content?.contains(text) ?: false)
+      (it.event is TextNoteEvent && it.event?.content?.contains(text, true) ?: false)
+        || (it.event is ChannelMessageEvent && it.event?.content?.contains(text, true) ?: false)
         || it.idHex.startsWith(text, true)
         || it.id.toNote().startsWith(text, true)
     }

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

@@ -10,6 +10,7 @@ import java.time.Instant
 import java.time.ZoneId
 import java.time.format.DateTimeFormatter
 import java.util.Collections
+import java.util.Date
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
@@ -35,6 +36,8 @@ class Note(val idHex: String) {
     val reactions = Collections.synchronizedSet(mutableSetOf<Note>())
     val boosts = Collections.synchronizedSet(mutableSetOf<Note>())
 
+    val reports = Collections.synchronizedSet(mutableSetOf<Note>())
+
     var channel: Channel? = null
 
     fun loadEvent(event: Event, author: User, mentions: List<User>, replyTo: MutableList<Note>) {
@@ -43,7 +46,7 @@ class Note(val idHex: String) {
         this.mentions = mentions
         this.replyTo = replyTo
 
-        invalidateData()
+        invalidateData(live)
     }
 
     fun formattedDateTime(timestamp: Long): String {
@@ -75,17 +78,22 @@ class Note(val idHex: String) {
 
     fun addReply(note: Note) {
         if (replies.add(note))
-            invalidateData()
+            invalidateData(liveReplies)
     }
 
     fun addBoost(note: Note) {
         if (boosts.add(note))
-            invalidateData()
+            invalidateData(liveBoosts)
     }
 
     fun addReaction(note: Note) {
         if (reactions.add(note))
-            invalidateData()
+            invalidateData(liveReactions)
+    }
+
+    fun addReport(note: Note) {
+        if (reports.add(note))
+            invalidateData(liveReports)
     }
 
     fun isReactedBy(user: User): Boolean {
@@ -103,10 +111,15 @@ class Note(val idHex: String) {
     // Observers line up here.
     val live: NoteLiveData = NoteLiveData(this)
 
+    val liveReactions: NoteLiveData = NoteLiveData(this)
+    val liveBoosts: NoteLiveData = NoteLiveData(this)
+    val liveReplies: NoteLiveData = NoteLiveData(this)
+    val liveReports: NoteLiveData = NoteLiveData(this)
+
     // Refreshes observers in batches.
     var handlerWaiting = false
     @Synchronized
-    fun invalidateData() {
+    fun invalidateData(live: NoteLiveData) {
         if (handlerWaiting) return
 
         handlerWaiting = true

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

@@ -15,6 +15,7 @@ import kotlinx.coroutines.launch
 
 object UrlCachedPreviewer {
   val cache = ConcurrentHashMap<String, UrlInfoItem>()
+  val failures = ConcurrentHashMap<String, Throwable>()
 
   fun previewInfo(url: String, callback: IUrlPreviewCallback? = null) {
     cache[url]?.let {
@@ -22,6 +23,11 @@ object UrlCachedPreviewer {
       return
     }
 
+    failures[url]?.let {
+      callback?.onFailed(it)
+      return
+    }
+
     val scope = CoroutineScope(Job() + Dispatchers.IO)
     scope.launch {
       BahaUrlPreview(url, object : IUrlPreviewCallback {
@@ -31,6 +37,7 @@ object UrlCachedPreviewer {
         }
 
         override fun onFailed(throwable: Throwable) {
+          failures.put(url, throwable)
           callback?.onFailed(throwable)
         }
       }).fetchUrlPreview()
@@ -53,8 +60,10 @@ object UrlCachedPreviewer {
           // Preload Images? Isn't this too heavy?
         } else if (videoExtension.matcher(removedParamsFromUrl).matches()) {
           // Do nothing for now.
-        } else {
+        } else if (isValidURL(removedParamsFromUrl)) {
           previewInfo(it)
+        } else {
+          previewInfo("https://${it}")
         }
       }
     }

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

@@ -86,7 +86,7 @@ class User(val pubkey: ByteArray) {
     @Synchronized
     fun getOrCreateChannel(user: User): MutableSet<Note> {
         return messages[user] ?: run {
-            val channel = mutableSetOf<Note>()
+            val channel = Collections.synchronizedSet(mutableSetOf<Note>())
             messages[user] = channel
             channel
         }
@@ -128,6 +128,14 @@ class User(val pubkey: ByteArray) {
         info = newUserInfo
         updatedMetadataAt = updateAt
 
+        if (info.picture?.startsWith( "http://") == true) {
+            info.picture = info.picture?.replaceFirst("http://", "https://")
+        }
+
+        if (info.banner?.startsWith( "http://") == true) {
+            info.banner = info.banner?.replaceFirst("http://", "https://")
+        }
+
         invalidateData()
     }
 
@@ -137,6 +145,14 @@ class User(val pubkey: ByteArray) {
         }
     }
 
+    fun hasSentMessagesTo(user: User?): Boolean {
+        val messagesToUser = messages[user] ?: return false
+
+        return synchronized(messagesToUser) {
+            messagesToUser.firstOrNull { this == it.author } != null
+        }
+    }
+
     // Model Observers
     private var listeners = setOf<Listener>()
 

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

@@ -6,13 +6,13 @@ 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://relay.snort.social", read = true, write = true),
       Relay("wss://nostr.rocks", read = true, write = true),
       Relay("wss://relay.damus.io", read = true, write = true),
       Relay("wss://nostr.fmt.wiz.biz", read = true, write = true),
       Relay("wss://nostr.oxtr.dev", read = true, write = true),
-      Relay("wss://nostr-relay.wlvs.space", read = true, write = true),
+      Relay("wss://eden.nostr.land", read = true, write = true),
       //Relay("wss://nostr-2.zebedee.cloud", read = true, write = true),
       Relay("wss://nostr-pub.wellorder.net", read = true, write = true),
       Relay("wss://nostr.mom", read = true, write = true),

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

@@ -0,0 +1,62 @@
+package com.vitorpamplona.amethyst.service
+
+import com.vitorpamplona.amethyst.model.toHexKey
+import nostr.postr.bechToBytes
+
+class Nip19 {
+
+  enum class Type {
+    USER, NOTE
+  }
+  data class Return(val type: Type, val hex: String)
+
+  fun uriToRoute(uri: String?): Return? {
+    try {
+      val key = uri?.removePrefix("nostr:")
+
+      if (key != null) {
+        val bytes = key.bechToBytes()
+        if (key.startsWith("npub")) {
+          return Return(Type.USER, bytes.toHexKey())
+        }
+        if (key.startsWith("note")) {
+          return Return(Type.NOTE, bytes.toHexKey())
+        }
+        if (key.startsWith("nprofile")) {
+          val tlv = parseTLV(bytes)
+          val hex = tlv.get(0)?.get(0)?.toHexKey()
+          if (hex != null)
+            return Return(Type.USER, hex)
+        }
+        if (key.startsWith("nevent")) {
+          val tlv = parseTLV(bytes)
+          val hex = tlv.get(0)?.get(0)?.toHexKey()
+          if (hex != null)
+            return Return(Type.USER, hex)
+        }
+      }
+    } catch (e: Throwable) {
+      e.printStackTrace()
+    }
+
+    return null
+  }
+
+  fun parseTLV(data: ByteArray): Map<Byte, MutableList<ByteArray>> {
+    var result = mutableMapOf<Byte, MutableList<ByteArray>>()
+    var rest = data
+    while (rest.isNotEmpty()) {
+      val t = rest[0]
+      val l = rest[1]
+      val v = rest.sliceArray(IntRange(2, (2 + l) - 1))
+      rest = rest.sliceArray(IntRange(2 + l, rest.size-1))
+      if (v.size < l) continue
+
+      if (!result.containsKey(t)) {
+        result.put(t, mutableListOf())
+      }
+      result.get(t)?.add(v)
+    }
+    return result
+  }
+}

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

@@ -1,11 +1,13 @@
 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.ChannelMessageEvent
 import nostr.postr.JsonFilter
 
 object NostrChannelDataSource: NostrDataSource<Note>("ChatroomFeed") {
+  lateinit var account: Account
   var channel: com.vitorpamplona.amethyst.model.Channel? = null
 
   fun loadMessagesBetween(channelId: String) {
@@ -28,7 +30,7 @@ object NostrChannelDataSource: NostrDataSource<Note>("ChatroomFeed") {
 
   // returns the last Note of each user.
   override fun feed(): List<Note> {
-    return channel?.notes?.values?.sortedBy { it.event?.createdAt } ?: emptyList()
+    return channel?.notes?.values?.filter { account.isAcceptable(it) }?.sortedBy { it.event?.createdAt }?.reversed() ?: emptyList()
   }
 
   override fun updateChannelFilters() {

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

@@ -33,9 +33,13 @@ object NostrChatRoomDataSource: NostrDataSource<Note>("ChatroomFeed") {
 
   // returns the last Note of each user.
   override fun feed(): List<Note> {
-    val messages = account.userProfile().messages[withUser]
+    val messages = account.userProfile().messages[withUser] ?: return emptyList()
 
-    return messages?.sortedBy { it.event?.createdAt } ?: emptyList()
+    val filteredMessages = synchronized(messages) {
+      messages.filter { account.isAcceptable(it) }
+    }
+
+    return filteredMessages.sortedBy { it.event?.createdAt }.reversed()
   }
 
   override fun updateChannelFilters() {

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

@@ -64,20 +64,21 @@ object NostrChatroomListDataSource: NostrDataSource<Note>("MailBoxFeed") {
   // returns the last Note of each user.
   override fun feed(): List<Note> {
     val messages = account.userProfile().messages
-    val messagingWith = messages.keys().toList()
+    val messagingWith = messages.keys().toList().filter { account.isAcceptable(it) }
 
     val privateMessages = messagingWith.mapNotNull {
-      messages[it]?.sortedBy { it.event?.createdAt }?.lastOrNull { it.event != null }
+      val conversation = messages[it]
+      if (conversation != null) {
+        synchronized(conversation) {
+          conversation.sortedBy { it.event?.createdAt }.lastOrNull { it.event != null }
+        }
+      } else {
+        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 }
+      it.notes.values.filter { account.isAcceptable(it) }.sortedBy { it.event?.createdAt }.lastOrNull { it.event != null }
     }
 
     return (privateMessages + publicChannels).filterNotNull().sortedBy { it.event?.createdAt }.reversed()

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

@@ -15,6 +15,7 @@ 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 java.util.UUID
 import kotlin.time.ExperimentalTime
 import kotlin.time.measureTimedValue
 import kotlinx.coroutines.CoroutineScope
@@ -52,27 +53,31 @@ abstract class NostrDataSource<T>(val debugName: String) {
           eventCounter.put(key, 1)
         }
 
-        //println("AAA ${debugName} ${subscriptionId} ${event.kind}")
-        when (event) {
-          is MetadataEvent -> LocalCache.consume(event)
-          is TextNoteEvent -> LocalCache.consume(event)
-          is RecommendRelayEvent -> LocalCache.consume(event)
-          is ContactListEvent -> LocalCache.consume(event)
-          is PrivateDmEvent -> LocalCache.consume(event)
-          is DeletionEvent -> LocalCache.consume(event)
-          is RepostEvent -> LocalCache.consume(event)
-          is ReactionEvent -> LocalCache.consume(event)
-          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))
+        try {
+          when (event) {
+            is MetadataEvent -> LocalCache.consume(event)
+            is TextNoteEvent -> LocalCache.consume(event)
+            is RecommendRelayEvent -> LocalCache.consume(event)
+            is ContactListEvent -> LocalCache.consume(event)
+            is PrivateDmEvent -> LocalCache.consume(event)
+            is DeletionEvent -> LocalCache.consume(event)
+            is RepostEvent -> LocalCache.consume(event)
+            is ReactionEvent -> LocalCache.consume(event)
+            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))
+              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))
+            }
           }
+        } catch (e: Exception) {
+          e.printStackTrace()
         }
+
       }
     }
 
@@ -136,7 +141,7 @@ abstract class NostrDataSource<T>(val debugName: String) {
   }
 
   fun requestNewChannel(): Channel {
-    val newChannel = Channel()
+    val newChannel = Channel(debugName+UUID.randomUUID().toString().substring(0,4))
     channels.add(newChannel)
     channelIds.add(newChannel.id)
     return newChannel

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

@@ -1,21 +1,26 @@
 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.ChannelMessageEvent
 import nostr.postr.JsonFilter
 import nostr.postr.events.TextNoteEvent
 
 object NostrGlobalDataSource: NostrDataSource<Note>("GlobalFeed") {
+  lateinit var account: Account
   fun createGlobalFilter() = JsonFilter(
-    kinds = listOf(TextNoteEvent.kind),
-    limit = 50
+    kinds = listOf(TextNoteEvent.kind, ChannelMessageEvent.kind),
+    limit = 200
   )
 
   val globalFeedChannel = requestNewChannel()
 
   override fun feed() = LocalCache.notes.values
+    .filter { account.isAcceptable(it) }
     .filter {
-      it.event is TextNoteEvent && (it.event as TextNoteEvent).replyTos.isEmpty()
+      (it.event is TextNoteEvent && (it.event as TextNoteEvent).replyTos.isEmpty()) ||
+      (it.event is ChannelMessageEvent && (it.event as ChannelMessageEvent).replyTos.isEmpty())
     }
     .sortedBy { it.event?.createdAt }
     .reversed()

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

@@ -0,0 +1,16 @@
+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.TextNoteEvent
+
+object NostrHiddenAccountsDataSource: NostrDataSource<User>("HiddenAccounts") {
+  lateinit var account: Account
+
+  override fun feed() = account.hiddenUsers()
+
+  override fun updateChannelFilters() {}
+}

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

@@ -82,6 +82,7 @@ object NostrHomeDataSource: NostrDataSource<Note>("HomeFeed") {
 
     return LocalCache.notes.values
       .filter { (it.event is TextNoteEvent || it.event is RepostEvent) && it.author?.pubkeyHex in allowSet }
+      .filter { account.isAcceptable(it) }
       .sortedBy { it.event?.createdAt }
       .reversed()
   }

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

@@ -18,7 +18,7 @@ object NostrNotificationDataSource: NostrDataSource<Note>("NotificationFeed") {
   override fun feed(): List<Note> {
     val set = account.userProfile().taggedPosts
     val filtered = synchronized(set) {
-      set.filter { it.event != null }
+      set.filter { it.event != null }.filter { account.isAcceptable(it) }
     }
 
     return filtered.sortedBy { it.event?.createdAt }.reversed()

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

@@ -0,0 +1,73 @@
+package com.vitorpamplona.amethyst.service
+
+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 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 NostrSingleChannelDataSource: NostrDataSource<Note>("SingleChannelFeed") {
+  private var channelsToWatch = setOf<String>()
+
+  private fun createRepliesAndReactionsFilter(): JsonFilter? {
+    val reactionsToWatch = channelsToWatch.map { it }
+
+    if (reactionsToWatch.isEmpty()) {
+      return null
+    }
+
+    // downloads all the reactions to a given event.
+    return JsonFilter(
+      kinds = listOf(ChannelMetadataEvent.kind),
+      tags = mapOf("e" to reactionsToWatch)
+    )
+  }
+
+  fun createLoadEventsIfNotLoadedFilter(): JsonFilter? {
+    val directEventsToLoad = channelsToWatch
+      .map { LocalCache.getOrCreateChannel(it) }
+      .filter { it.notes.isEmpty() }
+
+    val interestedEvents = (directEventsToLoad).map { it.idHex }.toSet()
+
+    if (interestedEvents.isEmpty()) {
+      return null
+    }
+
+    // downloads linked events to this event.
+    return JsonFilter(
+      kinds = listOf(ChannelCreateEvent.kind),
+      ids = interestedEvents.toList()
+    )
+  }
+
+  val repliesAndReactionsChannel = requestNewChannel()
+  val loadEventsChannel = requestNewChannel()
+
+  override fun feed(): List<Note> {
+    return emptyList()
+  }
+
+  override fun updateChannelFilters() {
+    val reactions = createRepliesAndReactionsFilter()
+    val missing = createLoadEventsIfNotLoadedFilter()
+
+    repliesAndReactionsChannel.filter = listOfNotNull(reactions).ifEmpty { null }
+    loadEventsChannel.filter = listOfNotNull(missing).ifEmpty { null }
+  }
+
+  fun add(eventId: String) {
+    channelsToWatch = channelsToWatch.plus(eventId)
+    invalidateFilters()
+  }
+
+  fun remove(eventId: String) {
+    channelsToWatch = channelsToWatch.minus(eventId)
+    invalidateFilters()
+  }
+}

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

@@ -2,6 +2,9 @@ package com.vitorpamplona.amethyst.service
 
 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 com.vitorpamplona.amethyst.service.model.ReactionEvent
 import com.vitorpamplona.amethyst.service.model.RepostEvent
 import java.util.Collections
@@ -20,7 +23,9 @@ object NostrSingleEventDataSource: NostrDataSource<Note>("SingleEventFeed") {
 
     // downloads all the reactions to a given event.
     return JsonFilter(
-      kinds = listOf(TextNoteEvent.kind, ReactionEvent.kind, RepostEvent.kind),
+      kinds = listOf(
+        TextNoteEvent.kind, ReactionEvent.kind, RepostEvent.kind
+      ),
       tags = mapOf("e" to reactionsToWatch)
     )
   }
@@ -46,7 +51,10 @@ object NostrSingleEventDataSource: NostrDataSource<Note>("SingleEventFeed") {
 
     // downloads linked events to this event.
     return JsonFilter(
-      kinds = listOf(TextNoteEvent.kind, ReactionEvent.kind, RepostEvent.kind),
+      kinds = listOf(
+        TextNoteEvent.kind, ReactionEvent.kind, RepostEvent.kind,
+        ChannelMessageEvent.kind, ChannelCreateEvent.kind, ChannelMetadataEvent.kind
+      ),
       ids = interestedEvents.toList()
     )
   }

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

@@ -25,8 +25,11 @@ object NostrThreadDataSource: NostrDataSource<Note>("SingleThreadFeed") {
   }
 
   fun createLoadEventsIfNotLoadedFilter(): JsonFilter? {
-    val eventsToLoad = eventsToWatch
-      .map { LocalCache.notes[it] }
+    val nodes = synchronized(eventsToWatch) {
+      eventsToWatch.map { LocalCache.notes[it] }
+    }
+
+    val eventsToLoad = nodes
       .filterNotNull()
       .filter { it.event == null }
       .map { it.idHex.substring(0, 8) }
@@ -56,21 +59,52 @@ object NostrThreadDataSource: NostrDataSource<Note>("SingleThreadFeed") {
     loadEventsChannel.filter = listOfNotNull(createLoadEventsIfNotLoadedFilter()).ifEmpty { null }
   }
 
+  fun searchRoot(note: Note, testedNotes: MutableSet<Note> = mutableSetOf()): Note? {
+    if (note.replyTo == null || note.replyTo?.isEmpty() == true) return note
+
+    val markedAsRoot = note.event?.tags?.firstOrNull { it[0] == "e" && it.size > 3 && it[3] == "root" }?.getOrNull(1)
+    if (markedAsRoot != null) return LocalCache.getOrCreateNote(markedAsRoot)
+
+    val hasNoReplyTo = note.replyTo?.firstOrNull { it.replyTo?.isEmpty() == true }
+    if (hasNoReplyTo != null) return hasNoReplyTo
+
+    testedNotes.add(note)
+
+    // recursive
+    val roots = note.replyTo?.map {
+      if (it !in testedNotes)
+        searchRoot(it, testedNotes)
+      else
+        null
+    }?.filterNotNull()
+
+    if (roots != null && roots.isNotEmpty()) {
+      return roots[0]
+    }
+
+    return null
+  }
+
   fun loadThread(noteId: String) {
-    val note = LocalCache.notes[noteId] ?: return
+    val note = LocalCache.notes[noteId]
 
-    val thread = mutableListOf<Note>()
-    val threadSet = mutableSetOf<Note>()
+    if (note != null) {
+      val thread = mutableListOf<Note>()
+      val threadSet = mutableSetOf<Note>()
 
-    val threadRoot = note.replyTo?.firstOrNull() ?: note
+      val threadRoot = searchRoot(note) ?: note
 
-    loadDown(threadRoot, thread, threadSet)
+      loadDown(threadRoot, thread, threadSet)
 
-    // Currently orders by date of each event, descending, at each level of the reply stack
-    val order = compareByDescending<Note> { it.replyLevelSignature() }
+      // Currently orders by date of each event, descending, at each level of the reply stack
+      val order = compareByDescending<Note> { it.replyLevelSignature() }
 
-    eventsToWatch.clear()
-    eventsToWatch.addAll(thread.sortedWith(order).map { it.idHex })
+      eventsToWatch.clear()
+      eventsToWatch.addAll(thread.sortedWith(order).map { it.idHex })
+    } else {
+      eventsToWatch.clear()
+      eventsToWatch.add(noteId)
+    }
 
     resetFilters()
   }
@@ -80,7 +114,9 @@ object NostrThreadDataSource: NostrDataSource<Note>("SingleThreadFeed") {
       thread.add(note)
       threadSet.add(note)
 
-      note.replies.forEach {
+      synchronized(note.replies) {
+        note.replies.toList()
+      }.forEach {
         loadDown(it, thread, threadSet)
       }
     }

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

@@ -1,17 +1,20 @@
 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 com.vitorpamplona.amethyst.model.toByteArray
 import nostr.postr.JsonFilter
 import nostr.postr.events.MetadataEvent
 import nostr.postr.events.TextNoteEvent
 
 object NostrUserProfileDataSource: NostrDataSource<Note>("UserProfileFeed") {
+  lateinit var account: Account
   var user: User? = null
 
   fun loadUserProfile(userId: String) {
-    user = LocalCache.users[userId]
+    user = LocalCache.getOrCreateUser(userId.toByteArray())
     resetFilters()
   }
 
@@ -37,7 +40,7 @@ object NostrUserProfileDataSource: NostrDataSource<Note>("UserProfileFeed") {
   override fun feed(): List<Note> {
     val notes = user?.notes ?: return emptyList()
     val sortedNotes = synchronized(notes) {
-      notes.sortedBy { it.event?.createdAt }
+      notes.filter { account.isAcceptable(it) }.sortedBy { it.event?.createdAt }
     }
     return sortedNotes.reversed()
   }

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

@@ -1,11 +1,13 @@
 package com.vitorpamplona.amethyst.service
 
+import com.vitorpamplona.amethyst.model.Account
 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") {
+  lateinit var account: Account
   var user: User? = null
 
   fun loadUserProfile(userId: String) {
@@ -24,7 +26,7 @@ object NostrUserProfileFollowersDataSource: NostrDataSource<User>("UserProfileFo
     val followers = user?.followers ?: emptyList()
 
     return synchronized(followers) {
-      followers.toList()
+      followers.filter { account.isAcceptable(it) }.toList()
     }
   }
 

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

@@ -1,11 +1,13 @@
 package com.vitorpamplona.amethyst.service
 
+import com.vitorpamplona.amethyst.model.Account
 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") {
+  lateinit var account: Account
   var user: User? = null
 
   fun loadUserProfile(userId: String) {
@@ -24,7 +26,11 @@ object NostrUserProfileFollowsDataSource: NostrDataSource<User>("UserProfileFoll
   val followChannel = requestNewChannel()
 
   override fun feed(): List<User> {
-    return user?.follows?.toList() ?: emptyList()
+    val follows = user?.follows ?: emptyList()
+
+    return synchronized(follows) {
+      follows.filter { account.isAcceptable(it) }.toList()
+    }
   }
 
   override fun updateChannelFilters() {

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

@@ -19,7 +19,7 @@ class ChannelMessageEvent (
 
   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) }
+    replyTos = tags.filter { it.getOrNull(1) != channel }.mapNotNull { it.getOrNull(1) }
     mentions = tags.filter { it.firstOrNull() == "p" }.mapNotNull { it.getOrNull(1) }
   }
 

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

@@ -25,6 +25,10 @@ class ReactionEvent (
   companion object {
     const val kind = 7
 
+    fun createWarning(originalNote: Event, privateKey: ByteArray, createdAt: Long = Date().time / 1000): ReactionEvent {
+      return create("\u26A0\uFE0F", originalNote, privateKey, createdAt)
+    }
+
     fun createLike(originalNote: Event, privateKey: ByteArray, createdAt: Long = Date().time / 1000): ReactionEvent {
       return create("+", originalNote, privateKey, createdAt)
     }

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

@@ -3,6 +3,7 @@ package com.vitorpamplona.amethyst.service.relays
 import android.util.Log
 import com.google.gson.JsonElement
 import com.vitorpamplona.amethyst.model.LocalCache
+import java.util.Date
 import nostr.postr.events.ContactListEvent
 import nostr.postr.events.Event
 import nostr.postr.toNpub
@@ -25,6 +26,8 @@ class Relay(
     var eventUploadCounter = 0
     var errorCounter = 0
 
+    var closingTime = 0L
+
     fun register(listener: Listener) {
         listeners = listeners.plus(listener)
     }
@@ -38,7 +41,7 @@ class Relay(
     }
 
     fun requestAndWatch() {
-        val request = Request.Builder().url(url).build()
+        val request = Request.Builder().url(url.trim()).build()
         val listener = object : WebSocketListener() {
 
             override fun onOpen(webSocket: WebSocket, response: Response) {
@@ -92,6 +95,7 @@ class Relay(
 
             override fun onClosed(webSocket: WebSocket, code: Int, reason: String) {
                 socket = null
+                closingTime = Date().time / 1000
                 listeners.forEach { it.onRelayStateChange(this@Relay, Type.DISCONNECT) }
             }
 
@@ -101,6 +105,8 @@ class Relay(
                 socket?.close(1000, "Normal close")
                 // Failures disconnect the relay. 
                 socket = null
+                closingTime = Date().time / 1000
+
                 Log.w("Relay", "Relay onFailure ${url}, ${response?.message}")
                 //t.printStackTrace()
                 listeners.forEach {
@@ -114,6 +120,7 @@ class Relay(
 
     fun disconnect() {
         //httpClient.dispatcher.executorService.shutdown()
+        closingTime = Date().time / 1000
         socket?.close(1000, "Normal close")
         socket = null
     }
@@ -121,13 +128,16 @@ class Relay(
     fun sendFilter(requestId: String) {
         if (read) {
             if (socket == null) {
-                requestAndWatch()
+                // waits 10 seconds
+                if (Date().time / 1000 > closingTime + 10) {
+                    requestAndWatch()
+                }
             } else {
                 val filters = Client.getSubscriptionFilters(requestId)
                 if (filters.isNotEmpty()) {
                     val request =
                         """["REQ","$requestId",${filters.joinToString(",") { it.toJson() }}]"""
-                    //println("FILTERSSENT " + """["REQ","$requestId",${filters.joinToString(",") { it.toJson() }}]""")
+                    //println("FILTERSSENT ${url} " + """["REQ","$requestId",${filters.joinToString(",") { it.toJson() }}]""")
                     socket?.send(request)
                 }
             }

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

@@ -1,5 +1,6 @@
 package com.vitorpamplona.amethyst.ui
 
+import android.net.Uri
 import android.os.Build.VERSION.SDK_INT
 import android.os.Bundle
 import androidx.activity.ComponentActivity
@@ -14,30 +15,33 @@ import coil.ImageLoader
 import coil.decode.GifDecoder
 import coil.decode.ImageDecoderDecoder
 import coil.decode.SvgDecoder
-import com.vitorpamplona.amethyst.KeyStorage
+import coil.memory.MemoryCache
+import coil.request.CachePolicy
+import com.vitorpamplona.amethyst.EncryptedStorage
+import com.vitorpamplona.amethyst.LocalPreferences
 import com.vitorpamplona.amethyst.ServiceManager
-import com.vitorpamplona.amethyst.model.Account
-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.model.decodePublicKey
+import com.vitorpamplona.amethyst.model.toHexKey
+import com.vitorpamplona.amethyst.service.Nip19
 import com.vitorpamplona.amethyst.service.relays.Client
 import com.vitorpamplona.amethyst.ui.screen.AccountScreen
 import com.vitorpamplona.amethyst.ui.screen.AccountStateViewModel
 import com.vitorpamplona.amethyst.ui.theme.AmethystTheme
+import fr.acinq.secp256k1.Hex
+import nostr.postr.Persona
+import nostr.postr.bechToBytes
 
 class MainActivity : ComponentActivity() {
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
 
+    val nip19 = Nip19().uriToRoute(intent?.data?.toString())
+    val startingPage = when (nip19?.type) {
+      Nip19.Type.USER -> "User/${nip19.hex}"
+      Nip19.Type.NOTE -> "Note/${nip19.hex}"
+      else -> null
+    }
+
     Coil.setImageLoader {
       ImageLoader.Builder(this).components {
         if (SDK_INT >= 28) {
@@ -57,10 +61,10 @@ class MainActivity : ComponentActivity() {
         Surface(modifier = Modifier.fillMaxSize(), color = MaterialTheme.colors.background) {
 
           val accountViewModel: AccountStateViewModel = viewModel {
-            AccountStateViewModel(KeyStorage().encryptedPreferences(applicationContext))
+            AccountStateViewModel(LocalPreferences(applicationContext))
           }
 
-          AccountScreen(accountViewModel)
+          AccountScreen(accountViewModel, startingPage)
         }
       }
     }
@@ -79,4 +83,4 @@ class MainActivity : ComponentActivity() {
 
     super.onPause()
   }
-}
+}

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

@@ -8,6 +8,7 @@ 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.LocalTextStyle
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.OutlinedTextField
 import androidx.compose.material.Surface
@@ -15,8 +16,12 @@ import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.input.KeyboardCapitalization
+import androidx.compose.ui.text.style.TextDirection
 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
@@ -26,10 +31,11 @@ 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) {
+fun NewChannelView(onClose: () -> Unit, account: Account, channel: Channel? = null) {
     val postViewModel: NewChannelViewModel = viewModel()
+    val context = LocalContext.current.applicationContext
 
-    postViewModel.load(account, channel, accountStateViewModel)
+    postViewModel.load(account, channel)
 
     Dialog(
         onDismissRequest = { onClose() },
@@ -55,7 +61,7 @@ fun NewChannelView(onClose: () -> Unit, account: Account, accountStateViewModel:
 
                     PostButton(
                         onPost = {
-                            postViewModel.create()
+                            postViewModel.create(context)
                             onClose()
                         },
                         postViewModel.channelName.value.text.isNotBlank()
@@ -77,7 +83,8 @@ fun NewChannelView(onClose: () -> Unit, account: Account, accountStateViewModel:
                     },
                     keyboardOptions = KeyboardOptions.Default.copy(
                         capitalization = KeyboardCapitalization.Sentences
-                    )
+                    ),
+                    textStyle = LocalTextStyle.current.copy(textDirection = TextDirection.Content)
                 )
 
                 Spacer(modifier = Modifier.height(15.dp))
@@ -111,6 +118,7 @@ fun NewChannelView(onClose: () -> Unit, account: Account, accountStateViewModel:
                     keyboardOptions = KeyboardOptions.Default.copy(
                         capitalization = KeyboardCapitalization.Sentences
                     ),
+                    textStyle = LocalTextStyle.current.copy(textDirection = TextDirection.Content),
                     maxLines = 10
 
                 )

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

@@ -1,25 +1,26 @@
 package com.vitorpamplona.amethyst.ui.actions
 
+import android.content.Context
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.ui.text.input.TextFieldValue
 import androidx.lifecycle.ViewModel
+import com.vitorpamplona.amethyst.LocalPreferences
 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
+import nostr.postr.toHex
 
 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
+    fun load(account: Account, channel: Channel?) {
         this.account = account
         if (channel != null) {
             originalChannel = channel
@@ -29,21 +30,24 @@ class NewChannelViewModel: ViewModel() {
         }
     }
 
-    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!!
-            )
+    fun create(context: Context) {
+        this.account?.let { account ->
+            if (originalChannel == null) {
+                account.sendCreateNewChannel(
+                    channelName.value.text,
+                    channelDescription.value.text,
+                    channelPicture.value.text
+                )
+
+                LocalPreferences(context).saveToEncryptedStorage(account)
+            } else
+                account.sendChangeChannel(
+                    channelName.value.text,
+                    channelDescription.value.text,
+                    channelPicture.value.text,
+                    originalChannel!!
+                )
+        }
 
         clear()
     }

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

@@ -16,6 +16,7 @@ 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.LocalTextStyle
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.OutlinedTextField
 import androidx.compose.material.Surface
@@ -23,6 +24,7 @@ import androidx.compose.material.Text
 import androidx.compose.material.TextFieldDefaults
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
@@ -35,8 +37,11 @@ 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.TextStyle
 import androidx.compose.ui.text.input.KeyboardCapitalization
+import androidx.compose.ui.text.style.TextDirection
 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
@@ -67,7 +72,7 @@ fun NewPostView(onClose: () -> Unit, baseReplyTo: Note? = null, account: Account
     val context = LocalContext.current
 
     // initialize focus reference to be able to request focus programmatically
-    val focusRequester = FocusRequester()
+    val focusRequester = remember { FocusRequester() }
     val keyboardController = LocalSoftwareKeyboardController.current
 
     LaunchedEffect(Unit) {
@@ -152,7 +157,8 @@ fun NewPostView(onClose: () -> Unit, baseReplyTo: Note? = null, account: Account
                             unfocusedBorderColor = Color.Transparent,
                             focusedBorderColor = Color.Transparent
                         ),
-                    visualTransformation = UrlUserTagTransformation(MaterialTheme.colors.primary)
+                    visualTransformation = UrlUserTagTransformation(MaterialTheme.colors.primary),
+                    textStyle = LocalTextStyle.current.copy(textDirection = TextDirection.Content)
                 )
 
                 val userSuggestions = postViewModel.userSuggestions
@@ -164,7 +170,7 @@ fun NewPostView(onClose: () -> Unit, baseReplyTo: Note? = null, account: Account
                         )
                     ) {
                         itemsIndexed(userSuggestions, key = { _, item -> item.pubkeyHex }) { index, item ->
-                            UserLine(item) {
+                            UserLine(item, account) {
                                 postViewModel.autocompleteWithUser(item)
                             }
                         }

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

@@ -95,7 +95,12 @@ class NewPostViewModel: ViewModel() {
             }.joinToString(" ")
         }.joinToString("\n")
 
-        account?.sendPost(newMessage, replyTos, mentions)
+        if (originalNote?.channel != null) {
+            account?.sendChannelMeesage(newMessage, originalNote!!.channel!!.idHex, originalNote!!, mentions)
+        } else {
+            account?.sendPost(newMessage, replyTos, mentions)
+        }
+
         message = TextFieldValue("")
         urlPreview = null
     }

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

@@ -60,7 +60,7 @@ class NewRelayListViewModel: ViewModel() {
                     val eventUploadCounter = liveRelay?.eventUploadCounter ?: 0
 
                     Relay(it.url, it.read, it.write, errorCounter, eventDownloadCounter, eventUploadCounter)
-                }
+                }.sortedBy { it.downloadCount }.reversed()
         }
     }
 

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

@@ -56,7 +56,7 @@ class NewUserMetadataViewModel: ViewModel() {
         currentJson.put("website", website.value)
         currentJson.put("about", about.value)
         currentJson.put("nip05", nip05.value)
-        currentJson.put("lud06", lnAddress.value)
+        currentJson.put("lud16", lnAddress.value)
 
         val writer = StringWriter()
         ObjectMapper().writeValue(writer, currentJson)

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

@@ -28,13 +28,13 @@ import com.vitorpamplona.amethyst.ui.screen.AccountStateViewModel
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 
 @Composable
-fun NewChannelButton(account: Account, accountStateViewModel: AccountStateViewModel) {
+fun NewChannelButton(account: Account) {
     var wantsToPost by remember {
         mutableStateOf(false)
     }
 
     if (wantsToPost)
-        NewChannelView({ wantsToPost = false }, account = account, accountStateViewModel)
+        NewChannelView({ wantsToPost = false }, account = account)
 
     OutlinedButton(
         onClick = { wantsToPost = true },

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

@@ -14,13 +14,12 @@ import com.vitorpamplona.amethyst.ui.note.toShortenHex
 
 @Composable
 fun ClickableNoteTag(
-  note: Note,
+  baesNote: Note,
   navController: NavController
 ) {
-  val innerNoteState by note.live.observeAsState()
   ClickableText(
-    text = AnnotatedString("@${innerNoteState?.note?.id?.toNote()?.toShortenHex()} "),
-    onClick = { navController.navigate("Note/${innerNoteState?.note?.idHex}") },
+    text = AnnotatedString("@${baesNote.id.toNote().toShortenHex()} "),
+    onClick = { navController.navigate("Note/${baesNote.idHex}") },
     style = LocalTextStyle.current.copy(color = MaterialTheme.colors.primary)
   )
 }

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

@@ -3,10 +3,14 @@ package com.vitorpamplona.amethyst.ui.components
 import android.util.Patterns
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.padding
+import androidx.compose.material.LocalTextStyle
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.style.TextDirection
 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.lnurl.LnInvoiceUtil
@@ -40,7 +44,7 @@ fun isValidURL(url: String?): Boolean {
 }
 
 @Composable
-fun RichTextViewer(content: String, tags: List<List<String>>?, note: Note, accountViewModel: AccountViewModel, navController: NavController) {
+fun RichTextViewer(content: String, tags: List<List<String>>?, 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 ->
@@ -69,7 +73,10 @@ fun RichTextViewer(content: String, tags: List<List<String>>?, note: Note, accou
           } else if (tagIndex.matcher(word).matches() && tags != null) {
             TagLink(word, tags, navController)
           } else {
-            Text(text = "$word ")
+            Text(
+              text = "$word ",
+              style = LocalTextStyle.current.copy(textDirection = TextDirection.Content),
+            )
           }
         }
       }

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

@@ -1,18 +1,36 @@
 package com.vitorpamplona.amethyst.ui.navigation
 
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
+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.layout.wrapContentHeight
+import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material.BottomNavigation
 import androidx.compose.material.BottomNavigationItem
 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.livedata.observeAsState
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
 import androidx.navigation.NavHostController
+import com.vitorpamplona.amethyst.NotificationCache
+import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.ui.note.NewItemsBubble
+import kotlinx.coroutines.launch
 
 val bottomNavigationItems = listOf(
     Route.Home,
@@ -24,6 +42,7 @@ val bottomNavigationItems = listOf(
 @Composable
 fun AppBottomBar(navController: NavHostController) {
     val currentRoute = currentRoute(navController)
+    val coroutineScope = rememberCoroutineScope()
 
     Column() {
         Divider(
@@ -36,35 +55,30 @@ fun AppBottomBar(navController: NavHostController) {
         ) {
             bottomNavigationItems.forEach { item ->
                 BottomNavigationItem(
-                    icon = {
-                        Icon(
-                            painter = painterResource(id = item.icon),
-                            null,
-                            modifier = Modifier.size(if ("Home" == item.route) 24.dp else 20.dp),
-                            tint = if (currentRoute == item.route) MaterialTheme.colors.primary else Color.Unspecified
-                        )
-                    },
+                    icon = { NotifiableIcon(item, currentRoute) },
                     selected = currentRoute == item.route,
                     onClick = {
-                        if (currentRoute != 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.graph.startDestinationRoute?.let { start ->
-                                    popUpTo(start) { inclusive = item.route == Route.Home.route }
+                        coroutineScope.launch {
+                            if (currentRoute != 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.graph.startDestinationRoute?.let { start ->
+                                        popUpTo(start) { inclusive = item.route == Route.Home.route }
+                                        restoreState = true
+                                    }
 
-                                launchSingleTop = true
-                                restoreState = true
+                                    launchSingleTop = true
+                                    restoreState = true
+                                }
                             }
                         }
                     }
@@ -73,3 +87,52 @@ fun AppBottomBar(navController: NavHostController) {
         }
     }
 }
+
+@Composable
+private fun NotifiableIcon(item: Route, currentRoute: String?) {
+    Box(Modifier.size(if ("Home" == item.route) 25.dp else 23.dp)) {
+        Icon(
+            painter = painterResource(id = item.icon),
+            null,
+            modifier = Modifier.size(if ("Home" == item.route) 24.dp else 20.dp),
+            tint = if (currentRoute == item.route) MaterialTheme.colors.primary else Color.Unspecified
+        )
+
+        // Notification
+        val dbState = LocalCache.live.observeAsState()
+        val notifState = NotificationCache.live.observeAsState()
+
+        val db = dbState.value
+        val notif = notifState.value
+
+        if (db != null && notif != null) {
+            if (item.hasNewItems(db.cache, notif.cache)) {
+                Box(
+                    Modifier
+                        .width(10.dp)
+                        .height(10.dp)
+                        .align(Alignment.TopEnd)
+                ) {
+                    Box(
+                        modifier = Modifier
+                            .width(10.dp)
+                            .height(10.dp)
+                            .clip(shape = CircleShape)
+                            .background(MaterialTheme.colors.primary),
+                        contentAlignment = Alignment.TopEnd
+                    ) {
+                        Text(
+                            "",
+                            color = Color.White,
+                            textAlign = TextAlign.Center,
+                            fontSize = 12.sp,
+                            modifier = Modifier
+                                .wrapContentHeight()
+                                .align(Alignment.TopEnd)
+                        )
+                    }
+                }
+            }
+        }
+    }
+}

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

@@ -11,11 +11,16 @@ import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 fun AppNavigation(
     navController: NavHostController,
     accountViewModel: AccountViewModel,
-    accountStateViewModel: AccountStateViewModel
+    accountStateViewModel: AccountStateViewModel,
+    nextPage: String? = null
 ) {
     NavHost(navController, startDestination = Route.Home.route) {
         Routes.forEach {
             composable(it.route, it.arguments, content = it.buildScreen(accountViewModel, accountStateViewModel, navController))
         }
     }
+
+    if (nextPage != null) {
+        navController.navigate(nextPage)
+    }
 }

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

@@ -32,12 +32,14 @@ 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.LocalContext
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.font.FontStyle
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.viewmodel.compose.viewModel
 import androidx.navigation.NavHostController
+import coil.Coil
 import coil.compose.AsyncImage
 import coil.compose.rememberAsyncImagePainter
 import com.vitorpamplona.amethyst.R
@@ -84,6 +86,8 @@ fun MainTopBar(scaffoldState: ScaffoldState, accountViewModel: AccountViewModel)
 
     val coroutineScope = rememberCoroutineScope()
 
+    val context = LocalContext.current
+
     var wantsToEditRelays by remember {
         mutableStateOf(false)
     }
@@ -136,6 +140,10 @@ fun MainTopBar(scaffoldState: ScaffoldState, accountViewModel: AccountViewModel)
                                     NostrUserProfileFollowsDataSource.printCounter()
 
                                     println("AAA: " + RelayPool.connectedRelays())
+
+                                    val imageLoader = Coil.imageLoader(context)
+                                    println("${imageLoader.diskCache?.size}/${imageLoader.diskCache?.maxSize}")
+                                    println("${imageLoader.memoryCache?.size}/${imageLoader.memoryCache?.maxSize}")
                                 }
                             ) {
                                 Icon(

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

@@ -162,6 +162,8 @@ fun ListContent(
     modifier: Modifier,
     accountViewModel: AccountStateViewModel
 ) {
+    val coroutineScope = rememberCoroutineScope()
+
     Column(modifier = modifier) {
         LazyColumn() {
             item {
@@ -178,14 +180,19 @@ fun ListContent(
                     thickness = 0.25.dp
                 )
                 Column(modifier = modifier.padding(horizontal = 25.dp)) {
-                    Text(
-                        text = "Settings",
-                        fontSize = 18.sp,
-                        fontWeight = W500
-                    )
-                    Row(
-                        modifier = Modifier.clickable(onClick = { accountViewModel.logOff() }),
-                    ) {
+                    Row(modifier = Modifier.clickable(onClick = {
+                        navController.navigate(Route.Filters.route)
+                        coroutineScope.launch {
+                            scaffoldState.drawerState.close()
+                        }
+                    })) {
+                        Text(
+                            text = "Security Filters",
+                            fontSize = 18.sp,
+                            fontWeight = W500
+                        )
+                    }
+                    Row(modifier = Modifier.clickable(onClick = { accountViewModel.logOff() })) {
                         Text(
                             text = "Log out",
                             modifier = Modifier.padding(vertical = 15.dp),

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

@@ -2,6 +2,7 @@ package com.vitorpamplona.amethyst.ui.navigation
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
+import androidx.compose.ui.platform.LocalContext
 import androidx.navigation.NamedNavArgument
 import androidx.navigation.NavBackStackEntry
 import androidx.navigation.NavController
@@ -9,12 +10,23 @@ import androidx.navigation.NavHostController
 import androidx.navigation.NavType
 import androidx.navigation.compose.currentBackStackEntryAsState
 import androidx.navigation.navArgument
+import com.vitorpamplona.amethyst.NotificationCache
 import com.vitorpamplona.amethyst.R
+import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.service.NostrChatroomListDataSource
+import com.vitorpamplona.amethyst.service.NostrDataSource
+import com.vitorpamplona.amethyst.service.NostrHomeDataSource
+import com.vitorpamplona.amethyst.service.NostrNotificationDataSource
+import com.vitorpamplona.amethyst.service.model.RepostEvent
 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.FiltersScreen
 import com.vitorpamplona.amethyst.ui.screen.HomeScreen
+import com.vitorpamplona.amethyst.ui.screen.NostrChatroomListKnownFeedViewModel
+import com.vitorpamplona.amethyst.ui.screen.NostrHomeFeedViewModel
 import com.vitorpamplona.amethyst.ui.screen.NotificationScreen
 import com.vitorpamplona.amethyst.ui.screen.ProfileScreen
 import com.vitorpamplona.amethyst.ui.screen.SearchScreen
@@ -25,13 +37,30 @@ import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 sealed class Route(
     val route: String,
     val icon: Int,
+    val hasNewItems: @Composable (LocalCache, NotificationCache) -> Boolean = @Composable { _,_ -> false },
     val arguments: List<NamedNavArgument> = emptyList(),
     val buildScreen: (AccountViewModel, AccountStateViewModel, NavController) -> @Composable (NavBackStackEntry) -> Unit
 ) {
-    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 Home : Route("Home", R.drawable.ic_home,
+        hasNewItems = { _, cache -> homeHasNewItems(cache) },
+        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,
+        hasNewItems = { _, cache -> notificationHasNewItems(cache) },
+        buildScreen = { acc, accSt, nav -> { _ -> NotificationScreen(acc, nav) }}
+    )
+
+    object Message : Route("Message", R.drawable.ic_dm,
+        hasNewItems = { _, cache -> messagesHasNewItems(cache) },
+        buildScreen = { acc, accSt, nav -> { _ -> ChatroomListScreen(acc, nav) }}
+    )
+
+    object Filters : Route("Filters", R.drawable.ic_dm,
+        buildScreen = { acc, accSt, nav -> { _ -> FiltersScreen(acc, nav) }}
+    )
 
     object Profile : Route("User/{id}", R.drawable.ic_profile,
         arguments = listOf(navArgument("id") { type = NavType.StringType } ),
@@ -65,11 +94,58 @@ val Routes = listOf(
     Route.Profile,
     Route.Note,
     Route.Room,
-    Route.Channel
+    Route.Channel,
+    Route.Filters
 )
 
+//**
+//*  Functions below only exist because we have not broken the datasource classes into backend and frontend.
+//**
 @Composable
 public fun currentRoute(navController: NavHostController): String? {
     val navBackStackEntry by navController.currentBackStackEntryAsState()
     return navBackStackEntry?.destination?.route
+}
+
+@Composable
+private fun homeHasNewItems(cache: NotificationCache): Boolean {
+    val context = LocalContext.current.applicationContext
+    val lastTimeFollows = cache.load("HomeFollows", context)
+
+    val homeFeed = NostrHomeDataSource.feed().take(100)
+
+    val hasNewInFollows = homeFeed.filter {
+        it.event is RepostEvent || it.replyTo == null || it.replyTo?.size == 0
+    }.filter {
+        (it.event?.createdAt ?: 0) > lastTimeFollows
+    }.isNotEmpty()
+
+    return hasNewInFollows
+}
+
+@Composable
+private fun notificationHasNewItems(cache: NotificationCache): Boolean {
+    val context = LocalContext.current.applicationContext
+    val lastTime = cache.load("Notification", context)
+    return NostrNotificationDataSource.loadTop()
+        .filter { it.event != null && it.event!!.createdAt > lastTime }
+        .isNotEmpty()
+}
+
+@Composable
+private fun messagesHasNewItems(cache: NotificationCache): Boolean {
+    val context = LocalContext.current.applicationContext
+    return NostrChatroomListDataSource.feed().take(100).filter {
+        // only for known sources
+        val me = NostrChatroomListDataSource.account.userProfile()
+        it.channel != null || me.hasSentMessagesTo(it.author)
+    }.filter {
+        val lastTime = if (it.channel != null) {
+            cache.load("Channel/${it.channel!!.idHex}", context)
+        } else {
+            cache.load("Room/${it.author?.pubkeyHex}", context)
+        }
+
+        NostrChatroomListDataSource.account.isAcceptable(it) && it.event != null && it.event!!.createdAt > lastTime
+    }.isNotEmpty()
 }

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

@@ -26,7 +26,38 @@ fun BlankNote(modifier: Modifier = Modifier, isQuote: Boolean = false) {
           verticalAlignment = Alignment.CenterVertically
         ) {
           Text(
-            text = "Referenced event not found",
+            text = "Referenced post not found",
+            modifier = Modifier.padding(30.dp),
+            color = Color.Gray,
+          )
+        }
+
+        Divider(
+          modifier = Modifier.padding(vertical = 10.dp),
+          thickness = 0.25.dp
+        )
+      }
+    }
+  }
+}
+
+
+@Composable
+fun HiddenNote(modifier: Modifier = Modifier, isQuote: Boolean = false) {
+  Column(modifier = modifier) {
+    Row(modifier = Modifier.padding(horizontal = if (!isQuote) 12.dp else 6.dp)) {
+      Column(modifier = Modifier.padding(start = if (!isQuote) 10.dp else 5.dp)) {
+        Row(
+          modifier = Modifier.padding(
+            start = 20.dp,
+            end = 20.dp,
+            bottom = 25.dp,
+            top = 15.dp
+          ),
+          verticalAlignment = Alignment.CenterVertically
+        ) {
+          Text(
+            text = "Post was flagged as inappropriate",
             modifier = Modifier.padding(30.dp),
             color = Color.Gray,
           )

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

@@ -1,5 +1,6 @@
 package com.vitorpamplona.amethyst.ui.note
 
+import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
@@ -10,6 +11,7 @@ import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material.Icon
+import androidx.compose.material.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.livedata.observeAsState
@@ -17,25 +19,39 @@ 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.LocalContext
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.unit.dp
 import androidx.navigation.NavController
 import coil.compose.AsyncImage
 import coil.compose.rememberAsyncImagePainter
 import com.google.accompanist.flowlayout.FlowRow
+import com.vitorpamplona.amethyst.NotificationCache
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.ui.screen.BoostSetCard
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 
 @Composable
-fun BoostSetCompose(likeSetCard: BoostSetCard, isInnerNote: Boolean = false, accountViewModel: AccountViewModel, navController: NavController) {
+fun BoostSetCompose(likeSetCard: BoostSetCard, isInnerNote: Boolean = false, routeForLastRead: String, accountViewModel: AccountViewModel, navController: NavController) {
     val noteState by likeSetCard.note.live.observeAsState()
     val note = noteState?.note
 
+    val accountState by accountViewModel.accountLiveData.observeAsState()
+    val account = accountState?.account ?: return
+
+    val context = LocalContext.current.applicationContext
+
     if (note?.event == null) {
         BlankNote(Modifier, isInnerNote)
     } else {
-        Column() {
+        val isNew = likeSetCard.createdAt > NotificationCache.load(routeForLastRead, context)
+        NotificationCache.markAsRead(routeForLastRead, likeSetCard.createdAt, context)
+
+        Column(
+            modifier = Modifier.background(
+                if (isNew) MaterialTheme.colors.primary.copy(0.12f) else MaterialTheme.colors.background
+            )
+        ) {
             Row(modifier = Modifier
                 .padding(
                     start = if (!isInnerNote) 12.dp else 0.dp,
@@ -66,25 +82,17 @@ fun BoostSetCompose(likeSetCard: BoostSetCard, isInnerNote: Boolean = false, acc
                             if (cardNote?.author != null) {
                                 val userState by cardNote.author!!.live.observeAsState()
 
-                                AsyncImage(
-                                    model = userState?.user?.profilePicture(),
-                                    placeholder = rememberAsyncImagePainter("https://robohash.org/${userState?.user?.pubkeyHex}.png"),
-                                    contentDescription = "Profile Image",
-                                    modifier = Modifier
-                                        .width(35.dp)
-                                        .height(35.dp)
-                                        .clip(shape = CircleShape)
-                                        .clickable(onClick = {
-                                            userState?.let {
-                                                navController.navigate("User/${it.user.pubkeyHex}")
-                                            }
-                                        })
+                                UserPicture(
+                                    user = userState?.user,
+                                    navController = navController,
+                                    userAccount = account.userProfile(),
+                                    size = 35.dp
                                 )
                             }
                         }
                     }
 
-                    NoteCompose(note, Modifier.padding(top = 5.dp), true, accountViewModel, navController)
+                    NoteCompose(note, null, Modifier.padding(top = 5.dp), true, accountViewModel, navController)
                 }
             }
         }

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

@@ -1,14 +1,22 @@
 package com.vitorpamplona.amethyst.ui.note
 
+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.Arrangement.Center
+import androidx.compose.foundation.layout.Box
 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.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.layout.wrapContentHeight
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material.Divider
+import androidx.compose.material.LocalTextStyle
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
@@ -17,13 +25,21 @@ 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.graphics.Color
 import androidx.compose.ui.graphics.painter.Painter
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.text.style.TextDirection
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
 import androidx.navigation.NavController
 import coil.compose.AsyncImage
 import coil.compose.rememberAsyncImagePainter
+import com.vitorpamplona.amethyst.LocalPreferences
+import com.vitorpamplona.amethyst.NotificationCache
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.service.model.ChannelCreateEvent
 import com.vitorpamplona.amethyst.service.model.ChannelMetadataEvent
@@ -38,7 +54,12 @@ fun ChatroomCompose(baseNote: Note, accountViewModel: AccountViewModel, navContr
     val account = accountState?.account ?: return
 
     val accountUserState by account.userProfile().live.observeAsState()
-    val accountUser = accountUserState?.user
+    val accountUser = accountUserState?.user ?: return
+
+    val notificationCacheState = NotificationCache.live.observeAsState()
+    val notificationCache = notificationCacheState.value ?: return
+
+    val context = LocalContext.current.applicationContext
 
     if (note?.event == null) {
         BlankNote(Modifier)
@@ -49,14 +70,22 @@ fun ChatroomCompose(baseNote: Note, accountViewModel: AccountViewModel, navContr
         val channelState by note.channel!!.live.observeAsState()
         val channel = channelState?.channel
 
-        val description = if (note.event is ChannelCreateEvent) {
+        val noteEvent = note.event
+
+        val description = if (noteEvent is ChannelCreateEvent) {
             "Channel created"
-        } else if (note.event is ChannelMetadataEvent) {
+        } else if (noteEvent is ChannelMetadataEvent) {
             "Channel Information changed to "
         } else {
-            note.event?.content
+            noteEvent?.content
         }
         channel?.let { channel ->
+            val hasNewMessages =
+                if (noteEvent != null)
+                    noteEvent.createdAt > notificationCache.cache.load("Channel/${channel.idHex}", context)
+                else
+                    false
+
             ChannelName(
                 channelPicture = channel.profilePicture(),
                 channelPicturePlaceholder = null,
@@ -64,7 +93,8 @@ fun ChatroomCompose(baseNote: Note, accountViewModel: AccountViewModel, navContr
                     Text(
                         "${channel.info.name}",
                         fontWeight = FontWeight.Bold,
-                        modifier = it
+                        modifier = it,
+                        style = LocalTextStyle.current.copy(textDirection = TextDirection.Content)
                     )
                     Text(
                         " Public Chat",
@@ -73,6 +103,7 @@ fun ChatroomCompose(baseNote: Note, accountViewModel: AccountViewModel, navContr
                 },
                 channelLastTime = note.event?.createdAt,
                 channelLastContent = "${author?.toBestDisplayName()}: " + description,
+                hasNewMessages = hasNewMessages,
                 onClick = { navController.navigate("Channel/${channel.idHex}") })
         }
 
@@ -93,13 +124,21 @@ fun ChatroomCompose(baseNote: Note, accountViewModel: AccountViewModel, navContr
             }
         }
 
+        val noteEvent = note.event
+
         userToComposeOn?.let { user ->
+            val hasNewMessages =
+                if (noteEvent != null)
+                    noteEvent.createdAt > notificationCache.cache.load("Room/${userToComposeOn.pubkeyHex}", context)
+                else
+                    false
+
             ChannelName(
-                channelPicture = user.profilePicture(),
-                channelPicturePlaceholder = rememberAsyncImagePainter("https://robohash.org/${user.pubkeyHex}.png"),
+                channelPicture = { UserPicture(user = user, userAccount = accountUser, size = 55.dp) },
                 channelTitle = { UsernameDisplay(user, it) },
-                channelLastTime = note.event?.createdAt,
+                channelLastTime = noteEvent?.createdAt,
                 channelLastContent = accountViewModel.decrypt(note),
+                hasNewMessages = hasNewMessages,
                 onClick = { navController.navigate("Room/${user.pubkeyHex}") })
         }
     }
@@ -113,13 +152,11 @@ fun ChannelName(
     channelTitle: @Composable (Modifier) -> Unit,
     channelLastTime: Long?,
     channelLastContent: String?,
+    hasNewMessages: Boolean,
     onClick: () -> Unit
 ) {
-    Column(modifier = Modifier.clickable(onClick = onClick) ) {
-        Row(
-            modifier = Modifier.padding(start = 12.dp, end = 12.dp, top = 10.dp)
-        ) {
-
+    ChannelName(
+        channelPicture = {
             AsyncImage(
                 model = channelPicture,
                 placeholder = channelPicturePlaceholder,
@@ -129,6 +166,29 @@ fun ChannelName(
                     .height(55.dp)
                     .clip(shape = CircleShape)
             )
+        },
+        channelTitle,
+        channelLastTime,
+        channelLastContent,
+        hasNewMessages,
+        onClick
+    )
+}
+
+@Composable
+fun ChannelName(
+    channelPicture: @Composable () -> Unit,
+    channelTitle: @Composable (Modifier) -> Unit,
+    channelLastTime: Long?,
+    channelLastContent: String?,
+    hasNewMessages: Boolean,
+    onClick: () -> Unit
+) {
+    Column(modifier = Modifier.clickable(onClick = onClick) ) {
+        Row(
+            modifier = Modifier.padding(start = 12.dp, end = 12.dp, top = 10.dp)
+        ) {
+            channelPicture()
 
             Column(modifier = Modifier.padding(start = 10.dp),
             verticalArrangement = Arrangement.SpaceAround) {
@@ -147,20 +207,29 @@ fun ChannelName(
 
                 }
 
-                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
-                    )
+                Row(modifier = Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically) {
+                    if (channelLastContent != null)
+                        Text(
+                            channelLastContent,
+                            color = MaterialTheme.colors.onSurface.copy(alpha = 0.52f),
+                            maxLines = 1,
+                            overflow = TextOverflow.Ellipsis,
+                            style = LocalTextStyle.current.copy(textDirection = TextDirection.Content),
+                            modifier = Modifier.weight(1f)
+                        )
+                    else
+                        Text(
+                            "Referenced event not found",
+                            color = MaterialTheme.colors.onSurface.copy(alpha = 0.52f),
+                            maxLines = 1,
+                            overflow = TextOverflow.Ellipsis,
+                            modifier = Modifier.weight(1f)
+                        )
+
+                    if (hasNewMessages) {
+                        NewItemsBubble()
+                    }
+                }
             }
         }
 
@@ -169,4 +238,27 @@ fun ChannelName(
             thickness = 0.25.dp
         )
     }
+}
+
+@Composable
+fun NewItemsBubble() {
+    Box(
+        modifier = Modifier
+            .padding(start = 3.dp)
+            .width(10.dp)
+            .height(10.dp)
+            .clip(shape = CircleShape)
+            .background(MaterialTheme.colors.primary),
+        contentAlignment = Alignment.Center
+    ) {
+        Text(
+            "",
+            color = Color.White,
+            textAlign = TextAlign.Center,
+            fontSize = 12.sp,
+            modifier = Modifier
+                .wrapContentHeight()
+                .align(Alignment.Center)
+        )
+    }
 }

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

@@ -30,12 +30,14 @@ 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.platform.LocalContext
 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 coil.compose.rememberAsyncImagePainter
+import com.vitorpamplona.amethyst.NotificationCache
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.service.model.ChannelCreateEvent
 import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
@@ -50,7 +52,7 @@ 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) {
+fun ChatroomMessageCompose(baseNote: Note, routeForLastRead: String?, innerQuote: Boolean = false, accountViewModel: AccountViewModel, navController: NavController) {
     val noteState by baseNote.live.observeAsState()
     val note = noteState?.note
 
@@ -62,6 +64,8 @@ fun ChatroomMessageCompose(baseNote: Note, innerQuote: Boolean = false, accountV
 
     var popupExpanded by remember { mutableStateOf(false) }
 
+    val context = LocalContext.current.applicationContext
+
     if (note?.event == null) {
         BlankNote(Modifier)
     } else {
@@ -82,6 +86,17 @@ fun ChatroomMessageCompose(baseNote: Note, innerQuote: Boolean = false, accountV
             shape = ChatBubbleShapeThem
         }
 
+        // Mark read
+        val isNew = routeForLastRead?.run {
+            val isNew = NotificationCache.load(this, context)
+
+            val createdAt = note.event?.createdAt
+            if (createdAt != null)
+                NotificationCache.markAsRead(this, createdAt, context)
+
+            isNew
+        }
+
         Column() {
             Row(
                 modifier = Modifier.fillMaxWidth(1f).padding(
@@ -150,6 +165,7 @@ fun ChatroomMessageCompose(baseNote: Note, innerQuote: Boolean = false, accountV
                                         if (note.event != null)
                                             ChatroomMessageCompose(
                                                 note,
+                                                null,
                                                 innerQuote = true,
                                                 accountViewModel = accountViewModel,
                                                 navController = navController
@@ -177,16 +193,12 @@ fun ChatroomMessageCompose(baseNote: Note, innerQuote: Boolean = false, accountV
                                         RichTextViewer(
                                             eventContent,
                                             note.event?.tags,
-                                            note,
-                                            accountViewModel,
                                             navController
                                         )
                                     else
                                         RichTextViewer(
                                             "Could Not decrypt the message",
                                             note.event?.tags,
-                                            note,
-                                            accountViewModel,
                                             navController
                                         )
 

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

@@ -1,5 +1,6 @@
 package com.vitorpamplona.amethyst.ui.note
 
+import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
@@ -10,6 +11,7 @@ import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material.Icon
+import androidx.compose.material.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.livedata.observeAsState
@@ -17,26 +19,40 @@ 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.LocalContext
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.unit.dp
 import androidx.navigation.NavController
 import coil.compose.AsyncImage
 import coil.compose.rememberAsyncImagePainter
 import com.google.accompanist.flowlayout.FlowRow
+import com.vitorpamplona.amethyst.NotificationCache
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.ui.screen.LikeSetCard
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 
 @Composable
-fun LikeSetCompose(likeSetCard: LikeSetCard, modifier: Modifier = Modifier, isInnerNote: Boolean = false, accountViewModel: AccountViewModel, navController: NavController) {
+fun LikeSetCompose(likeSetCard: LikeSetCard, modifier: Modifier = Modifier, isInnerNote: Boolean = false, routeForLastRead: String, accountViewModel: AccountViewModel, navController: NavController) {
     val noteState by likeSetCard.note.live.observeAsState()
     val note = noteState?.note
 
+    val accountState by accountViewModel.accountLiveData.observeAsState()
+    val account = accountState?.account ?: return
+
+    val context = LocalContext.current.applicationContext
+
     if (note == null) {
         BlankNote(Modifier, isInnerNote)
     } else {
-        Column(modifier = modifier) {
-            Row(                modifier = Modifier
+        val isNew = likeSetCard.createdAt > NotificationCache.load(routeForLastRead, context)
+        NotificationCache.markAsRead(routeForLastRead, likeSetCard.createdAt, context)
+
+        Column(
+            modifier = Modifier.background(
+                if (isNew) MaterialTheme.colors.primary.copy(0.12f) else MaterialTheme.colors.background
+            )
+        ) {
+            Row(modifier = Modifier
                 .padding(
                     start = if (!isInnerNote) 12.dp else 0.dp,
                     end = if (!isInnerNote) 12.dp else 0.dp,
@@ -66,25 +82,17 @@ fun LikeSetCompose(likeSetCard: LikeSetCard, modifier: Modifier = Modifier, isIn
                             if (cardNote?.author != null) {
                                 val userState by cardNote.author!!.live.observeAsState()
 
-                                AsyncImage(
-                                    model = userState?.user?.profilePicture(),
-                                    placeholder = rememberAsyncImagePainter("https://robohash.org/${userState?.user?.pubkeyHex}.png"),
-                                    contentDescription = "Profile Image",
-                                    modifier = Modifier
-                                        .width(35.dp).height(35.dp)
-                                        .height(35.dp)
-                                        .clip(shape = CircleShape)
-                                        .clickable(onClick = {
-                                            userState?.let {
-                                                navController.navigate("User/${it.user.pubkeyHex}")
-                                            }
-                                        })
+                                UserPicture(
+                                    user = userState?.user,
+                                    navController = navController,
+                                    userAccount = account.userProfile(),
+                                    size = 35.dp
                                 )
                             }
                         }
                     }
 
-                    NoteCompose(note, Modifier.padding(top = 5.dp), true, accountViewModel, navController)
+                    NoteCompose(note, null, Modifier.padding(top = 5.dp), true, accountViewModel, navController)
                 }
             }
         }

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

@@ -8,13 +8,18 @@ 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.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
 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.shape.CircleShape
 import androidx.compose.material.Divider
 import androidx.compose.material.DropdownMenu
 import androidx.compose.material.DropdownMenuItem
+import androidx.compose.material.Icon
+import androidx.compose.material.LocalContentColor
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
@@ -26,53 +31,100 @@ 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.platform.LocalClipboardManager
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import androidx.navigation.NavController
 import coil.compose.AsyncImage
 import coil.compose.rememberAsyncImagePainter
+import com.vitorpamplona.amethyst.NotificationCache
+import com.vitorpamplona.amethyst.R
+import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.model.User
 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
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
+import com.vitorpamplona.amethyst.ui.theme.Following
 import nostr.postr.events.TextNoteEvent
 import nostr.postr.toNpub
 
 @OptIn(ExperimentalFoundationApi::class)
 @Composable
-fun NoteCompose(baseNote: Note, modifier: Modifier = Modifier, isInnerNote: Boolean = false, accountViewModel: AccountViewModel, navController: NavController) {
+fun NoteCompose(
+    baseNote: Note,
+    routeForLastRead: String? = null,
+    modifier: Modifier = Modifier,
+    isInnerNote: Boolean = false,
+    accountViewModel: AccountViewModel,
+    navController: NavController
+) {
+    val accountState by accountViewModel.accountLiveData.observeAsState()
+    val account = accountState?.account ?: return
+
     val noteState by baseNote.live.observeAsState()
     val note = noteState?.note
 
     var popupExpanded by remember { mutableStateOf(false) }
 
+    val context = LocalContext.current.applicationContext
+
     if (note?.event == null) {
         BlankNote(modifier.combinedClickable(
             onClick = {  },
             onLongClick = { popupExpanded = true },
         ), isInnerNote)
+    } else if (account?.isAcceptable(note) == false) {
+        HiddenNote(modifier.combinedClickable(
+            onClick = {  },
+            onLongClick = { popupExpanded = true },
+        ), isInnerNote)
     } else {
-        val authorState by note.author!!.live.observeAsState()
-        val author = authorState?.user
+        val authorState by note.author?.live!!.observeAsState()
+        val author = authorState?.user ?: return // if it has event, it should have an author
+
+        val isNew = routeForLastRead?.run {
+            val lastTime = NotificationCache.load(this, context)
+
+            val createdAt = note.event?.createdAt
+            if (createdAt != null) {
+                NotificationCache.markAsRead(this, createdAt, context)
+                createdAt > lastTime
+            } else {
+                false
+            }
+        } ?: false
 
         Column(modifier =
             modifier.combinedClickable(
                 onClick = {
                     if (note.event !is ChannelMessageEvent) {
-                        navController.navigate("Note/${note.idHex}")
+                        navController.navigate("Note/${note.idHex}"){
+                            launchSingleTop = true
+                        }
                     } else {
                         note.channel?.let {
                             navController.navigate("Channel/${it.idHex}")
                         }
                     }
                 },
-                onLongClick = { popupExpanded = true },
-            )
+                onLongClick = { popupExpanded = true }
+            ).run {
+                if (isNew) {
+                    this.background(MaterialTheme.colors.primary.copy(0.12f))
+                } else {
+                    this
+                }
+            }
         ) {
             Row(
                 modifier = Modifier
@@ -84,40 +136,55 @@ fun NoteCompose(baseNote: Note, modifier: Modifier = Modifier, isInnerNote: Bool
 
                 // Draws the boosted picture outside the boosted card.
                 if (!isInnerNote) {
-                    Box(modifier = Modifier.width(55.dp).padding(0.dp)) {
-                        AsyncImage(
-                            model = author?.profilePicture(),
-                            contentDescription = "Profile Image",
-                            placeholder = rememberAsyncImagePainter("https://robohash.org/${author?.pubkeyHex}.png"),
-                            modifier = Modifier
-                                .width(55.dp).height(55.dp)
-                                .clip(shape = CircleShape)
-                                .clickable(onClick = {
-                                    author?.let {
-                                        navController.navigate("User/${it.pubkeyHex}")
-                                    }
-                                })
-                        )
+                    Box(modifier = Modifier
+                        .width(55.dp)
+                        .padding(0.dp)) {
+                        UserPicture(author, navController, account.userProfile(), 55.dp)
 
                         // boosted picture
                         val boostedPosts = note.replyTo
                         if (note.event is RepostEvent && boostedPosts != null && boostedPosts.isNotEmpty()) {
-                            AsyncImage(
-                                model = boostedPosts[0].author?.profilePicture(),
-                                contentDescription = "Profile Image",
-                                placeholder = rememberAsyncImagePainter("https://robohash.org/${boostedPosts[0].author?.pubkeyHex}.png"),
-                                modifier = Modifier
-                                    .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}")
-                                        }
-                                    })
-                            )
+                            val boostedAuthor = boostedPosts[0].author
+                            Box(
+                                Modifier
+                                    .width(30.dp)
+                                    .height(30.dp)
+                                    .align(Alignment.BottomEnd)) {
+                                UserPicture(boostedAuthor, navController, account.userProfile(), 35.dp,
+                                    pictureModifier = Modifier.border(2.dp, MaterialTheme.colors.background, CircleShape)
+                                )
+                            }
+                        }
+
+                        // boosted picture
+                        val baseChannel = note.channel
+                        if (note.event is ChannelMessageEvent && baseChannel != null) {
+                            val channelState by baseChannel.live.observeAsState()
+                            val channel = channelState?.channel
+
+                            if (channel != null) {
+                                Box(
+                                    Modifier
+                                        .width(30.dp)
+                                        .height(30.dp)
+                                        .align(Alignment.BottomEnd)) {
+                                    AsyncImage(
+                                        model = channel.profilePicture(),
+                                        placeholder = null,
+                                        contentDescription = "Group Picture",
+                                        modifier = Modifier
+                                            .width(30.dp)
+                                            .height(30.dp)
+                                            .clip(shape = CircleShape)
+                                            .background(MaterialTheme.colors.background)
+                                            .border(
+                                                2.dp,
+                                                MaterialTheme.colors.background,
+                                                CircleShape
+                                            )
+                                    )
+                                }
+                            }
                         }
                     }
                 }
@@ -154,7 +221,7 @@ fun NoteCompose(baseNote: Note, modifier: Modifier = Modifier, isInnerNote: Bool
                         note.replyTo?.mapIndexed { index, note ->
                             NoteCompose(
                                 note,
-                                modifier = Modifier.padding(top = 5.dp),
+                                modifier = Modifier,
                                 isInnerNote = true,
                                 accountViewModel = accountViewModel,
                                 navController = navController
@@ -173,11 +240,11 @@ fun NoteCompose(baseNote: Note, modifier: Modifier = Modifier, isInnerNote: Bool
                     } else {
                         val eventContent = note.event?.content
                         if (eventContent != null)
-                            RichTextViewer(eventContent, note.event?.tags, note, accountViewModel, navController)
+                            RichTextViewer(eventContent, note.event?.tags, navController)
 
-                        if (note.event !is ChannelMessageEvent) {
-                            ReactionsRowState(note, accountViewModel)
-                        }
+                        //if (note.event !is ChannelMessageEvent) {
+                        ReactionsRow(note, accountViewModel)
+                        //}
 
                         Divider(
                             modifier = Modifier.padding(top = 10.dp),
@@ -192,9 +259,102 @@ fun NoteCompose(baseNote: Note, modifier: Modifier = Modifier, isInnerNote: Bool
     }
 }
 
+@Composable
+fun UserPicture(
+    user: User?,
+    navController: NavController,
+    userAccount: User,
+    size: Dp,
+    pictureModifier: Modifier = Modifier
+) {
+    UserPicture(user, userAccount, size, pictureModifier) {
+        user?.let {
+            navController.navigate("User/${it.pubkeyHex}")
+        }
+    }
+}
+
+@Composable
+fun UserPicture(
+    user: User?,
+    userAccount: User,
+    size: Dp,
+    pictureModifier: Modifier = Modifier,
+    onClick: (() -> Unit)? = null
+) {
+    val accountState by userAccount.live.observeAsState()
+    val accountUser = accountState?.user ?: return
+
+    Box(
+        Modifier
+            .width(size)
+            .height(size)) {
+        if (user == null) {
+            AsyncImage(
+                model = "https://robohash.org/ohno.png",
+                contentDescription = "Profile Image",
+                placeholder = rememberAsyncImagePainter("https://robohash.org/ohno.png"),
+                modifier = pictureModifier
+                    .fillMaxSize(1f)
+                    .clip(shape = CircleShape)
+                    .background(MaterialTheme.colors.background)
+            )
+        } else {
+            val userState by user.live.observeAsState()
+            val userLive = userState?.user ?: return
+
+            AsyncImage(
+                model = userLive.profilePicture(),
+                contentDescription = "Profile Image",
+                placeholder = rememberAsyncImagePainter("https://robohash.org/${userLive.pubkeyHex}.png"),
+                modifier = pictureModifier
+                    .fillMaxSize(1f)
+                    .clip(shape = CircleShape)
+                    .background(MaterialTheme.colors.background)
+                    .run {
+                        if (onClick != null)
+                            this.clickable(onClick = onClick)
+                        else
+                            this
+                    }
+
+            )
+
+            if (accountUser.isFollowing(userLive) || userLive == accountUser) {
+                Box(
+                    Modifier
+                        .width(size.div(3.5f))
+                        .height(size.div(3.5f))
+                        .align(Alignment.TopEnd),
+                    contentAlignment = Alignment.Center
+                ) {
+                    // Background for the transparent checkmark
+                    Text(
+                        "x",
+                        Modifier
+                            .padding(4.dp)
+                            .fillMaxSize()
+                            .align(Alignment.Center)
+                            .background(MaterialTheme.colors.background)
+                            .clip(shape = CircleShape)
+                    )
+
+                    Icon(
+                        painter = painterResource(R.drawable.ic_verified),
+                        "Following",
+                        modifier = Modifier.fillMaxSize(),
+                        tint = Following
+                    )
+                }
+            }
+        }
+    }
+}
+
 @Composable
 fun NoteDropDownMenu(note: Note, popupExpanded: Boolean, onDismiss: () -> Unit, accountViewModel: AccountViewModel) {
     val clipboardManager = LocalClipboardManager.current
+    val context = LocalContext.current.applicationContext
 
     DropdownMenu(
         expanded = popupExpanded,
@@ -213,5 +373,12 @@ fun NoteDropDownMenu(note: Note, popupExpanded: Boolean, onDismiss: () -> Unit,
         DropdownMenuItem(onClick = { accountViewModel.broadcast(note); onDismiss() }) {
             Text("Broadcast")
         }
+        Divider()
+        DropdownMenuItem(onClick = { accountViewModel.report(note); onDismiss() }) {
+            Text("Report Post")
+        }
+        DropdownMenuItem(onClick = { note.author?.let { accountViewModel.hide(it, context) }; onDismiss() }) {
+            Text("Hide User")
+        }
     }
 }

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

@@ -1,6 +1,5 @@
 package com.vitorpamplona.amethyst.ui.note
 
-import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxWidth
@@ -14,11 +13,14 @@ import androidx.compose.material.IconButton
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Text
 import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Download
+import androidx.compose.material.icons.filled.MoreVert
 import androidx.compose.material.icons.outlined.BarChart
 import androidx.compose.material.icons.outlined.Visibility
 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
@@ -39,11 +41,26 @@ import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.ui.actions.NewPostView
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 
 @Composable
-fun ReactionsRow(note: Note, account: Account, boost: (Note) -> Unit, reactTo: (Note) -> Unit) {
+fun ReactionsRow(baseNote: Note, accountViewModel: AccountViewModel) {
+  val accountState by accountViewModel.accountLiveData.observeAsState()
+  val account = accountState?.account ?: return
+
+  val reactionsState by baseNote.liveReactions.observeAsState()
+  val reactedNote = reactionsState?.note
+
+  val boostsState by baseNote.liveBoosts.observeAsState()
+  val boostedNote = boostsState?.note
+
+  val repliesState by baseNote.liveReplies.observeAsState()
+  val replies = repliesState?.note?.replies ?: emptySet()
+
   val grayTint = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
 
+  var popupExpanded by remember { mutableStateOf(false) }
+
   var wantsToReplyTo by remember {
     mutableStateOf<Note?>(null)
   }
@@ -60,7 +77,7 @@ fun ReactionsRow(note: Note, account: Account, boost: (Note) -> Unit, reactTo: (
   ) {
     IconButton(
       modifier = Modifier.then(Modifier.size(24.dp)),
-      onClick = { if (account.isWriteable()) wantsToReplyTo = note }
+      onClick = { if (account.isWriteable()) wantsToReplyTo = baseNote }
     ) {
       Icon(
         painter = painterResource(R.drawable.ic_comment),
@@ -71,7 +88,7 @@ fun ReactionsRow(note: Note, account: Account, boost: (Note) -> Unit, reactTo: (
     }
 
     Text(
-      "  ${showCount(note.replies?.size)}",
+      "  ${showCount(replies.size)}",
       fontSize = 14.sp,
       color = grayTint,
       modifier = Modifier.weight(1f)
@@ -79,9 +96,9 @@ fun ReactionsRow(note: Note, account: Account, boost: (Note) -> Unit, reactTo: (
 
     IconButton(
       modifier = Modifier.then(Modifier.size(24.dp)),
-      onClick = { if (account.isWriteable()) boost(note) }
+      onClick = { if (account.isWriteable()) accountViewModel.boost(baseNote) }
     ) {
-      if (note.isBoostedBy(account.userProfile())) {
+      if (boostedNote?.isBoostedBy(account.userProfile()) == true) {
         Icon(
           painter = painterResource(R.drawable.ic_retweeted),
           null,
@@ -99,7 +116,7 @@ fun ReactionsRow(note: Note, account: Account, boost: (Note) -> Unit, reactTo: (
     }
 
     Text(
-      "  ${showCount(note.boosts?.size)}",
+      "  ${showCount(boostedNote?.boosts?.size)}",
       fontSize = 14.sp,
       color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f),
       modifier = Modifier.weight(1f)
@@ -107,9 +124,9 @@ fun ReactionsRow(note: Note, account: Account, boost: (Note) -> Unit, reactTo: (
 
     IconButton(
       modifier = Modifier.then(Modifier.size(24.dp)),
-      onClick = { if (account.isWriteable()) reactTo(note) }
+      onClick = { if (account.isWriteable()) accountViewModel.reactTo(baseNote) }
     ) {
-      if (note.isReactedBy(account.userProfile())) {
+      if (reactedNote?.isReactedBy(account.userProfile()) == true) {
         Icon(
           painter = painterResource(R.drawable.ic_liked),
           null,
@@ -127,7 +144,7 @@ fun ReactionsRow(note: Note, account: Account, boost: (Note) -> Unit, reactTo: (
     }
 
     Text(
-      "  ${showCount(note.reactions?.size)}",
+      "  ${showCount(reactedNote?.reactions?.size)}",
       fontSize = 14.sp,
       color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f),
       modifier = Modifier.weight(1f)
@@ -149,7 +166,7 @@ fun ReactionsRow(note: Note, account: Account, boost: (Note) -> Unit, reactTo: (
     Row(modifier = Modifier.weight(1f)) {
       AsyncImage(
         model = ImageRequest.Builder(LocalContext.current)
-          .data("https://counter.amethyst.social/${note.idHex}.svg?label=+&color=00000000")
+          .data("https://counter.amethyst.social/${baseNote.idHex}.svg?label=+&color=00000000")
           .crossfade(true)
           .diskCachePolicy(CachePolicy.DISABLED)
           .memoryCachePolicy(CachePolicy.ENABLED)
@@ -161,8 +178,20 @@ fun ReactionsRow(note: Note, account: Account, boost: (Note) -> Unit, reactTo: (
     }
 
 
-
+    IconButton(
+      modifier = Modifier.then(Modifier.size(24.dp)),
+      onClick = { popupExpanded = true }
+    ) {
+      Icon(
+        imageVector = Icons.Default.MoreVert,
+        null,
+        modifier = Modifier.size(15.dp),
+        tint = grayTint,
+      )
+    }
   }
+
+  NoteDropDownMenu(baseNote, popupExpanded, { popupExpanded = false }, accountViewModel)
 }
 
 fun showCount(size: Int?): String {

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

@@ -1,20 +0,0 @@
-package com.vitorpamplona.amethyst.ui.note
-
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.livedata.observeAsState
-import com.vitorpamplona.amethyst.model.Note
-import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
-
-@Composable
-fun ReactionsRowState(baseNote: Note, accountViewModel: AccountViewModel) {
-  val accountState by accountViewModel.accountLiveData.observeAsState()
-  val account = accountState?.account
-
-  val noteState by baseNote.live.observeAsState()
-  val note = noteState?.note
-
-  if (account == null || note == null) return
-
-  ReactionsRow(note, account, accountViewModel::boost, accountViewModel::reactTo)
-}

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

@@ -41,7 +41,9 @@ fun ReplyInformation(replyTo: MutableList<Note>?, mentions: List<User>?, prefix:
           color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
         )
 
-        mentions.toSet().forEachIndexed { idx, user ->
+        val mentionSet = mentions.toSet()
+
+        mentionSet.toSet().forEachIndexed { idx, user ->
           val innerUserState by user.live.observeAsState()
           val innerUser = innerUserState?.user
 
@@ -52,13 +54,13 @@ fun ReplyInformation(replyTo: MutableList<Note>?, mentions: List<User>?, prefix:
               onClick = { onUserTagClick(myUser) }
             )
 
-            if (idx < mentions.size - 2) {
+            if (idx < mentionSet.size - 2) {
               Text(
                 ", ",
                 fontSize = 13.sp,
                 color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
               )
-            } else if (idx < mentions.size - 1) {
+            } else if (idx < mentionSet.size - 1) {
               Text(
                 " and ",
                 fontSize = 13.sp,
@@ -89,33 +91,38 @@ fun ReplyInformationChannel(replyTo: MutableList<Note>?, mentions: List<User>?,
 @Composable
 fun ReplyInformationChannel(replyTo: MutableList<Note>?,
                      mentions: List<User>?,
-                     channel: Channel,
+                     baseChannel: Channel,
                      prefix: String = "",
                      onUserTagClick: (User) -> Unit,
                      onChannelTagClick: (Channel) -> Unit
 ) {
+  val channelState by baseChannel.live.observeAsState()
+  val channel = channelState?.channel ?: return
+
   FlowRow() {
+    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) }
+    )
+
     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 mentionSet = mentions.toSet()
+
+        mentionSet.forEachIndexed { idx, user ->
           val innerUserState by user.live.observeAsState()
           val innerUser = innerUserState?.user
 
@@ -126,13 +133,13 @@ fun ReplyInformationChannel(replyTo: MutableList<Note>?,
               onClick = { onUserTagClick(myUser) }
             )
 
-            if (idx < mentions.size - 2) {
+            if (idx < mentionSet.size - 2) {
               Text(
                 ", ",
                 fontSize = 13.sp,
                 color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
               )
-            } else if (idx < mentions.size - 1) {
+            } else if (idx < mentionSet.size - 1) {
               Text(
                 " and ",
                 fontSize = 13.sp,

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

@@ -16,23 +16,29 @@ 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.platform.LocalContext
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import androidx.navigation.NavController
 import coil.compose.AsyncImage
 import coil.compose.rememberAsyncImagePainter
+import com.vitorpamplona.amethyst.LocalPreferences
 import com.vitorpamplona.amethyst.model.User
 import com.vitorpamplona.amethyst.ui.screen.FollowButton
+import com.vitorpamplona.amethyst.ui.screen.ShowUserButton
 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 account = accountState?.account ?: return
 
     val userState by baseUser.live.observeAsState()
     val user = userState?.user ?: return
 
+    val ctx = LocalContext.current.applicationContext
+
     Column(modifier =
         Modifier.clickable(
             onClick = { navController.navigate("User/${user.pubkeyHex}") }
@@ -46,14 +52,7 @@ fun UserCompose(baseUser: User, accountViewModel: AccountViewModel, navControlle
                     top = 10.dp)
         ) {
 
-            AsyncImage(
-                model = user.profilePicture(),
-                placeholder = rememberAsyncImagePainter("https://robohash.org/${user.pubkeyHex}.png"),
-                contentDescription = "Profile Image",
-                modifier = Modifier
-                    .width(55.dp).height(55.dp)
-                    .clip(shape = CircleShape)
-            )
+            UserPicture(user, navController, account.userProfile(), 55.dp)
 
             Column(modifier = Modifier.padding(start = 10.dp).weight(1f)) {
                 Row(verticalAlignment = Alignment.CenterVertically) {
@@ -69,10 +68,15 @@ fun UserCompose(baseUser: User, accountViewModel: AccountViewModel, navControlle
             }
 
             Column(modifier = Modifier.padding(start = 10.dp)) {
-                if (accountState?.account?.userProfile()?.isFollowing(user) == true) {
-                    UnfollowButton { accountState?.account?.unfollow(user) }
+                if (account?.isAcceptable(user) == false) {
+                    ShowUserButton {
+                        account.showUser(user.pubkeyHex)
+                        LocalPreferences(ctx).saveToEncryptedStorage(account)
+                    }
+                } else if (account?.userProfile()?.isFollowing(user) == true) {
+                    UnfollowButton { account.unfollow(user) }
                 } else {
-                    FollowButton { accountState?.account?.follow(user) }
+                    FollowButton { account?.follow(user) }
                 }
             }
         }

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

@@ -3,13 +3,14 @@ package com.vitorpamplona.amethyst.ui.screen
 import androidx.compose.animation.Crossfade
 import androidx.compose.foundation.layout.Column
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 
 @Composable
-fun AccountScreen(accountStateViewModel: AccountStateViewModel) {
-  val accountState by accountStateViewModel.accountContent.collectAsStateWithLifecycle()
+fun AccountScreen(accountStateViewModel: AccountStateViewModel, startingPage: String?) {
+  val accountState by accountStateViewModel.accountContent.collectAsState()
 
   Column() {
     Crossfade(targetState = accountState) { state ->
@@ -18,10 +19,10 @@ fun AccountScreen(accountStateViewModel: AccountStateViewModel) {
           LoginPage(accountStateViewModel)
         }
         is AccountState.LoggedIn -> {
-          MainScreen(AccountViewModel(state.account), accountStateViewModel)
+          MainScreen(AccountViewModel(state.account), accountStateViewModel, startingPage)
         }
         is AccountState.LoggedInViewOnly -> {
-          MainScreen(AccountViewModel(state.account), accountStateViewModel)
+          MainScreen(AccountViewModel(state.account), accountStateViewModel, startingPage)
         }
       }
     }

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

@@ -3,6 +3,7 @@ package com.vitorpamplona.amethyst.ui.screen
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import androidx.security.crypto.EncryptedSharedPreferences
+import com.vitorpamplona.amethyst.LocalPreferences
 import com.vitorpamplona.amethyst.ServiceManager
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.DefaultChannels
@@ -30,15 +31,13 @@ import nostr.postr.Persona
 import nostr.postr.bechToBytes
 import nostr.postr.toHex
 
-class AccountStateViewModel(
-  private val encryptedPreferences: EncryptedSharedPreferences
-): ViewModel() {
+class AccountStateViewModel(private val localPreferences: LocalPreferences): ViewModel() {
   private val _accountContent = MutableStateFlow<AccountState>(AccountState.LoggedOff)
   val accountContent = _accountContent.asStateFlow()
 
   init {
     // pulls account from storage.
-    loadFromEncryptedStorage()?.let {
+    localPreferences.loadFromEncryptedStorage()?.let {
       login(it)
     }
   }
@@ -58,14 +57,14 @@ class AccountStateViewModel(
         Account(Persona(Hex.decode(key)))
       }
 
-    saveToEncryptedStorage(account)
+    localPreferences.saveToEncryptedStorage(account)
 
     login(account)
   }
 
   fun newKey() {
     val account = Account(Persona())
-    saveToEncryptedStorage(account)
+    localPreferences.saveToEncryptedStorage(account)
     login(account)
   }
 
@@ -83,36 +82,6 @@ class AccountStateViewModel(
   fun logOff() {
     _accountContent.update { AccountState.LoggedOff }
 
-    clearEncryptedStorage()
-  }
-
-  fun clearEncryptedStorage() {
-    encryptedPreferences.edit().apply {
-      remove("nostr_privkey")
-      remove("nostr_pubkey")
-      remove("following_channels")
-    }.apply()
-  }
-
-  fun saveToEncryptedStorage(account: Account) {
-    encryptedPreferences.edit().apply {
-      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(): 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 Account(Persona(privKey = privKey?.toByteArray(), pubKey = pubKey.toByteArray()), followingChannels)
-      } else {
-        return null
-      }
-    }
+    localPreferences.clearEncryptedStorage()
   }
 }

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

@@ -1,15 +1,19 @@
 package com.vitorpamplona.amethyst.ui.screen
 
+import androidx.compose.runtime.MutableState
 import com.vitorpamplona.amethyst.model.Note
 
 abstract class Card() {
     abstract fun createdAt(): Long
+    abstract fun id(): String
 }
 
 class NoteCard(val note: Note): Card() {
     override fun createdAt(): Long {
         return note.event?.createdAt ?: 0
     }
+
+    override fun id() = note.idHex
 }
 
 class LikeSetCard(val note: Note, val likeEvents: List<Note>): Card() {
@@ -18,6 +22,8 @@ class LikeSetCard(val note: Note, val likeEvents: List<Note>): Card() {
     override fun createdAt(): Long {
         return createdAt
     }
+
+    override fun id() = note.idHex + createdAt
 }
 
 class BoostSetCard(val note: Note, val boostEvents: List<Note>): Card() {
@@ -26,11 +32,13 @@ class BoostSetCard(val note: Note, val boostEvents: List<Note>): Card() {
     override fun createdAt(): Long {
         return createdAt
     }
+
+    override fun id() = note.idHex + createdAt
 }
 
 sealed class CardFeedState {
     object Loading: CardFeedState()
-    class Loaded(val feed: List<Card>): CardFeedState()
+    class Loaded(val feed: MutableState<List<Card>>): CardFeedState()
     object Empty: CardFeedState()
     class FeedError(val errorMessage: String): CardFeedState()
 }

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

@@ -4,6 +4,7 @@ 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.LazyListState
 import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.runtime.Composable
@@ -24,14 +25,12 @@ import com.vitorpamplona.amethyst.ui.note.NoteCompose
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 
 @Composable
-fun CardFeedView(viewModel: CardFeedViewModel, accountViewModel: AccountViewModel, navController: NavController) {
+fun CardFeedView(viewModel: CardFeedViewModel, accountViewModel: AccountViewModel, navController: NavController, routeForLastRead: String) {
     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()
@@ -59,21 +58,12 @@ fun CardFeedView(viewModel: CardFeedViewModel, accountViewModel: AccountViewMode
                         }
                     }
                     is CardFeedState.Loaded -> {
-                        LazyColumn(
-                            contentPadding = PaddingValues(
-                                top = 10.dp,
-                                bottom = 10.dp
-                            ),
-                            state = listState
-                        ) {
-                            itemsIndexed(state.feed) { index, item ->
-                                when (item) {
-                                    is NoteCard -> NoteCompose(item.note, isInnerNote = false, accountViewModel = accountViewModel, navController = navController)
-                                    is LikeSetCard -> LikeSetCompose(item, isInnerNote = false, accountViewModel = accountViewModel, navController = navController)
-                                    is BoostSetCard -> BoostSetCompose(item, isInnerNote = false, accountViewModel = accountViewModel, navController = navController)
-                                }
-                            }
-                        }
+                        FeedLoaded(
+                            state,
+                            accountViewModel,
+                            navController,
+                            routeForLastRead
+                        )
                     }
                     CardFeedState.Loading -> {
                         LoadingFeed()
@@ -83,3 +73,47 @@ fun CardFeedView(viewModel: CardFeedViewModel, accountViewModel: AccountViewMode
         }
     }
 }
+
+@Composable
+private fun FeedLoaded(
+    state: CardFeedState.Loaded,
+    accountViewModel: AccountViewModel,
+    navController: NavController,
+    routeForLastRead: String
+) {
+    val listState = rememberLazyListState()
+
+    LazyColumn(
+        contentPadding = PaddingValues(
+            top = 10.dp,
+            bottom = 10.dp
+        ),
+        state = listState
+    ) {
+        itemsIndexed(state.feed.value, key = { _, item -> item.id() }) { index, item ->
+            when (item) {
+                is NoteCard -> NoteCompose(
+                    item.note,
+                    isInnerNote = false,
+                    accountViewModel = accountViewModel,
+                    navController = navController,
+                    routeForLastRead = routeForLastRead
+                )
+                is LikeSetCard -> LikeSetCompose(
+                    item,
+                    isInnerNote = false,
+                    accountViewModel = accountViewModel,
+                    navController = navController,
+                    routeForLastRead = routeForLastRead
+                )
+                is BoostSetCard -> BoostSetCompose(
+                    item,
+                    isInnerNote = false,
+                    accountViewModel = accountViewModel,
+                    navController = navController,
+                    routeForLastRead = routeForLastRead
+                )
+            }
+        }
+    }
+}

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

@@ -2,6 +2,7 @@ package com.vitorpamplona.amethyst.ui.screen
 
 import android.os.Handler
 import android.os.Looper
+import androidx.compose.runtime.mutableStateOf
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.vitorpamplona.amethyst.model.LocalCache
@@ -43,7 +44,7 @@ class CardFeedViewModel(val dataSource: NostrDataSource<Note>): ViewModel() {
             val newCards = convertToCard(notes.minus(lastNotesCopy))
             if (newCards.isNotEmpty()) {
                 lastNotes = notes
-                updateFeed((oldNotesState.feed + newCards).sortedBy { it.createdAt() }.reversed())
+                updateFeed((oldNotesState.feed.value + newCards).sortedBy { it.createdAt() }.reversed())
             }
         } else {
             val cards = convertToCard(notes)
@@ -83,14 +84,20 @@ class CardFeedViewModel(val dataSource: NostrDataSource<Note>): ViewModel() {
     fun updateFeed(notes: List<Card>) {
         val scope = CoroutineScope(Job() + Dispatchers.Main)
         scope.launch {
+            val currentState = feedContent.value
+
             if (notes.isEmpty()) {
                 _feedContent.update { CardFeedState.Empty }
+            } else if (currentState is CardFeedState.Loaded) {
+                // updates the current list
+                currentState.feed.value = notes
             } else {
-                _feedContent.update { CardFeedState.Loaded(notes) }
+                _feedContent.update { CardFeedState.Loaded(mutableStateOf(notes)) }
             }
         }
     }
 
+
     var handlerWaiting = false
     fun invalidateData() {
         synchronized(handlerWaiting) {

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

@@ -13,7 +13,7 @@ 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.compose.runtime.collectAsState
 import androidx.navigation.NavController
 import com.google.accompanist.swiperefresh.SwipeRefresh
 import com.google.accompanist.swiperefresh.rememberSwipeRefreshState
@@ -21,11 +21,10 @@ 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()
+fun ChatroomFeedView(viewModel: FeedViewModel, accountViewModel: AccountViewModel, navController: NavController, routeForLastRead: String?) {
+    val feedState by viewModel.feedContent.collectAsState()
 
     var isRefreshing by remember { mutableStateOf(false) }
-    val swipeRefreshState = rememberSwipeRefreshState(isRefreshing)
 
     val listState = rememberLazyListState()
 
@@ -36,46 +35,36 @@ fun ChatroomFeedView(viewModel: FeedViewModel, accountViewModel: AccountViewMode
         }
     }
 
-    SwipeRefresh(
-        state = swipeRefreshState,
-        onRefresh = {
-            isRefreshing = true
-        },
-    ) {
-        Column() {
-            Crossfade(targetState = feedState) { state ->
-                when (state) {
-                    is FeedState.Empty -> {
-                        FeedEmpty {
-                            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
+                        ),
+                        reverseLayout = true,
+                        state = listState
+                    ) {
+                        var previousDate: String = ""
+                        itemsIndexed(state.feed.value, key = { index, item -> if (index == 0) index else item.idHex }) { index, item ->
+                            ChatroomMessageCompose(item, routeForLastRead, accountViewModel = accountViewModel, navController = navController)
                         }
                     }
-                    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()
-                    }
+                }
+                FeedState.Loading -> {
+                    LoadingFeed()
                 }
             }
         }

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

@@ -4,13 +4,16 @@ 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.LazyListState
 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.derivedStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
@@ -19,6 +22,8 @@ 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
+import kotlinx.coroutines.coroutineScope
+import kotlinx.coroutines.launch
 
 @Composable
 fun ChatroomListFeedView(viewModel: FeedViewModel, accountViewModel: AccountViewModel, navController: NavController) {
@@ -27,7 +32,7 @@ fun ChatroomListFeedView(viewModel: FeedViewModel, accountViewModel: AccountView
     var isRefreshing by remember { mutableStateOf(false) }
     val swipeRefreshState = rememberSwipeRefreshState(isRefreshing)
 
-    val listState = rememberLazyListState()
+    val coroutineScope = rememberCoroutineScope()
 
     LaunchedEffect(isRefreshing) {
         if (isRefreshing) {
@@ -56,17 +61,7 @@ fun ChatroomListFeedView(viewModel: FeedViewModel, accountViewModel: AccountView
                         }
                     }
                     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)
-                            }
-                        }
+                        FeedLoaded(state, accountViewModel, navController)
                     }
                     FeedState.Loading -> {
                         LoadingFeed()
@@ -76,3 +71,28 @@ fun ChatroomListFeedView(viewModel: FeedViewModel, accountViewModel: AccountView
         }
     }
 }
+
+@Composable
+private fun FeedLoaded(
+    state: FeedState.Loaded,
+    accountViewModel: AccountViewModel,
+    navController: NavController
+) {
+    val listState = rememberLazyListState()
+
+    LazyColumn(
+        contentPadding = PaddingValues(
+            top = 10.dp,
+            bottom = 10.dp
+        ),
+        state = listState
+    ) {
+        itemsIndexed(state.feed.value, key = { index, item -> item.idHex }) { index, item ->
+            ChatroomCompose(
+                item,
+                accountViewModel = accountViewModel,
+                navController = navController
+            )
+        }
+    }
+}

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

@@ -1,11 +1,12 @@
 package com.vitorpamplona.amethyst.ui.screen
 
+import androidx.compose.runtime.MutableState
 import com.vitorpamplona.amethyst.model.Note
 
 
 sealed class FeedState {
     object Loading : FeedState()
-    class Loaded(val feed: List<Note>) : FeedState()
+    class Loaded(val feed: MutableState<List<Note>>) : FeedState()
     object Empty : FeedState()
     class FeedError(val errorMessage: String) : FeedState()
 }

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

@@ -7,6 +7,7 @@ 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.LazyListState
 import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.material.Button
@@ -21,23 +22,25 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.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.NotificationCache
+import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.ui.navigation.Route
 import com.vitorpamplona.amethyst.ui.note.NoteCompose
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 
 @Composable
-fun FeedView(viewModel: FeedViewModel, accountViewModel: AccountViewModel, navController: NavController) {
+fun FeedView(viewModel: FeedViewModel, accountViewModel: AccountViewModel, navController: NavController, routeForLastRead: String?) {
     val feedState by viewModel.feedContent.collectAsState()
 
     var isRefreshing by remember { mutableStateOf(false) }
     val swipeRefreshState = rememberSwipeRefreshState(isRefreshing)
 
-    val listState = rememberLazyListState()
-
     LaunchedEffect(isRefreshing) {
         if (isRefreshing) {
             viewModel.hardRefresh()
@@ -51,6 +54,7 @@ fun FeedView(viewModel: FeedViewModel, accountViewModel: AccountViewModel, navCo
             isRefreshing = true
         },
     ) {
+
         Column() {
             Crossfade(targetState = feedState) { state ->
                 when (state) {
@@ -65,17 +69,12 @@ fun FeedView(viewModel: FeedViewModel, accountViewModel: AccountViewModel, navCo
                         }
                     }
                     is FeedState.Loaded -> {
-                        LazyColumn(
-                            contentPadding = PaddingValues(
-                                top = 10.dp,
-                                bottom = 10.dp
-                            ),
-                            state = listState
-                        ) {
-                            itemsIndexed(state.feed, key = { _, item -> item.idHex }) { index, item ->
-                                NoteCompose(item, isInnerNote = false, accountViewModel = accountViewModel, navController = navController)
-                            }
-                        }
+                        FeedLoaded(
+                            state,
+                            routeForLastRead,
+                            accountViewModel,
+                            navController
+                        )
                     }
                     FeedState.Loading -> {
                         LoadingFeed()
@@ -86,6 +85,34 @@ fun FeedView(viewModel: FeedViewModel, accountViewModel: AccountViewModel, navCo
     }
 }
 
+@Composable
+private fun FeedLoaded(
+    state: FeedState.Loaded,
+    routeForLastRead: String?,
+    accountViewModel: AccountViewModel,
+    navController: NavController
+) {
+    val listState = rememberLazyListState()
+
+    LazyColumn(
+        contentPadding = PaddingValues(
+            top = 10.dp,
+            bottom = 10.dp
+        ),
+        state = listState
+    ) {
+        itemsIndexed(state.feed.value, key = { _, item -> item.idHex }) { index, item ->
+            NoteCompose(
+                item,
+                isInnerNote = false,
+                routeForLastRead = routeForLastRead,
+                accountViewModel = accountViewModel,
+                navController = navController
+            )
+        }
+    }
+}
+
 @Composable
 fun LoadingFeed() {
     Column(

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

@@ -1,6 +1,8 @@
 package com.vitorpamplona.amethyst.ui.screen
 
 import android.util.Log
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.vitorpamplona.amethyst.model.LocalCache
@@ -14,6 +16,7 @@ import com.vitorpamplona.amethyst.service.NostrGlobalDataSource
 import com.vitorpamplona.amethyst.service.NostrHomeDataSource
 import com.vitorpamplona.amethyst.service.NostrThreadDataSource
 import com.vitorpamplona.amethyst.service.NostrUserProfileDataSource
+import com.vitorpamplona.amethyst.service.model.RepostEvent
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
@@ -24,10 +27,10 @@ import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
+import nostr.postr.events.TextNoteEvent
 
 class NostrChannelFeedViewModel: FeedViewModel(NostrChannelDataSource)
 class NostrChatRoomFeedViewModel: FeedViewModel(NostrChatRoomDataSource)
-class NostrHomeFeedViewModel: FeedViewModel(NostrHomeDataSource)
 class NostrGlobalFeedViewModel: FeedViewModel(NostrGlobalDataSource)
 class NostrThreadFeedViewModel: FeedViewModel(NostrThreadDataSource)
 class NostrUserProfileFeedViewModel: FeedViewModel(NostrUserProfileDataSource)
@@ -37,7 +40,7 @@ class NostrChatroomListKnownFeedViewModel: FeedViewModel(NostrChatroomListDataSo
         // 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
+            it.channel != null || me.hasSentMessagesTo(it.author)
         }
     }
 }
@@ -46,11 +49,23 @@ class NostrChatroomListNewFeedViewModel: FeedViewModel(NostrChatroomListDataSour
         // 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
+            it.channel == null && !me.hasSentMessagesTo(it.author)
         }
     }
 }
 
+class NostrHomeFeedViewModel: FeedViewModel(NostrHomeDataSource) {
+    override fun newListFromDataSource(): List<Note> {
+        // Filter: no replies
+        return dataSource.feed().filter {
+            it.event is RepostEvent || it.replyTo == null || it.replyTo?.size == 0
+        }.take(100)
+    }
+}
+
+class NostrHomeRepliesFeedViewModel: FeedViewModel(NostrHomeDataSource) {}
+
+
 abstract class FeedViewModel(val dataSource: NostrDataSource<Note>): ViewModel() {
     private val _feedContent = MutableStateFlow<FeedState>(FeedState.Loading)
     val feedContent = _feedContent.asStateFlow()
@@ -83,10 +98,15 @@ abstract class FeedViewModel(val dataSource: NostrDataSource<Note>): ViewModel()
     }
 
     fun updateFeed(notes: List<Note>) {
+        val currentState = feedContent.value
+
         if (notes.isEmpty()) {
             _feedContent.update { FeedState.Empty }
+        } else if (currentState is FeedState.Loaded) {
+            // updates the current list
+            currentState.feed.value = notes
         } else {
-            _feedContent.update { FeedState.Loaded(notes) }
+            _feedContent.update { FeedState.Loaded(mutableStateOf(notes)) }
         }
     }
 

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

@@ -1,15 +1,15 @@
 package com.vitorpamplona.amethyst.ui.screen
 
 import androidx.lifecycle.LiveData
-import androidx.lifecycle.Transformations
 import androidx.lifecycle.ViewModel
+import androidx.lifecycle.map
 import com.vitorpamplona.amethyst.service.relays.RelayPool
 
 class RelayPoolViewModel: ViewModel() {
-  val connectedRelaysLiveData: LiveData<Int> = Transformations.map(RelayPool.live) {
+  val connectedRelaysLiveData: LiveData<Int> = RelayPool.live.map {
     it.relays.connectedRelays()
   }
-  val availableRelaysLiveData: LiveData<Int> = Transformations.map(RelayPool.live) {
+  val availableRelaysLiveData: LiveData<Int> = RelayPool.live.map {
     it.relays.availableRelays()
   }
 }

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

@@ -30,7 +30,7 @@ import androidx.compose.ui.draw.drawBehind
 import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
-import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import androidx.compose.runtime.collectAsState
 import androidx.navigation.NavController
 import coil.compose.AsyncImage
 import coil.compose.rememberAsyncImagePainter
@@ -40,14 +40,15 @@ 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.ReactionsRow
+import com.vitorpamplona.amethyst.ui.note.UserPicture
 import com.vitorpamplona.amethyst.ui.note.UsernameDisplay
 import com.vitorpamplona.amethyst.ui.note.timeAgoLong
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 
 @Composable
 fun ThreadFeedView(noteId: String, 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)
@@ -87,9 +88,9 @@ fun ThreadFeedView(noteId: String, viewModel: FeedViewModel, accountViewModel: A
                             listState.animateScrollToItem(noteIdPositionInThread, 0)
                         }
 
-                        val notePosition = state.feed.filter { it.idHex == noteId}.firstOrNull()
+                        val notePosition = state.feed.value.filter { it.idHex == noteId}.firstOrNull()
                         if (notePosition != null) {
-                            noteIdPositionInThread = state.feed.indexOf(notePosition)
+                            noteIdPositionInThread = state.feed.value.indexOf(notePosition)
                         }
 
                         LazyColumn(
@@ -99,7 +100,7 @@ fun ThreadFeedView(noteId: String, viewModel: FeedViewModel, accountViewModel: A
                             ),
                             state = listState
                         ) {
-                            itemsIndexed(state.feed, key = { _, item -> item.idHex }) { index, item ->
+                            itemsIndexed(state.feed.value, key = { _, item -> item.idHex }) { index, item ->
                                 if (index == 0)
                                     NoteMaster(item, accountViewModel = accountViewModel, navController = navController)
                                 else {
@@ -107,7 +108,7 @@ fun ThreadFeedView(noteId: String, viewModel: FeedViewModel, accountViewModel: A
                                         Row() {
                                             NoteCompose(
                                                 item,
-                                                Modifier.drawReplyLevel(item.replyLevel(), MaterialTheme.colors.onSurface.copy(alpha = 0.32f)),
+                                                modifier = Modifier.drawReplyLevel(item.replyLevel(), MaterialTheme.colors.onSurface.copy(alpha = 0.32f)),
                                                 isInnerNote = false,
                                                 accountViewModel = accountViewModel,
                                                 navController = navController,
@@ -156,6 +157,9 @@ fun NoteMaster(baseNote: Note, accountViewModel: AccountViewModel, navController
     val noteState by baseNote.live.observeAsState()
     val note = noteState?.note
 
+    val accountState by accountViewModel.accountLiveData.observeAsState()
+    val account = accountState?.account ?: return
+
     if (note?.event == null) {
         BlankNote()
     } else {
@@ -174,15 +178,7 @@ fun NoteMaster(baseNote: Note, accountViewModel: AccountViewModel, navController
                     }
                 })
             ) {
-                // Draws the boosted picture outside the boosted card.
-                AsyncImage(
-                    model = author?.profilePicture(),
-                    placeholder = rememberAsyncImagePainter("https://robohash.org/${author?.pubkeyHex}.png"),
-                    contentDescription = "Profile Image",
-                    modifier = Modifier
-                        .width(55.dp).height(55.dp)
-                        .clip(shape = CircleShape)
-                )
+                UserPicture(user = author, navController, userAccount = account.userProfile(), size = 55.dp)
 
                 Column(modifier = Modifier.padding(start = 10.dp)) {
                     Row(verticalAlignment = Alignment.CenterVertically) {
@@ -203,9 +199,9 @@ fun NoteMaster(baseNote: Note, accountViewModel: AccountViewModel, navController
                 Column() {
                     val eventContent = note.event?.content
                     if (eventContent != null)
-                        RichTextViewer(eventContent, note.event?.tags, note, accountViewModel, navController)
+                        RichTextViewer(eventContent, note.event?.tags, navController)
 
-                    ReactionsRowState(note, accountViewModel)
+                    ReactionsRow(note, accountViewModel)
 
                     Divider(
                         modifier = Modifier.padding(top = 10.dp),

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

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

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

@@ -4,6 +4,7 @@ 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.LazyListState
 import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.runtime.Composable
@@ -28,8 +29,6 @@ fun UserFeedView(viewModel: UserFeedViewModel, accountViewModel: AccountViewMode
     var isRefreshing by remember { mutableStateOf(false) }
     val swipeRefreshState = rememberSwipeRefreshState(isRefreshing)
 
-    val listState = rememberLazyListState()
-
     LaunchedEffect(isRefreshing) {
         if (isRefreshing) {
             viewModel.refresh()
@@ -57,17 +56,7 @@ fun UserFeedView(viewModel: UserFeedViewModel, accountViewModel: AccountViewMode
                         }
                     }
                     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)
-                            }
-                        }
+                        FeedLoaded(state, accountViewModel, navController)
                     }
                     UserFeedState.Loading -> {
                         LoadingFeed()
@@ -77,3 +66,24 @@ fun UserFeedView(viewModel: UserFeedViewModel, accountViewModel: AccountViewMode
         }
     }
 }
+
+@Composable
+private fun FeedLoaded(
+    state: UserFeedState.Loaded,
+    accountViewModel: AccountViewModel,
+    navController: NavController
+) {
+    val listState = rememberLazyListState()
+
+    LazyColumn(
+        contentPadding = PaddingValues(
+            top = 10.dp,
+            bottom = 10.dp
+        ),
+        state = listState
+    ) {
+        itemsIndexed(state.feed.value, key = { _, item -> item.pubkeyHex }) { index, item ->
+            UserCompose(item, accountViewModel = accountViewModel, navController = navController)
+        }
+    }
+}

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

@@ -2,12 +2,15 @@ package com.vitorpamplona.amethyst.ui.screen
 
 import android.os.Handler
 import android.os.Looper
+import androidx.compose.runtime.mutableStateOf
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.LocalCacheState
+import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.model.User
 import com.vitorpamplona.amethyst.service.NostrDataSource
+import com.vitorpamplona.amethyst.service.NostrHiddenAccountsDataSource
 import com.vitorpamplona.amethyst.service.NostrUserProfileFollowersDataSource
 import com.vitorpamplona.amethyst.service.NostrUserProfileFollowsDataSource
 import kotlinx.coroutines.CoroutineScope
@@ -28,6 +31,10 @@ class NostrUserProfileFollowersUserFeedViewModel(): UserFeedViewModel(
     NostrUserProfileFollowersDataSource
 )
 
+class NostrHiddenAccountsFeedViewModel(): UserFeedViewModel(
+    NostrHiddenAccountsDataSource
+)
+
 open class UserFeedViewModel(val dataSource: NostrDataSource<User>): ViewModel() {
     private val _feedContent = MutableStateFlow<UserFeedState>(UserFeedState.Loading)
     val feedContent = _feedContent.asStateFlow()
@@ -55,10 +62,15 @@ open class UserFeedViewModel(val dataSource: NostrDataSource<User>): ViewModel()
     fun updateFeed(notes: List<User>) {
         val scope = CoroutineScope(Job() + Dispatchers.Main)
         scope.launch {
+            val currentState = feedContent.value
+
             if (notes.isEmpty()) {
                 _feedContent.update { UserFeedState.Empty }
+            } else if (currentState is UserFeedState.Loaded) {
+                // updates the current list
+                currentState.feed.value = notes
             } else {
-                _feedContent.update { UserFeedState.Loaded(notes) }
+                _feedContent.update { UserFeedState.Loaded(mutableStateOf(notes)) }
             }
         }
     }

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

@@ -1,20 +1,26 @@
 package com.vitorpamplona.amethyst.ui.screen.loggedIn
 
+import android.content.Context
 import androidx.lifecycle.LiveData
-import androidx.lifecycle.Transformations
 import androidx.lifecycle.ViewModel
+import androidx.lifecycle.map
+import com.vitorpamplona.amethyst.LocalPreferences
 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.model.User
 
 class AccountViewModel(private val account: Account): ViewModel() {
-  val accountLiveData: LiveData<AccountState> = Transformations.map(account.live) { it }
+  val accountLiveData: LiveData<AccountState> = account.live.map { it }
 
   fun reactTo(note: Note) {
     account.reactTo(note)
   }
 
+  fun report(note: Note) {
+    account.report(note)
+  }
+
   fun boost(note: Note) {
     account.boost(note)
   }
@@ -26,4 +32,14 @@ class AccountViewModel(private val account: Account): ViewModel() {
   fun decrypt(note: Note): String? {
     return account.decryptContent(note)
   }
+
+  fun hide(user: User, ctx: Context) {
+    account.hideUser(user.pubkeyHex)
+    LocalPreferences(ctx).saveToEncryptedStorage(account)
+  }
+
+  fun show(user: User, ctx: Context) {
+    account.showUser(user.pubkeyHex)
+    LocalPreferences(ctx).saveToEncryptedStorage(account)
+  }
 }

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

@@ -14,9 +14,16 @@ 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.Icon
+import androidx.compose.material.LocalTextStyle
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Text
 import androidx.compose.material.TextField
+import androidx.compose.material.TextFieldDefaults
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Download
+import androidx.compose.material.icons.filled.EditNote
+import androidx.compose.material.icons.filled.Share
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
@@ -30,10 +37,13 @@ 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.platform.LocalContext
 import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.TextStyle
 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.TextDirection
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
@@ -41,6 +51,7 @@ import androidx.lifecycle.viewmodel.compose.viewModel
 import androidx.navigation.NavController
 import coil.compose.AsyncImage
 import coil.compose.rememberAsyncImagePainter
+import com.vitorpamplona.amethyst.LocalPreferences
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.Channel
 import com.vitorpamplona.amethyst.model.Note
@@ -84,7 +95,7 @@ fun ChannelScreen(channelId: String?, accountViewModel: AccountViewModel, accoun
                     .padding(vertical = 0.dp)
                     .weight(1f, true)
             ) {
-                ChatroomFeedView(feedViewModel, accountViewModel, navController)
+                ChatroomFeedView(feedViewModel, accountViewModel, navController, "Channel/${channelId}")
             }
 
             //LAST ROW
@@ -100,6 +111,7 @@ fun ChannelScreen(channelId: String?, accountViewModel: AccountViewModel, accoun
                     keyboardOptions = KeyboardOptions.Default.copy(
                         capitalization = KeyboardCapitalization.Sentences
                     ),
+                    shape = RoundedCornerShape(25.dp),
                     modifier = Modifier
                         .weight(1f, true)
                         .padding(end = 10.dp),
@@ -109,16 +121,21 @@ fun ChannelScreen(channelId: String?, accountViewModel: AccountViewModel, accoun
                             color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
                         )
                     },
+                    textStyle = LocalTextStyle.current.copy(textDirection = TextDirection.Content),
                     trailingIcon = {
                         PostButton(
                             onPost = {
-                                account.sendChannelMeesage(newPost.value.text, channel.idHex)
+                                account.sendChannelMeesage(newPost.value.text, channel.idHex, null, null)
                                 newPost.value = TextFieldValue("")
                             },
                             newPost.value.text.isNotBlank(),
                             modifier = Modifier.padding(end = 10.dp)
                         )
-                    }
+                    },
+                    colors = TextFieldDefaults.textFieldColors(
+                        focusedIndicatorColor = Color.Transparent,
+                        unfocusedIndicatorColor = Color.Transparent
+                    )
                 )
             }
         }
@@ -165,16 +182,18 @@ fun ChannelHeader(baseChannel: Channel, account: Account, accountStateViewModel:
                     }
                 }
 
-                channel?.let { NoteCopyButton(it) }
+                Row(modifier = Modifier.height(35.dp).padding(bottom = 3.dp)) {
+                    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)
+                    channel?.let {
+                        if (channel.creator == account.userProfile()) {
+                            EditButton(account, it)
                         } else {
-                            JoinButton(account,channel,accountStateViewModel, navController)
+                            if (account.followingChannels.contains(channel.idHex)) {
+                                LeaveButton(account, channel, navController)
+                            } else {
+                                JoinButton(account, channel, navController)
+                            }
                         }
                     }
                 }
@@ -196,7 +215,7 @@ private fun NoteCopyButton(
     val clipboardManager = LocalClipboardManager.current
 
     Button(
-        modifier = Modifier.padding(horizontal = 3.dp),
+        modifier = Modifier.padding(horizontal = 3.dp).width(50.dp),
         onClick = { clipboardManager.setText(AnnotatedString(note.id.toNote())) },
         shape = RoundedCornerShape(20.dp),
         colors = ButtonDefaults
@@ -204,21 +223,25 @@ private fun NoteCopyButton(
                 backgroundColor = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
             ),
     ) {
-        Text(text = "note", color = Color.White)
+        Icon(
+            tint = Color.White,
+            imageVector = Icons.Default.Share,
+            contentDescription = "Copies the Note ID to the clipboard for sharing"
+        )
     }
 }
 
 @Composable
-private fun EditButton(account: Account, channel: Channel, accountStateViewModel: AccountStateViewModel) {
+private fun EditButton(account: Account, channel: Channel) {
     var wantsToPost by remember {
         mutableStateOf(false)
     }
 
     if (wantsToPost)
-        NewChannelView({ wantsToPost = false }, account = account, accountStateViewModel, channel)
+        NewChannelView({ wantsToPost = false }, account = account, channel)
 
     Button(
-        modifier = Modifier.padding(horizontal = 3.dp),
+        modifier = Modifier.padding(horizontal = 3.dp).width(50.dp),
         onClick = { wantsToPost = true },
         shape = RoundedCornerShape(20.dp),
         colors = ButtonDefaults
@@ -226,16 +249,23 @@ private fun EditButton(account: Account, channel: Channel, accountStateViewModel
                 backgroundColor = MaterialTheme.colors.primary
             )
     ) {
-        Text(text = "Edit", color = Color.White)
+        Icon(
+            tint = Color.White,
+            imageVector = Icons.Default.EditNote,
+            contentDescription = "Edits the Channel Metadata"
+        )
     }
 }
 
 @Composable
-private fun JoinButton(account: Account, channel: Channel, accountStateViewModel: AccountStateViewModel, navController: NavController) {
+private fun JoinButton(account: Account, channel: Channel, navController: NavController) {
+    val context = LocalContext.current.applicationContext
+
     Button(
         modifier = Modifier.padding(horizontal = 3.dp),
         onClick = {
-            account.joinChannel(channel.idHex, accountStateViewModel)
+            account.joinChannel(channel.idHex)
+            LocalPreferences(context).saveToEncryptedStorage(account)
             navController.navigate(Route.Message.route)
         },
         shape = RoundedCornerShape(20.dp),
@@ -249,11 +279,14 @@ private fun JoinButton(account: Account, channel: Channel, accountStateViewModel
 }
 
 @Composable
-private fun LeaveButton(account: Account, channel: Channel, accountStateViewModel: AccountStateViewModel, navController: NavController) {
+private fun LeaveButton(account: Account, channel: Channel, navController: NavController) {
+    val context = LocalContext.current.applicationContext
+
     Button(
         modifier = Modifier.padding(horizontal = 3.dp),
         onClick = {
-            account.leaveChannel(channel.idHex, accountStateViewModel)
+            account.leaveChannel(channel.idHex)
+            LocalPreferences(context).saveToEncryptedStorage(account)
             navController.navigate(Route.Message.route)
         },
         shape = RoundedCornerShape(20.dp),

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

@@ -10,11 +10,14 @@ 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.Divider
+import androidx.compose.material.LocalTextStyle
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Text
 import androidx.compose.material.TextField
+import androidx.compose.material.TextFieldDefaults
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
@@ -24,9 +27,13 @@ import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.input.KeyboardCapitalization
 import androidx.compose.ui.text.input.TextFieldValue
+import androidx.compose.ui.text.style.TextDirection
 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
@@ -65,7 +72,7 @@ fun ChatroomScreen(userId: String?, accountViewModel: AccountViewModel, navContr
             Column(
                 modifier = Modifier.fillMaxHeight().padding(vertical = 0.dp).weight(1f, true)
             ) {
-                ChatroomFeedView(feedViewModel, accountViewModel, navController)
+                ChatroomFeedView(feedViewModel, accountViewModel, navController, "Room/${userId}")
             }
 
             //LAST ROW
@@ -80,12 +87,14 @@ fun ChatroomScreen(userId: String?, accountViewModel: AccountViewModel, navContr
                         capitalization = KeyboardCapitalization.Sentences
                     ),
                     modifier = Modifier.weight(1f, true),
+                    shape = RoundedCornerShape(25.dp),
                     placeholder = {
                         Text(
                             text = "reply here.. ",
                             color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
                         )
                     },
+                    textStyle = LocalTextStyle.current.copy(textDirection = TextDirection.Content),
                     trailingIcon = {
                         PostButton(
                             onPost = {
@@ -95,7 +104,11 @@ fun ChatroomScreen(userId: String?, accountViewModel: AccountViewModel, navContr
                             newPost.value.text.isNotBlank(),
                             modifier = Modifier.padding(end = 10.dp)
                         )
-                    }
+                    },
+                    colors = TextFieldDefaults.textFieldColors(
+                        focusedIndicatorColor = Color.Transparent,
+                        unfocusedIndicatorColor = Color.Transparent
+                    )
                 )
             }
         }

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

@@ -0,0 +1,70 @@
+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.DisposableEffect
+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.service.NostrHiddenAccountsDataSource
+import com.vitorpamplona.amethyst.service.NostrThreadDataSource
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
+import kotlinx.coroutines.launch
+
+@OptIn(ExperimentalPagerApi::class)
+@Composable
+fun FiltersScreen(accountViewModel: AccountViewModel, navController: NavController) {
+    val accountState by accountViewModel.accountLiveData.observeAsState()
+    val account = accountState?.account
+
+    if (account != null) {
+        NostrHiddenAccountsDataSource.account = account
+
+        val feedViewModel: NostrHiddenAccountsFeedViewModel = viewModel()
+
+        Column(Modifier.fillMaxHeight()) {
+            Column(modifier = Modifier.padding(start = 10.dp, end = 10.dp)) {
+                val pagerState = rememberPagerState()
+                val coroutineScope = rememberCoroutineScope()
+
+                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 = "Blocked Users")
+                        }
+                    )
+                }
+                HorizontalPager(count = 1, state = pagerState) {
+                    when (pagerState.currentPage) {
+                        0 -> UserFeedView(feedViewModel, accountViewModel, navController)
+                    }
+                }
+            }
+        }
+    }
+}

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

@@ -3,26 +3,46 @@ 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.DisposableEffect
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.livedata.observeAsState
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
 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.NotificationCache
 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.navigation.Route
+import com.vitorpamplona.amethyst.ui.navigation.Routes
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import java.lang.System.currentTimeMillis
+import kotlinx.coroutines.launch
 
+@OptIn(ExperimentalPagerApi::class)
 @Composable
 fun HomeScreen(accountViewModel: AccountViewModel, navController: NavController) {
     val feedViewModel: NostrHomeFeedViewModel = viewModel()
+    val feedViewModelReplies: NostrHomeRepliesFeedViewModel = viewModel()
+
+    val pagerState = rememberPagerState()
+    val coroutineScope = rememberCoroutineScope()
 
     LaunchedEffect(Unit) {
         feedViewModel.refresh()
@@ -32,7 +52,37 @@ fun HomeScreen(accountViewModel: AccountViewModel, navController: NavController)
         Column(
             modifier = Modifier.padding(vertical = 0.dp)
         ) {
-            FeedView(feedViewModel, accountViewModel, navController)
+            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 = "Follows")
+                    }
+                )
+
+                Tab(
+                    selected = pagerState.currentPage == 1,
+                    onClick = { coroutineScope.launch { pagerState.animateScrollToPage(1) } },
+                    text = {
+                        Text(text = "Follows + Replies")
+                    }
+                )
+            }
+            HorizontalPager(count = 2, state = pagerState) {
+                when (pagerState.currentPage) {
+                    0 -> FeedView(feedViewModel, accountViewModel, navController, Route.Home.route + "Follows")
+                    1 -> FeedView(feedViewModelReplies, accountViewModel, navController, Route.Home.route + "FollowsReplies")
+                }
+            }
         }
     }
 }

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

@@ -11,6 +11,7 @@ import androidx.compose.material.Scaffold
 import androidx.compose.material.rememberDrawerState
 import androidx.compose.material.rememberScaffoldState
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
@@ -27,7 +28,7 @@ import com.vitorpamplona.amethyst.ui.navigation.currentRoute
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 
 @Composable
-fun MainScreen(accountViewModel: AccountViewModel, accountStateViewModel: AccountStateViewModel) {
+fun MainScreen(accountViewModel: AccountViewModel, accountStateViewModel: AccountStateViewModel, startingPage: String? = null) {
     val navController = rememberNavController()
     val scaffoldState = rememberScaffoldState(rememberDrawerState(DrawerValue.Closed))
 
@@ -50,14 +51,14 @@ fun MainScreen(accountViewModel: AccountViewModel, accountStateViewModel: Accoun
         scaffoldState = scaffoldState
     ) {
         Column(modifier = Modifier.padding(bottom = it.calculateBottomPadding())) {
-            AppNavigation(navController, accountViewModel, accountStateViewModel)
+            AppNavigation(navController, accountViewModel, accountStateViewModel, startingPage)
         }
     }
 }
 
 @Composable
 fun FloatingButton(navController: NavHostController, accountViewModel: AccountStateViewModel) {
-    val accountState by accountViewModel.accountContent.collectAsStateWithLifecycle()
+    val accountState by accountViewModel.accountContent.collectAsState()
 
     if (currentRoute(navController) == Route.Home.route) {
         Crossfade(targetState = accountState) { state ->
@@ -85,7 +86,7 @@ fun FloatingButton(navController: NavHostController, accountViewModel: AccountSt
                     // Does nothing.
                 }
                 is AccountState.LoggedIn -> {
-                    NewChannelButton(state.account, accountViewModel)
+                    NewChannelButton(state.account)
                 }
             }
         }

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

@@ -12,6 +12,7 @@ import androidx.compose.ui.unit.dp
 import androidx.lifecycle.viewmodel.compose.viewModel
 import androidx.navigation.NavController
 import com.vitorpamplona.amethyst.service.NostrNotificationDataSource
+import com.vitorpamplona.amethyst.ui.navigation.Route
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 
 @Composable
@@ -26,7 +27,7 @@ fun NotificationScreen(accountViewModel: AccountViewModel, navController: NavCon
         Column(
             modifier = Modifier.padding(vertical = 0.dp)
         ) {
-            CardFeedView(feedViewModel, accountViewModel = accountViewModel, navController)
+            CardFeedView(feedViewModel, accountViewModel = accountViewModel, navController, Route.Notification.route)
         }
     }
 }

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

@@ -1,5 +1,6 @@
 package com.vitorpamplona.amethyst.ui.screen
 
+import android.content.Context
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
@@ -26,6 +27,10 @@ import androidx.compose.material.Tab
 import androidx.compose.material.TabRow
 import androidx.compose.material.TabRowDefaults
 import androidx.compose.material.Text
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.EditNote
+import androidx.compose.material.icons.filled.Password
+import androidx.compose.material.icons.filled.Share
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.getValue
@@ -41,9 +46,11 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.ClipboardManager
 import androidx.compose.ui.platform.LocalClipboardManager
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.lifecycle.viewmodel.compose.viewModel
@@ -54,6 +61,7 @@ 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.LocalPreferences
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.Note
@@ -64,9 +72,11 @@ import com.vitorpamplona.amethyst.service.NostrUserProfileFollowersDataSource
 import com.vitorpamplona.amethyst.service.NostrUserProfileFollowsDataSource
 import com.vitorpamplona.amethyst.ui.actions.NewChannelView
 import com.vitorpamplona.amethyst.ui.actions.NewUserMetadataView
+import com.vitorpamplona.amethyst.ui.note.UserPicture
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import kotlinx.coroutines.launch
 import nostr.postr.toNpub
+import nostr.postr.toNsec
 
 @OptIn(ExperimentalPagerApi::class)
 @Composable
@@ -77,6 +87,8 @@ fun ProfileScreen(userId: String?, accountViewModel: AccountViewModel, navContro
     val accountUserState by account.userProfile().live.observeAsState()
     val accountUser = accountUserState?.user
 
+    val ctx = LocalContext.current.applicationContext
+
     if (userId != null && accountUser != null) {
         DisposableEffect(account) {
             NostrUserProfileDataSource.loadUserProfile(userId)
@@ -100,80 +112,7 @@ fun ProfileScreen(userId: String?, accountViewModel: AccountViewModel, navContro
             color = MaterialTheme.colors.background
         ) {
             Column() {
-                Box {
-                    val banner = user.info.banner
-                    if (banner != null && banner.isNotBlank()) {
-                        AsyncImage(
-                            model = banner,
-                            contentDescription = "Profile Image",
-                            contentScale = ContentScale.FillWidth,
-                            modifier = Modifier
-                                .fillMaxWidth()
-                                .height(125.dp)
-                        )
-                    } else {
-                        Image(
-                            painter = painterResource(R.drawable.profile_banner),
-                            contentDescription = "Profile Banner",
-                            contentScale = ContentScale.FillWidth,
-                            modifier = Modifier
-                                .fillMaxWidth()
-                                .height(125.dp)
-                        )
-                    }
-
-                    Column(modifier = Modifier
-                        .fillMaxWidth()
-                        .padding(horizontal = 10.dp)
-                        .padding(top = 75.dp)) {
-
-                        Row(horizontalArrangement = Arrangement.SpaceBetween,
-                            verticalAlignment = Alignment.Bottom) {
-                            AsyncImage(
-                                model = user.profilePicture(),
-                                placeholder = rememberAsyncImagePainter("https://robohash.org/${user?.pubkeyHex}.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)
-                            )
-
-                            Spacer(Modifier.weight(1f))
-
-                            MessageButton(user, navController)
-
-                            NPubCopyButton(user)
-
-                            if (accountUser == user) {
-                                EditButton(account)
-                            } else {
-                                if (accountUser.isFollowing(user)) {
-                                    UnfollowButton { account.unfollow(user) }
-                                } else {
-                                    FollowButton { account.follow(user) }
-                                }
-                            }
-                        }
-
-                        Text(
-                            user.bestDisplayName() ?: "",
-                            modifier = Modifier.padding(top = 7.dp),
-                            fontWeight = FontWeight.Bold,
-                            fontSize = 25.sp
-                        )
-                        Text(" @${user.bestUsername()}", color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f))
-                        Text(
-                            "${user.info.about}",
-                            color = MaterialTheme.colors.onSurface,
-                            modifier = Modifier.padding(top = 5.dp, bottom = 5.dp)
-                        )
-
-                        Divider(modifier = Modifier.padding(top = 6.dp))
-                    }
-                }
+                ProfileHeader(user, navController, account, accountUser, ctx)
 
                 val pagerState = rememberPagerState()
                 val coroutineScope = rememberCoroutineScope()
@@ -225,6 +164,108 @@ fun ProfileScreen(userId: String?, accountViewModel: AccountViewModel, navContro
     }
 }
 
+@Composable
+private fun ProfileHeader(
+    user: User,
+    navController: NavController,
+    account: Account,
+    accountUser: User,
+    ctx: Context
+) {
+    Box {
+        val banner = user.info.banner
+        if (banner != null && banner.isNotBlank()) {
+            AsyncImage(
+                model = banner,
+                contentDescription = "Profile Image",
+                contentScale = ContentScale.FillWidth,
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .height(125.dp)
+            )
+        } else {
+            Image(
+                painter = painterResource(R.drawable.profile_banner),
+                contentDescription = "Profile Banner",
+                contentScale = ContentScale.FillWidth,
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .height(125.dp)
+            )
+        }
+
+        Column(
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(horizontal = 10.dp)
+                .padding(top = 75.dp)
+        ) {
+
+            Row(
+                horizontalArrangement = Arrangement.SpaceBetween,
+                verticalAlignment = Alignment.Bottom
+            ) {
+
+                UserPicture(
+                    user, navController, account.userProfile(), 100.dp,
+                    pictureModifier = Modifier.border(
+                        3.dp,
+                        MaterialTheme.colors.background,
+                        CircleShape
+                    )
+                )
+
+                Spacer(Modifier.weight(1f))
+
+                Row(modifier = Modifier
+                    .height(35.dp)
+                    .padding(bottom = 3.dp)) {
+                    MessageButton(user, navController)
+
+                    if (accountUser == user && account.isWriteable()) {
+                        NSecCopyButton(account)
+                    }
+
+                    NPubCopyButton(user)
+
+                    if (accountUser == user) {
+                        EditButton(account)
+                    } else {
+                        if (account?.isAcceptable(user) == false) {
+                            ShowUserButton {
+                                account.showUser(user.pubkeyHex)
+                                LocalPreferences(ctx).saveToEncryptedStorage(account)
+                            }
+                        } else if (accountUser.isFollowing(user)) {
+                            UnfollowButton { account.unfollow(user) }
+                        } else {
+                            FollowButton { account.follow(user) }
+                        }
+                    }
+                }
+            }
+
+            Text(
+                user.bestDisplayName() ?: "",
+                modifier = Modifier.padding(top = 7.dp),
+                fontWeight = FontWeight.Bold,
+                fontSize = 25.sp
+            )
+            Text(
+                " @${user.bestUsername()}",
+                color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+            )
+            Text(
+                "${user.info.about}",
+                color = MaterialTheme.colors.onSurface,
+                modifier = Modifier.padding(top = 5.dp, bottom = 5.dp)
+            )
+
+            Divider(modifier = Modifier.padding(top = 6.dp))
+        }
+    }
+}
+
 @Composable
 fun TabNotes(user: User, accountViewModel: AccountViewModel, navController: NavController) {
     val accountState by accountViewModel.accountLiveData.observeAsState()
@@ -235,7 +276,7 @@ fun TabNotes(user: User, accountViewModel: AccountViewModel, navController: NavC
             Column(
                 modifier = Modifier.padding(vertical = 0.dp)
             ) {
-                FeedView(feedViewModel, accountViewModel, navController)
+                FeedView(feedViewModel, accountViewModel, navController, null)
             }
         }
     }
@@ -267,6 +308,29 @@ fun TabFollowers(user: User, accountViewModel: AccountViewModel, navController:
     }
 }
 
+@Composable
+private fun NSecCopyButton(
+    account: Account
+) {
+    val clipboardManager = LocalClipboardManager.current
+
+    Button(
+        modifier = Modifier.padding(horizontal = 3.dp).width(50.dp),
+        onClick = { account.loggedIn.privKey?.let { clipboardManager.setText(AnnotatedString(it.toNsec())) } },
+        shape = RoundedCornerShape(20.dp),
+        colors = ButtonDefaults
+            .buttonColors(
+                backgroundColor = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+            ),
+    ) {
+        Icon(
+            tint = Color.White,
+            imageVector = Icons.Default.Password,
+            contentDescription = "Copies the Nsec ID (your password) to the clipboard for backup"
+        )
+    }
+}
+
 @Composable
 private fun NPubCopyButton(
     user: User
@@ -274,7 +338,7 @@ private fun NPubCopyButton(
     val clipboardManager = LocalClipboardManager.current
 
     Button(
-        modifier = Modifier.padding(horizontal = 3.dp),
+        modifier = Modifier.padding(horizontal = 3.dp).width(50.dp),
         onClick = { clipboardManager.setText(AnnotatedString(user.pubkey.toNpub())) },
         shape = RoundedCornerShape(20.dp),
         colors = ButtonDefaults
@@ -282,14 +346,18 @@ private fun NPubCopyButton(
                 backgroundColor = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
             ),
     ) {
-        Text(text = "npub", color = Color.White)
+        Icon(
+            tint = Color.White,
+            imageVector = Icons.Default.Share,
+            contentDescription = "Copies the Note ID to the clipboard for sharing"
+        )
     }
 }
 
 @Composable
 private fun MessageButton(user: User, navController: NavController) {
     Button(
-        modifier = Modifier.padding(horizontal = 3.dp),
+        modifier = Modifier.padding(horizontal = 3.dp).width(50.dp),
         onClick = { navController.navigate("Room/${user.pubkeyHex}") },
         shape = RoundedCornerShape(20.dp),
         colors = ButtonDefaults
@@ -316,7 +384,7 @@ private fun EditButton(account: Account) {
         NewUserMetadataView({ wantsToEdit = false }, account)
 
     Button(
-        modifier = Modifier.padding(horizontal = 3.dp),
+        modifier = Modifier.padding(horizontal = 3.dp).width(50.dp),
         onClick = { wantsToEdit = true },
         shape = RoundedCornerShape(20.dp),
         colors = ButtonDefaults
@@ -324,7 +392,11 @@ private fun EditButton(account: Account) {
                 backgroundColor = MaterialTheme.colors.primary
             )
     ) {
-        Text(text = "Edit", color = Color.White)
+        Icon(
+            tint = Color.White,
+            imageVector = Icons.Default.EditNote,
+            contentDescription = "Edits the User's Metadata"
+        )
     }
 }
 
@@ -354,8 +426,22 @@ fun FollowButton(onClick: () -> Unit) {
                 backgroundColor = MaterialTheme.colors.primary
             )
     ) {
-        Text(text = "Follow", color = Color.White)
+        Text(text = "Follow", color = Color.White, textAlign = TextAlign.Center)
     }
 }
 
+@Composable
+fun ShowUserButton(onClick: () -> Unit) {
+    Button(
+        modifier = Modifier.padding(start = 3.dp),
+        onClick = onClick,
+        shape = RoundedCornerShape(20.dp),
+        colors = ButtonDefaults
+            .buttonColors(
+                backgroundColor = MaterialTheme.colors.primary
+            )
+    ) {
+        Text(text = "Unblock", color = Color.White)
+    }
+}
 

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

@@ -15,6 +15,7 @@ import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material.Divider
 import androidx.compose.material.Icon
@@ -22,6 +23,7 @@ import androidx.compose.material.IconButton
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Text
 import androidx.compose.material.TextField
+import androidx.compose.material.TextFieldDefaults
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Clear
 import androidx.compose.runtime.Composable
@@ -40,12 +42,14 @@ import androidx.compose.ui.res.painterResource
 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.lifecycle.viewmodel.compose.viewModel
 import androidx.navigation.NavController
 import coil.compose.AsyncImage
 import coil.compose.rememberAsyncImagePainter
 import com.vitorpamplona.amethyst.R
+import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.Channel
 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.Note
@@ -54,6 +58,8 @@ import com.vitorpamplona.amethyst.service.NostrSearchEventOrUserDataSource
 import com.vitorpamplona.amethyst.service.NostrThreadDataSource
 import com.vitorpamplona.amethyst.ui.note.ChannelName
 import com.vitorpamplona.amethyst.ui.note.NoteCompose
+import com.vitorpamplona.amethyst.ui.note.UserCompose
+import com.vitorpamplona.amethyst.ui.note.UserPicture
 import com.vitorpamplona.amethyst.ui.note.UsernameDisplay
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 
@@ -70,7 +76,7 @@ fun SearchScreen(accountViewModel: AccountViewModel, navController: NavControlle
             modifier = Modifier.padding(vertical = 0.dp)
         ) {
             SearchBar(accountViewModel, navController)
-            FeedView(feedViewModel, accountViewModel, navController)
+            FeedView(feedViewModel, accountViewModel, navController, null)
         }
     }
 }
@@ -116,6 +122,7 @@ private fun SearchBar(accountViewModel: AccountViewModel, navController: NavCont
                 searchResultsNotes.value = LocalCache.findNotesStartingWith(it.text)
                 searchResultsChannels.value = LocalCache.findChannelsStartingWith(it.text)
             },
+            shape = RoundedCornerShape(25.dp),
             keyboardOptions = KeyboardOptions.Default.copy(
                 capitalization = KeyboardCapitalization.Sentences
             ),
@@ -154,7 +161,11 @@ private fun SearchBar(accountViewModel: AccountViewModel, navController: NavCont
                         )
                     }
                 }
-            }
+            },
+            colors = TextFieldDefaults.textFieldColors(
+                focusedIndicatorColor = Color.Transparent,
+                unfocusedIndicatorColor = Color.Transparent
+            )
         )
     }
 
@@ -167,9 +178,7 @@ private fun SearchBar(accountViewModel: AccountViewModel, navController: NavCont
             )
         ) {
             itemsIndexed(searchResults.value, key = { _, item -> "u"+item.pubkeyHex }) { index, item ->
-                UserLine(item) {
-                    navController.navigate("User/${item.pubkeyHex}")
-                }
+                UserCompose(item, accountViewModel = accountViewModel, navController = navController)
             }
 
             itemsIndexed(searchResultsChannels.value, key = { _, item -> "c"+item.idHex }) { index, item ->
@@ -184,6 +193,7 @@ private fun SearchBar(accountViewModel: AccountViewModel, navController: NavCont
                     },
                     channelLastTime = null,
                     channelLastContent = item.info.about,
+                    false,
                     onClick = { navController.navigate("Channel/${item.idHex}") })
             }
 
@@ -197,6 +207,7 @@ private fun SearchBar(accountViewModel: AccountViewModel, navController: NavCont
 @Composable
 fun UserLine(
     baseUser: User,
+    account: Account,
     onClick: () -> Unit
 ) {
     val userState by baseUser.live.observeAsState()
@@ -215,15 +226,7 @@ fun UserLine(
                 )
         ) {
 
-            AsyncImage(
-                model = user.profilePicture(),
-                placeholder = rememberAsyncImagePainter("https://robohash.org/${user.pubkeyHex}.png"),
-                contentDescription = "Profile Image",
-                modifier = Modifier
-                    .width(55.dp)
-                    .height(55.dp)
-                    .clip(shape = CircleShape)
-            )
+            UserPicture(user, account.userProfile(), 55.dp, Modifier, null)
 
             Column(
                 modifier = Modifier
@@ -236,7 +239,9 @@ fun UserLine(
 
                 Text(
                     user.info.about?.take(100) ?: "",
-                    color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                    color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f),
+                    maxLines = 1,
+                    overflow = TextOverflow.Ellipsis
                 )
             }
         }

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

@@ -4,6 +4,7 @@ import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
@@ -15,8 +16,11 @@ import androidx.compose.foundation.text.ClickableText
 import androidx.compose.foundation.text.KeyboardActions
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material.Button
+import androidx.compose.material.ButtonDefaults
+import androidx.compose.material.Checkbox
 import androidx.compose.material.Icon
 import androidx.compose.material.IconButton
+import androidx.compose.material.LocalTextStyle
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.OutlinedTextField
 import androidx.compose.material.Text
@@ -30,7 +34,9 @@ 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.Color
 import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.platform.LocalUriHandler
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.text.TextStyle
@@ -43,16 +49,29 @@ import androidx.compose.ui.text.style.TextDecoration
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import com.vitorpamplona.amethyst.R
+import com.vitorpamplona.amethyst.ui.components.sendMail
 
 @Composable
 fun LoginPage(accountViewModel: AccountStateViewModel) {
+    val key = remember { mutableStateOf(TextFieldValue("")) }
+    var errorMessage by remember { mutableStateOf("") }
+    val acceptedTerms = remember { mutableStateOf(false) }
+    var termsAcceptanceIsRequired by remember { mutableStateOf("") }
+    val uri = LocalUriHandler.current
+
     Box(modifier = Modifier.fillMaxSize()) {
         ClickableText(
             text = AnnotatedString("Generate a new key"),
             modifier = Modifier
                 .align(Alignment.BottomCenter)
                 .padding(20.dp),
-            onClick = { accountViewModel.newKey() },
+            onClick = {
+                if (acceptedTerms.value) {
+                    accountViewModel.newKey()
+                } else {
+                    termsAcceptanceIsRequired = "Acceptance of terms is required"
+                }
+            },
             style = TextStyle(
                 fontSize = 14.sp,
                 textDecoration = TextDecoration.Underline,
@@ -66,19 +85,14 @@ fun LoginPage(accountViewModel: AccountStateViewModel) {
         horizontalAlignment = Alignment.CenterHorizontally,
     ) {
 
-        val key = remember { mutableStateOf(TextFieldValue("")) }
-        var errorMessage by remember { mutableStateOf("") }
-
         Image(
             painterResource(id = R.drawable.amethyst),
             contentDescription = "App Logo",
-            modifier = Modifier.size(300.dp),
+            modifier = Modifier.size(250.dp),
             contentScale = ContentScale.Inside
         )
 
-        Spacer(modifier = Modifier.height(20.dp))
-
-        //Text(text = "Insert your private or public key (view-only)")
+        Spacer(modifier = Modifier.height(40.dp))
 
         var showPassword by remember {
             mutableStateOf(false)
@@ -119,7 +133,32 @@ fun LoginPage(accountViewModel: AccountStateViewModel) {
         )
         if (errorMessage.isNotBlank()) {
             Text(
-                text = "${errorMessage}",
+                text = errorMessage,
+                color = MaterialTheme.colors.error,
+                style = MaterialTheme.typography.caption
+            )
+        }
+
+        Spacer(modifier = Modifier.height(20.dp))
+
+        Row(verticalAlignment = Alignment.CenterVertically) {
+            Checkbox(
+                checked = acceptedTerms.value,
+                onCheckedChange = { acceptedTerms.value = it }
+            )
+
+            Text(text = "I accept the ")
+
+            ClickableText(
+                text = AnnotatedString("terms of use"),
+                onClick = { runCatching { uri.openUri("https://github.com/vitorpamplona/amethyst/blob/main/PRIVACY.md") } },
+                style = LocalTextStyle.current.copy(color = MaterialTheme.colors.primary),
+            )
+        }
+
+        if (termsAcceptanceIsRequired.isNotBlank()) {
+            Text(
+                text = termsAcceptanceIsRequired,
                 color = MaterialTheme.colors.error,
                 style = MaterialTheme.typography.caption
             )
@@ -130,16 +169,30 @@ fun LoginPage(accountViewModel: AccountStateViewModel) {
         Box(modifier = Modifier.padding(40.dp, 0.dp, 40.dp, 0.dp)) {
             Button(
                 onClick = {
-                    try {
-                        accountViewModel.login(key.value.text)
-                    } catch (e: Exception) {
-                        errorMessage = "Invalid key"
+                    if (!acceptedTerms.value) {
+                        termsAcceptanceIsRequired = "Acceptance of terms is required"
+                    }
+
+                    if (key.value.text.isBlank()) {
+                        errorMessage = "Key is required"
+                    }
+
+                    if (acceptedTerms.value && key.value.text.isNotBlank()) {
+                        try {
+                            accountViewModel.login(key.value.text)
+                        } catch (e: Exception) {
+                            errorMessage = "Invalid key"
+                        }
                     }
                 },
                 shape = RoundedCornerShape(35.dp),
                 modifier = Modifier
                     .fillMaxWidth()
-                    .height(50.dp)
+                    .height(50.dp),
+                colors = ButtonDefaults
+                  .buttonColors(
+                  backgroundColor = if (acceptedTerms.value) MaterialTheme.colors.primary else Color.Gray
+                  )
             ) {
                 Text(text = "Login")
             }

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

@@ -5,4 +5,8 @@ import androidx.compose.ui.graphics.Color
 val Purple200 = Color(0xFFBB86FC)
 val Purple500 = Color(0xFF6200EE)
 val Purple700 = Color(0xFF3700B3)
-val Teal200 = Color(0xFF03DAC5)
+val Teal200 = Color(0xFF03DAC5)
+
+val Following = Color(0xFF03DAC5)
+val FollowsFollow = Color.Yellow
+val NIP05Verified = Color.Blue

build.gradle

@@ -1,14 +1,14 @@
 buildscript {
     ext {
-        compose_ui_version = '1.3.3'
+        compose_ui_version = '1.4.0-alpha05'
         nav_version = "2.5.3"
         room_version = "2.4.3"
         accompanist_version = "0.28.0"
     }
 }// Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id 'com.android.application' version '7.3.1' apply false
-    id 'com.android.library' version '7.3.1' apply false
-    id 'org.jetbrains.kotlin.android' version '1.6.10' apply false
-    id 'org.jetbrains.kotlin.jvm' version '1.7.20' apply false
+    id 'com.android.application' version '7.4.0' apply false
+    id 'com.android.library' version '7.4.0' apply false
+    id 'org.jetbrains.kotlin.android' version '1.8.0' apply false
+    id 'org.jetbrains.kotlin.jvm' version '1.8.0' apply false
 }

fastlane/metadata/android/en-US/full_description.txt

@@ -0,0 +1 @@
+<p><i>Amethyst</i> brings the best social network to your Android phone. Just insert your Nostr private key and start posting.</p><p><a href='https://github.com/nostr-protocol/nostr' target='_blank' rel='nofollow noopener'>Nostr</a> is an open protocol that is able to create a censorship-resistant global "social" network, transferring notes and other stuff using relays. It doesn't rely on any trusted central server, hence it is resilient; it is based on cryptographic keys and signatures, so it is tamperproof; it does not rely on P2P techniques, therefore it works.

fastlane/metadata/android/en-US/short_description.txt

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

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Wed Jan 04 09:23:50 EST 2023
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME