v0.20.0

Update README.md by modifying current features list, checkmarked Zaps

README.md

@@ -11,22 +11,24 @@ Amethyst brings the best social network to your Android phone. Just insert your
 - [x] Notifications Feed
 - [x] Global Feed
 - [x] Reactions (like, boost, reply)
-- [x] Image Preview (gifs, svgs)
+- [x] Image/Video Preview (gifs, svgs, etc)
 - [x] Url Preview
 - [x] View Threads
 - [x] Private Messages (NIP-04)
 - [x] User Profiles (follow/unfollow)
 - [x] Public Chats (NIP-28)
-- [x] Notification Bubbles
+- [x] Notification Dots
 - [x] Reporting and Hide User capability
+- [x] Automatic Translations
 - [x] Profile Edit
 - [x] Relay Edit (separate relay sets for home, dms, public chats, global)
 - [x] Dropdown to Link Users when writing
 - [x] Lightning Tips
-- [ ] Zaps 
+- [x] Zaps 
+- [x] Event Deletion (NIP-09: like, boost, text notes and reports)
+- [ ] Internationalization
 - [ ] Infinity Scroll 
 - [ ] Identity Verification (NIP-05)
-- [ ] Event Delegation (NIP-09)
 - [ ] Account Creation / Backup Guidance
 - [ ] Message Sent feedback
 

app/build.gradle

@@ -11,8 +11,8 @@ android {
         applicationId "com.vitorpamplona.amethyst"
         minSdk 26
         targetSdk 33
-        versionCode 45
-        versionName "0.15.2"
+        versionCode 74
+        versionName "0.20.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {
@@ -43,7 +43,7 @@ android {
         compose true
     }
     composeOptions {
-        kotlinCompilerExtensionVersion '1.4.0'
+        kotlinCompilerExtensionVersion "1.4.3"
     }
     packagingOptions {
         resources {
@@ -54,7 +54,7 @@ android {
 
 dependencies {
     implementation 'androidx.core:core-ktx:1.9.0'
-    implementation 'androidx.activity:activity-compose:1.6.1'
+    implementation 'androidx.activity:activity-compose:1.7.0-beta01'
     implementation "androidx.compose.ui:ui:$compose_ui_version"
     implementation "androidx.compose.ui:ui-tooling-preview:$compose_ui_version"
 
@@ -62,19 +62,19 @@ dependencies {
     implementation("androidx.navigation:navigation-compose:$nav_version")
 
     // Observe Live data as State
-    implementation 'androidx.compose.runtime:runtime-livedata:1.4.0-alpha04'
+    implementation 'androidx.compose.runtime:runtime-livedata:1.4.0-beta01'
 
-    implementation 'androidx.compose.material:material:1.4.0-alpha05'
-    implementation "androidx.compose.material:material-icons-extended:1.4.0-alpha05"
+    implementation 'androidx.compose.material:material:1.4.0-beta02'
+    implementation "androidx.compose.material:material-icons-extended:1.4.0-beta02"
 
     // 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'
+    implementation "androidx.lifecycle:lifecycle-runtime-compose:$lifecycle_version"
+    implementation "androidx.lifecycle:lifecycle-viewmodel-compose:$lifecycle_version"
+    implementation "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycle_version"
+    implementation "androidx.lifecycle:lifecycle-livedata:$lifecycle_version"
 
     // Swipe Refresh
-    implementation 'com.google.accompanist:accompanist-swiperefresh:0.29.0-alpha'
+    implementation 'com.google.accompanist:accompanist-swiperefresh:0.29.1-alpha'
 
     // Bitcoin secp256k1 bindings to Android
     implementation 'fr.acinq.secp256k1:secp256k1-kmp-jni-android:0.7.1'
@@ -98,10 +98,12 @@ dependencies {
 
     // link preview
     implementation 'tw.com.oneup.www:Baha-UrlPreview:1.0.1'
-    implementation 'androidx.security:security-crypto-ktx:1.1.0-alpha04'
+
+    // Encrypted Key Storage
+    implementation 'androidx.security:security-crypto-ktx:1.1.0-alpha05'
 
     // view videos
-    implementation 'com.google.android.exoplayer:exoplayer:2.18.2'
+    implementation 'com.google.android.exoplayer:exoplayer:2.18.3'
 
     // Load images from the web.
     implementation "io.coil-kt:coil-compose:2.2.2"
@@ -119,6 +121,9 @@ dependencies {
     implementation "com.google.accompanist:accompanist-pager:$accompanist_version" // Pager
     implementation "com.google.accompanist:accompanist-pager-indicators:$accompanist_version"
 
+    // Parses URLs from Text:
+    implementation "io.github.url-detector:url-detector:0.1.23"
+
     // For QR generation
     implementation 'com.google.zxing:core:3.5.1'
     implementation "androidx.camera:camera-camera2:1.2.1"
@@ -129,12 +134,18 @@ dependencies {
     implementation 'com.google.mlkit:vision-common:17.3.0'
 
     // Local Barcode Scanning model
-    implementation 'com.google.android.gms:play-services-mlkit-barcode-scanning:18.1.0'
+    // The idea is to make it work for degoogled phones
+    implementation 'com.google.mlkit:barcode-scanning:17.0.3'
 
-    // Use this dependency to use the translate text
-    implementation 'com.google.mlkit:translate:17.0.1'
+    // Local model for language identification
     implementation 'com.google.mlkit:language-id:17.0.4'
-    implementation 'com.google.android.gms:play-services-mlkit-language-id:17.0.0'
+
+    // Google services model the translate text
+    implementation 'com.google.mlkit:translate:17.0.1'
+
+
+    // Automatic memory leak detection
+    debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.10'
 
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'

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

@@ -0,0 +1,78 @@
+package com.vitorpamplona.amethyst
+
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.google.android.gms.tasks.Tasks
+import com.vitorpamplona.amethyst.service.lang.LanguageTranslatorService
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertTrue
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class TranslationsTest {
+
+  fun translatePT(text: String, translateTo: String): String? {
+    val task = LanguageTranslatorService.autoTranslate(text, emptySet(), translateTo)
+    return Tasks.await(task).result
+  }
+
+  fun assertTranslate(expected: String, input: String, translateTo: String) {
+    assertEquals(null, expected, translatePT(input, translateTo))
+  }
+
+  fun assertTranslateContains(expected: String, input: String, translateTo: String) {
+    val translated = translatePT(input, translateTo)!!
+    assertTrue("'$translated' does not contain '$expected'", translated.contains(expected))
+  }
+
+  @Test
+  fun testTranslation() {
+    assertTranslate("Olá mundo", "Hello World", "pt")
+  }
+
+  @Test
+  fun testTranslationName() {
+    assertTranslate("Olá Vitor, como você está?", "Hello Vitor, how are you doing?", "pt")
+  }
+
+  @Test
+  fun testTranslationTag() {
+    assertTranslate("Você já viu isso, #[0]", "Have you seen this, #[0]", "pt")
+  }
+
+  @Test
+  fun testTranslationUrl() {
+    assertTranslateContains("https://t.me/mygroup", "Have you seen this https://t.me/mygroup", "pt")
+    assertTranslateContains("http://bananas.com", "Have you seen this http://bananas.com", "pt")
+    assertTranslateContains("http://bananas.com/myimage.jpg", "Have you seen this http://bananas.com/myimage.jpg", "pt")
+    assertTranslateContains("http://bananas.com?search=true&image=myimage.jpg", "Have you seen this http://bananas.com?search=true&image=myimage.jpg", "pt")
+    assertTranslate("https://i.imgur.com/EZ3QPsw.jpg", "https://i.imgur.com/EZ3QPsw.jpg", "pt")
+    assertTranslate("https://HaveYouSeenThis.com", "https://HaveYouSeenThis.com", "pt")
+    assertTranslate("https://haveyouseenthis.com", "https://haveyouseenthis.com", "pt")
+    assertTranslate("https://i.imgur.com/asdEZ3QPsw.jpg", "https://i.imgur.com/asdEZ3QPsw.jpg", "pt")
+    assertTranslateContains("https://i.imgur.com/asdEZ3QPswadfj2389rioasdjf9834riofaj9834aKLL.jpg", "Hi there! \n How are you doing? \n https://i.imgur.com/asdEZ3QPswadfj2389rioasdjf9834riofaj9834aKLL.jpg", "pt")
+  }
+
+  @Test
+  fun testChineseWithUrlDetector() {
+    assertTranslate("I entered your home page is very carton, perhaps your attention or other data is too much, and the homepage of others is not so carton. From aMethyst client", "我进入你的主页很卡顿，也许是你的关注人数或者其他数据太多了，其他人主页没有这么卡顿。来自amethyst客户端", "en")
+  }
+
+  @Test
+  fun testTranslationEmail() {
+    assertTranslateContains("vitor@amethyst.social", "Have you seen this vitor@amethyst.social", "pt")
+  }
+
+  @Test
+  fun testTranslationLnInvoice() {
+    assertTranslateContains(
+      "lnbc12u1p3lvjeupp5a5ecgp45k6pa8tu7rnkgzfuwdy3l5ylv3k5tdzrg4cr8rj2f364sdq5g9kxy7fqd9h8vmmfvdjscqzpgxqyz5vqsp5zuzyetf33aphetf0e80w7tztw6dfsjs4lmvya4cyk8umfsx00qts9qyyssqke9hphcr36zvcav8wr502g0mhfhxpy8m9tt36zttg8vldm2qxw039ulccr8nwy3hjg2sw5vk65e99lwuhrhw0nuya2u57qszltvx7egp74jydn",
+      "Have you seen this: lnbc12u1p3lvjeupp5a5ecgp45k6pa8tu7rnkgzfuwdy3l5ylv3k5tdzrg4cr8rj2f364sdq5g9kxy7fqd9h8vmmfvdjscqzpgxqyz5vqsp5zuzyetf33aphetf0e80w7tztw6dfsjs4lmvya4cyk8umfsx00qts9qyyssqke9hphcr36zvcav8wr502g0mhfhxpy8m9tt36zttg8vldm2qxw039ulccr8nwy3hjg2sw5vk65e99lwuhrhw0nuya2u57qszltvx7egp74jydn I think I have to pay", "pt"
+    )
+
+    assertTranslateContains(
+      "lnbc10u1p3l0wg0pp5y5y3vxt3429m28uuq56uqhwxadftn67yaarq06h3y9nqapz72n6sdqqxqyjw5q9q7sqqqqqqqqqqqqqqqqqqqqqqqqq9qsqsp5y2tazp42xde3c0tdsz30zqcekrt0lzrneszdtagy2qn7vs0d3p5qrzjqwryaup9lh50kkranzgcdnn2fgvx390wgj5jd07rwr3vxeje0glcll7jdvcln4lhw5qqqqlgqqqqqeqqjqdau9jzseecmvmh03h88xyf5f980xx45fmn0cej654v5jr79ye36pww90jwdda38damlmgt54v8rn6q9kywtw057rh4v3wwrmn8fajagqnssr7v",
+      "Test lnbc10u1p3l0wg0pp5y5y3vxt3429m28uuq56uqhwxadftn67yaarq06h3y9nqapz72n6sdqqxqyjw5q9q7sqqqqqqqqqqqqqqqqqqqqqqqqq9qsqsp5y2tazp42xde3c0tdsz30zqcekrt0lzrneszdtagy2qn7vs0d3p5qrzjqwryaup9lh50kkranzgcdnn2fgvx390wgj5jd07rwr3vxeje0glcll7jdvcln4lhw5qqqqlgqqqqqeqqjqdau9jzseecmvmh03h88xyf5f980xx45fmn0cej654v5jr79ye36pww90jwdda38damlmgt54v8rn6q9kywtw057rh4v3wwrmn8fajagqnssr7v", "pt"
+    )
+  }
+}

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

@@ -5,6 +5,7 @@ import androidx.compose.ui.text.AnnotatedString
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
 import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.model.UserMetadata
 import com.vitorpamplona.amethyst.model.decodePublicKey
 import com.vitorpamplona.amethyst.model.toHexKey
 import com.vitorpamplona.amethyst.ui.actions.buildAnnotatedStringWithUrlHighlighting
@@ -29,7 +30,8 @@ class EUrlUserTagTransformationTest {
   @Test
   fun transformationText() {
     val user = LocalCache.getOrCreateUser(decodePublicKey("npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z").toHexKey())
-    user.info.displayName = "Vitor Pamplona"
+    user.info = UserMetadata()
+    user.info?.displayName = "Vitor Pamplona"
 
     var transformedText = buildAnnotatedStringWithUrlHighlighting(
       AnnotatedString("New Hey @npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z"),
@@ -63,7 +65,8 @@ class EUrlUserTagTransformationTest {
   @Test
   fun transformationTextTwoKeys() {
     val user = LocalCache.getOrCreateUser(decodePublicKey("npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z").toHexKey())
-    user.info.displayName = "Vitor Pamplona"
+    user.info = UserMetadata()
+    user.info?.displayName = "Vitor Pamplona"
 
     var transformedText = buildAnnotatedStringWithUrlHighlighting(
       AnnotatedString("New Hey @npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z and @npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z"),

app/src/main/AndroidManifest.xml

@@ -24,7 +24,6 @@
         android:usesCleartextTraffic="true"
         tools:targetApi="33">
         <activity
-            android:label="@string/app_name"
             android:name=".ui.MainActivity"
             android:exported="true"
             android:windowSoftInputMode="adjustResize"
@@ -46,10 +45,6 @@
                 android:name="android.app.lib_name"
                 android:value="" />
         </activity>
-
-        <meta-data
-            android:name="com.google.mlkit.vision.DEPENDENCIES"
-            android:value="barcode" />
     </application>
 
 </manifest>

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

@@ -8,6 +8,9 @@ import com.vitorpamplona.amethyst.model.toByteArray
 import com.vitorpamplona.amethyst.model.RelaySetupInfo
 import java.util.Locale
 import nostr.postr.Persona
+import nostr.postr.events.ContactListEvent
+import nostr.postr.events.Event
+import nostr.postr.events.Event.Companion.getRefinedEvent
 import nostr.postr.toHex
 
 class LocalPreferences(context: Context) {
@@ -22,7 +25,10 @@ class LocalPreferences(context: Context) {
       remove("hidden_users")
       remove("relays")
       remove("dontTranslateFrom")
+      remove("languagePreferences")
       remove("translateTo")
+      remove("zapAmounts")
+      remove("latestContactList")
     }.apply()
   }
 
@@ -34,7 +40,10 @@ class LocalPreferences(context: Context) {
       account.hiddenUsers.let { putStringSet("hidden_users", it) }
       account.localRelays.let { putString("relays", gson.toJson(it)) }
       account.dontTranslateFrom.let { putStringSet("dontTranslateFrom", it) }
+      account.languagePreferences.let { putString("languagePreferences", gson.toJson(it)) }
       account.translateTo.let { putString("translateTo", it) }
+      account.zapAmountChoices.let { putString("zapAmounts", gson.toJson(it)) }
+      account.backupContactList.let { putString("latestContactList", Event.gson.toJson(it)) }
     }.apply()
   }
 
@@ -52,6 +61,29 @@ class LocalPreferences(context: Context) {
       val dontTranslateFrom = getStringSet("dontTranslateFrom", null) ?: setOf()
       val translateTo = getString("translateTo", null) ?: Locale.getDefault().language
 
+      val zapAmountChoices = gson.fromJson(
+        getString("zapAmounts", "[]"),
+        object : TypeToken<List<Long>>() {}.type
+      ) ?: listOf(500L, 1000L, 5000L)
+
+      val latestContactList = try {
+        getString("latestContactList", null)?.let {
+          Event.gson.fromJson(it, Event::class.java).getRefinedEvent(true) as ContactListEvent
+        }
+      } catch (e: Throwable) {
+        e.printStackTrace()
+        null
+      }
+
+      val languagePreferences = try {
+        getString("languagePreferences", null)?.let {
+          gson.fromJson(it, object : TypeToken<Map<String, String>>() {}.type) as Map<String, String>
+        } ?: mapOf<String,String>()
+      } catch (e: Throwable) {
+        e.printStackTrace()
+        mapOf<String,String>()
+      }
+
       if (pubKey != null) {
         return Account(
           Persona(privKey = privKey?.toByteArray(), pubKey = pubKey.toByteArray()),
@@ -59,7 +91,10 @@ class LocalPreferences(context: Context) {
           hiddenUsers,
           localRelays,
           dontTranslateFrom,
-          translateTo
+          languagePreferences,
+          translateTo,
+          zapAmountChoices,
+          latestContactList
         )
       } else {
         return null

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

@@ -3,11 +3,14 @@ package com.vitorpamplona.amethyst
 import android.content.Context
 import androidx.lifecycle.LiveData
 import com.vitorpamplona.amethyst.model.Note
+import java.util.concurrent.atomic.AtomicBoolean
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
+import kotlinx.coroutines.NonCancellable
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 
 object NotificationCache {
   val lastReadByRoute = mutableMapOf<String, Long>()
@@ -20,7 +23,7 @@ object NotificationCache {
       val scope = CoroutineScope(Job() + Dispatchers.IO)
       scope.launch {
         LocalPreferences(context).saveLastRead(route, timestampInSecs)
-        invalidateData()
+        live.invalidateData()
       }
     }
   }
@@ -36,24 +39,31 @@ object NotificationCache {
 
   // 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)) {
+  // Refreshes observers in batches.
+  var handlerWaiting = AtomicBoolean()
+
+  @Synchronized
+  fun invalidateData() {
+    if (!hasActiveObservers()) return
+    if (handlerWaiting.getAndSet(true)) return
+
+    handlerWaiting.set(true)
+    val scope = CoroutineScope(Job() + Dispatchers.Main)
+    scope.launch {
+      try {
+        delay(100)
+        refresh()
+      } finally {
+        withContext(NonCancellable) {
+          handlerWaiting.set(false)
+        }
+      }
+    }
+  }
+
   fun refresh() {
     postValue(NotificationState(cache))
   }

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

@@ -3,6 +3,8 @@ package com.vitorpamplona.amethyst
 import android.content.Context
 import android.graphics.Bitmap
 import android.util.LruCache
+import androidx.compose.ui.graphics.ImageBitmap
+import androidx.compose.ui.graphics.asImageBitmap
 import java.util.UUID
 import name.neuhalfen.projects.android.robohash.RoboHash
 
@@ -10,14 +12,18 @@ object RoboHashCache {
 
   lateinit var robots: RoboHash
 
+  lateinit var defaultAvatar: ImageBitmap
+
   @Synchronized
-  fun get(context: Context, hash: String): Bitmap {
+  fun get(context: Context, hash: String): ImageBitmap {
     if (!this::robots.isInitialized) {
       robots = RoboHash(context)
-      robots.useCache(LruCache(100));
+      //robots.useCache(LruCache(100));
+
+      defaultAvatar = robots.imageForHandle(robots.calculateHandleFromUUID(UUID.nameUUIDFromBytes("aaaa".toByteArray()))).asImageBitmap()
     }
 
-    return robots.imageForHandle(robots.calculateHandleFromUUID(UUID.nameUUIDFromBytes("aaaa".toByteArray())))
+    return defaultAvatar
   }
 
 }

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

@@ -1,20 +1,18 @@
 package com.vitorpamplona.amethyst
 
 import com.vitorpamplona.amethyst.model.Account
+import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.service.relays.Constants
 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.NostrSingleChannelDataSource
 import com.vitorpamplona.amethyst.service.NostrSingleEventDataSource
 import com.vitorpamplona.amethyst.service.NostrSingleUserDataSource
 import com.vitorpamplona.amethyst.service.NostrThreadDataSource
 import com.vitorpamplona.amethyst.service.NostrUserProfileDataSource
-import com.vitorpamplona.amethyst.service.NostrUserProfileFollowersDataSource
-import com.vitorpamplona.amethyst.service.NostrUserProfileFollowsDataSource
 import com.vitorpamplona.amethyst.service.relays.Client
 
 object ServiceManager {
@@ -29,30 +27,23 @@ object ServiceManager {
     val myAccount = account
 
     if (myAccount != null) {
-      Client.connect(myAccount.convertLocalRelays())
+      Client.connect(myAccount.activeRelays() ?: myAccount.convertLocalRelays())
 
       // start services
       NostrAccountDataSource.account = myAccount
       NostrHomeDataSource.account = myAccount
-      NostrNotificationDataSource.account = myAccount
       NostrChatroomListDataSource.account = myAccount
-
       NostrGlobalDataSource.account = myAccount
-      NostrChannelDataSource.account = myAccount
-
-      NostrUserProfileDataSource.account = myAccount
-      NostrUserProfileFollowsDataSource.account = myAccount
-      NostrUserProfileFollowersDataSource.account = myAccount
 
+      // Notification Elements
       NostrAccountDataSource.start()
-      //NostrGlobalDataSource.start()
       NostrHomeDataSource.start()
-      NostrNotificationDataSource.start()
+      NostrChatroomListDataSource.start()
+
+      // More Info Data Sources
       NostrSingleEventDataSource.start()
       NostrSingleChannelDataSource.start()
       NostrSingleUserDataSource.start()
-      //NostrThreadDataSource.start()
-      NostrChatroomListDataSource.start()
     } else {
       // if not logged in yet, start a basic service wit default relays
       Client.connect(Constants.convertDefaultRelays())
@@ -65,17 +56,25 @@ object ServiceManager {
     NostrChannelDataSource.stop()
     NostrChatroomListDataSource.stop()
     NostrUserProfileDataSource.stop()
-    NostrUserProfileFollowersDataSource.stop()
-    NostrUserProfileFollowsDataSource.stop()
 
     NostrGlobalDataSource.stop()
-    NostrNotificationDataSource.stop()
     NostrSingleChannelDataSource.stop()
     NostrSingleEventDataSource.stop()
     NostrSingleUserDataSource.stop()
     NostrThreadDataSource.stop()
+    NostrUserProfileDataSource.stop()
 
     Client.disconnect()
   }
 
+  fun cleanUp() {
+    LocalCache.cleanObservers()
+
+    account?.let {
+      LocalCache.pruneOldAndHiddenMessages(it)
+      LocalCache.pruneHiddenMessages(it)
+      //LocalCache.pruneNonFollows(it)
+    }
+  }
+
 }

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

@@ -1,5 +1,6 @@
 package com.vitorpamplona.amethyst.lnurl
 
+import androidx.compose.ui.text.toLowerCase
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import java.net.URLEncoder
 import kotlinx.coroutines.CoroutineScope
@@ -20,11 +21,19 @@ class LightningAddressResolver {
   fun assembleUrl(lnaddress: String): String? {
     val parts = lnaddress.split("@")
 
-    if (parts.size != 2) {
-      return null
+    if (parts.size == 2) {
+      return "https://${parts[1]}/.well-known/lnurlp/${parts[0]}"
     }
 
-    return "https://${parts[1]}/.well-known/lnurlp/${parts[0]}"
+    if (lnaddress.toLowerCase().startsWith("lnurl")) {
+      return try {
+        String(Bech32.decodeBytes(lnaddress, false).second)
+      } catch (e: Exception) {
+        null
+      }
+    }
+
+    return null
   }
 
   fun fetchLightningAddressJson(lnaddress: String, onSuccess: (String) -> Unit, onError: (String) -> Unit) {
@@ -48,12 +57,15 @@ class LightningAddressResolver {
       client.newCall(request).enqueue(object : Callback {
         override fun onResponse(call: Call, response: Response) {
           response.use {
-            onSuccess(response.body.string())
+            if (it.isSuccessful)
+              onSuccess(it.body.string())
+            else
+              onError("Could not resolve ${lnaddress}. Error: ${it.code}. Check if the server up and if the lightning address ${lnaddress} is correct")
           }
         }
 
         override fun onFailure(call: Call, e: java.io.IOException) {
-          onError("Could not resolve User's LNURL address from ${url}. Check if the server up and if the lightning address ${lnaddress} is correct")
+          onError("Could not resolve ${url}. Check if the server up and if the lightning address ${lnaddress} is correct")
           e.printStackTrace()
         }
       })
@@ -84,12 +96,15 @@ class LightningAddressResolver {
       client.newCall(request).enqueue(object : Callback {
         override fun onResponse(call: Call, response: Response) {
           response.use {
-            onSuccess(response.body.string())
+            if (it.isSuccessful)
+              onSuccess(response.body.string())
+            else
+              onError("Could not fetch invoice from $lnCallback")
           }
         }
 
         override fun onFailure(call: Call, e: java.io.IOException) {
-          onError("Could not fetch an invoice from ${lnCallback}. Message ${e.message}")
+          onError("Could not fetch an invoice from $lnCallback. Message ${e.message}")
           e.printStackTrace()
         }
       })
@@ -116,6 +131,7 @@ class LightningAddressResolver {
           onError("Error Parsing JSON from Lightning Address. Check the user's lightning setup")
           null
         }
+
         val callback = lnurlp?.get("callback")?.asText()
 
         if (callback == null) {
@@ -136,7 +152,7 @@ class LightningAddressResolver {
 
               lnInvoice?.get("pr")?.asText()?.let { pr ->
                 onSuccess(pr)
-              }
+              } ?: onError("Invoice Not Created (element pr not found in the resulting JSON)")
             },
             onError = onError
           )

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

@@ -0,0 +1,91 @@
+package com.vitorpamplona.amethyst.lnurl
+
+import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
+import java.net.URLEncoder
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import nostr.postr.Bech32
+import okhttp3.Call
+import okhttp3.Callback
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import okhttp3.Response
+
+class Nip05Verifier {
+  val client = OkHttpClient.Builder().build()
+
+  fun assembleUrl(nip05address: String): String? {
+    val parts = nip05address.split("@")
+
+    if (parts.size == 2) {
+      return "https://${parts[1]}/.well-known/nostr.json?name=${parts[0]}"
+    }
+
+    return null
+  }
+
+  fun fetchNip05Json(lnaddress: String, onSuccess: (String) -> Unit, onError: (String) -> Unit) {
+    val scope = CoroutineScope(Job() + Dispatchers.IO)
+    scope.launch {
+      fetchNip05JsonSuspend(lnaddress, onSuccess, onError)
+    }
+  }
+
+  private suspend fun fetchNip05JsonSuspend(nip05: String, onSuccess: (String) -> Unit, onError: (String) -> Unit) {
+    val url = assembleUrl(nip05)
+
+    if (url == null) {
+      onError("Could not assemble url from Nip05: \"${nip05}\". Check the user's setup")
+      return
+    }
+
+    withContext(Dispatchers.IO) {
+      val request: Request = Request.Builder().url(url).build()
+
+      client.newCall(request).enqueue(object : Callback {
+        override fun onResponse(call: Call, response: Response) {
+          response.use {
+            if (it.isSuccessful)
+              onSuccess(it.body.string())
+            else
+              onError("Could not resolve ${nip05}. Error: ${it.code}. Check if the server up and if the address ${nip05} is correct")
+          }
+        }
+
+        override fun onFailure(call: Call, e: java.io.IOException) {
+          onError("Could not resolve ${url}. Check if the server up and if the address ${nip05} is correct")
+          e.printStackTrace()
+        }
+      })
+    }
+  }
+
+  fun verifyNip05(nip05: String, onSuccess: (String) -> Unit, onError: (String) -> Unit) {
+    val mapper = jacksonObjectMapper()
+
+    fetchNip05Json(nip05,
+      onSuccess = {
+        val nip05url = try {
+          mapper.readTree(it)
+        } catch (t: Throwable) {
+          onError("Error Parsing JSON from Lightning Address. Check the user's lightning setup")
+          null
+        }
+
+        val user = nip05.split("@")[0]
+
+        val hexKey = nip05url?.get("names")?.get(user)?.asText()
+
+        if (hexKey == null) {
+          onError("Username not found in the NIP05 JSON")
+        } else {
+          onSuccess(hexKey)
+        }
+      },
+      onError = onError
+    )
+  }
+}

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

@@ -20,13 +20,17 @@ import java.util.Locale
 import java.util.concurrent.atomic.AtomicBoolean
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.Job
+import kotlinx.coroutines.NonCancellable
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import nostr.postr.Contact
 import nostr.postr.Persona
 import nostr.postr.Utils
 import nostr.postr.events.ContactListEvent
+import nostr.postr.events.DeletionEvent
 import nostr.postr.events.Event
 import nostr.postr.events.MetadataEvent
 import nostr.postr.events.PrivateDmEvent
@@ -53,8 +57,18 @@ class Account(
   var hiddenUsers: Set<String> = setOf(),
   var localRelays: Set<RelaySetupInfo> = Constants.defaultRelays.toSet(),
   var dontTranslateFrom: Set<String> = getLanguagesSpokenByUser(),
-  var translateTo: String = Locale.getDefault().language
+  var languagePreferences: Map<String, String> = mapOf(),
+  var translateTo: String = Locale.getDefault().language,
+  var zapAmountChoices: List<Long> = listOf(500L, 1000L, 5000L),
+  var backupContactList: ContactListEvent? = null
 ) {
+  var transientHiddenUsers: Set<String> = setOf()
+
+  // Observers line up here.
+  val live: AccountLiveData = AccountLiveData(this)
+  val liveLanguages: AccountLiveData = AccountLiveData(this)
+  val saveable: AccountLiveData = AccountLiveData(this)
+
   fun userProfile(): User {
     return LocalCache.getOrCreateUser(loggedIn.pubKey.toHexKey())
   }
@@ -64,7 +78,7 @@ class Account(
   }
 
   fun hiddenUsers(): List<User> {
-    return hiddenUsers.map { LocalCache.getOrCreateUser(it) }
+    return (hiddenUsers + transientHiddenUsers).map { LocalCache.getOrCreateUser(it) }
   }
 
   fun isWriteable(): Boolean {
@@ -74,18 +88,23 @@ class Account(
   fun sendNewRelayList(relays: Map<String, ContactListEvent.ReadWrite>) {
     if (!isWriteable()) return
 
-    val lastestContactList = userProfile().latestContactList
-    val event = if (lastestContactList != null) {
-      ContactListEvent.create(
-        lastestContactList.follows,
+    val contactList = userProfile().latestContactList
+
+    if (contactList != null && contactList.follows.size > 0) {
+      val event = ContactListEvent.create(
+        contactList.follows,
         relays,
         loggedIn.privKey!!)
-    } else {
-      ContactListEvent.create(listOf(), relays, loggedIn.privKey!!)
-    }
 
-    Client.send(event)
-    LocalCache.consume(event)
+      Client.send(event)
+      LocalCache.consume(event)
+    } else {
+      val event = ContactListEvent.create(listOf(), relays, loggedIn.privKey!!)
+
+      // Keep this local to avoid erasing a good contact list.
+      // Client.send(event)
+      LocalCache.consume(event)
+    }
   }
 
   fun sendNewUserMetadata(toString: String) {
@@ -105,10 +124,26 @@ class Account(
     }
   }
 
+  fun reactionTo(note: Note): List<Note> {
+    return note.reactedBy(userProfile(), "+")
+  }
+
+  fun hasBoosted(note: Note): Boolean {
+    return boostsTo(note).isNotEmpty()
+  }
+
+  fun boostsTo(note: Note): List<Note> {
+    return note.boostedBy(userProfile())
+  }
+
+  fun hasReacted(note: Note): Boolean {
+    return note.hasReacted(userProfile(), "+")
+  }
+
   fun reactTo(note: Note) {
     if (!isWriteable()) return
 
-    if (note.hasReacted(userProfile(), "+")) {
+    if (hasReacted(note)) {
       // has already liked this note
       return
     }
@@ -123,22 +158,21 @@ class Account(
   fun createZapRequestFor(note: Note): LnZapRequestEvent? {
     if (!isWriteable()) return null
 
-    if (note.hasZapped(userProfile())) {
-      // has already liked this note
-      return null
-    }
-
     note.event?.let {
-      return LnZapRequestEvent.create(it, userProfile().relays?.keys ?: localRelays.map { it.url }.toSet(), loggedIn.privKey!!)
+      return LnZapRequestEvent.create(it, userProfile().relays?.keys?.ifEmpty { null } ?: localRelays.map { it.url }.toSet(), loggedIn.privKey!!)
     }
 
     return null
   }
 
   fun createZapRequestFor(user: User): LnZapRequestEvent? {
+    return createZapRequestFor(user.pubkeyHex)
+  }
+
+  fun createZapRequestFor(userPubKeyHex: String): LnZapRequestEvent? {
     if (!isWriteable()) return null
 
-    return LnZapRequestEvent.create(user.pubkeyHex, userProfile().relays?.keys ?: localRelays.map { it.url }.toSet(), loggedIn.privKey!!)
+    return LnZapRequestEvent.create(userPubKeyHex, userProfile().relays?.keys?.ifEmpty { null } ?: localRelays.map { it.url }.toSet(), loggedIn.privKey!!)
   }
 
   fun report(note: Note, type: ReportEvent.ReportType) {
@@ -158,7 +192,7 @@ class Account(
     note.event?.let {
       val event = ReportEvent.create(it, type, loggedIn.privKey!!)
       Client.send(event)
-      LocalCache.consume(event)
+      LocalCache.consume(event, null)
     }
   }
 
@@ -172,13 +206,29 @@ class Account(
 
     val event = ReportEvent.create(user.pubkeyHex, type, loggedIn.privKey!!)
     Client.send(event)
-    LocalCache.consume(event)
+    LocalCache.consume(event, null)
+  }
+
+  fun delete(note: Note) {
+    delete(listOf(note))
+  }
+
+  fun delete(notes: List<Note>) {
+    if (!isWriteable()) return
+
+    val myNotes = notes.filter { it.author == userProfile() }.map { it.idHex }
+
+    if (myNotes.isNotEmpty()) {
+      val event = DeletionEvent.create(myNotes, loggedIn.privKey!!)
+      Client.send(event)
+      LocalCache.consume(event)
+    }
   }
 
   fun boost(note: Note) {
     if (!isWriteable()) return
 
-    if (note.hasBoosted(userProfile())) {
+    if (note.hasBoostedInTheLast5Minutes(userProfile())) {
       // has already bosted in the past 5mins 
       return
     }
@@ -199,10 +249,11 @@ class Account(
   fun follow(user: User) {
     if (!isWriteable()) return
 
-    val lastestContactList = userProfile().latestContactList
-    val event = if (lastestContactList != null) {
+    val contactList = userProfile().latestContactList
+
+    val event = if (contactList != null && contactList.follows.size > 0) {
       ContactListEvent.create(
-        lastestContactList.follows.plus(Contact(user.pubkeyHex, null)),
+        contactList.follows.plus(Contact(user.pubkeyHex, null)),
         userProfile().relays,
         loggedIn.privKey!!)
     } else {
@@ -221,12 +272,14 @@ class Account(
   fun unfollow(user: User) {
     if (!isWriteable()) return
 
-    val lastestContactList = userProfile().latestContactList
-    if (lastestContactList != null) {
+    val contactList = userProfile().latestContactList
+
+    if (contactList != null && contactList.follows.size > 0) {
       val event = ContactListEvent.create(
-        lastestContactList.follows.filter { it.pubKeyHex != user.pubkeyHex },
+        contactList.follows.filter { it.pubKeyHex != user.pubkeyHex },
         userProfile().relays,
         loggedIn.privKey!!)
+
       Client.send(event)
       LocalCache.consume(event)
     }
@@ -265,14 +318,50 @@ class Account(
     LocalCache.consume(signedEvent, null)
   }
 
+  fun createPrivateMessageWithReply(
+    recipientPubKey: ByteArray,
+    msg: String,
+    replyTos: List<String>? = null, mentions: List<String>? = null,
+    privateKey: ByteArray,
+    createdAt: Long = Date().time / 1000,
+    publishedRecipientPubKey: ByteArray? = null,
+    advertiseNip18: Boolean = true
+  ): PrivateDmEvent {
+    val content = Utils.encrypt(
+      if (advertiseNip18) {
+        PrivateDmEvent.nip18Advertisement
+      } else { "" } + msg,
+      privateKey,
+      recipientPubKey)
+    val pubKey = Utils.pubkeyCreate(privateKey)
+    val tags = mutableListOf<List<String>>()
+    publishedRecipientPubKey?.let {
+      tags.add(listOf("p", publishedRecipientPubKey.toHex()))
+    }
+    replyTos?.forEach {
+      tags.add(listOf("e", it))
+    }
+    mentions?.forEach {
+      tags.add(listOf("p", it))
+    }
+    val id = Event.generateId(pubKey, createdAt, PrivateDmEvent.kind, tags, content)
+    val sig = Utils.sign(id, privateKey)
+    return PrivateDmEvent(id, pubKey, createdAt, tags, content, sig)
+  }
+
   fun sendPrivateMeesage(message: String, toUser: String, replyingTo: Note? = null) {
     if (!isWriteable()) return
     val user = LocalCache.users[toUser] ?: return
 
-    val signedEvent = PrivateDmEvent.create(
-      recipientPubKey = user.pubkey,
-      publishedRecipientPubKey = user.pubkey,
+    val repliesToHex = listOfNotNull(replyingTo?.idHex).ifEmpty { null }
+    val mentionsHex = emptyList<String>()
+
+    val signedEvent = createPrivateMessageWithReply(
+      recipientPubKey = user.pubkey(),
+      publishedRecipientPubKey = user.pubkey(),
       msg = message,
+      replyTos = repliesToHex,
+      mentions = mentionsHex,
       privateKey = loggedIn.privKey!!,
       advertiseNip18 = false
     )
@@ -300,22 +389,35 @@ class Account(
 
   fun joinChannel(idHex: String) {
     followingChannels = followingChannels + idHex
-    invalidateData(live)
+    live.invalidateData()
+
+    saveable.invalidateData()
   }
 
   fun leaveChannel(idHex: String) {
     followingChannels = followingChannels - idHex
-    invalidateData(live)
+    live.invalidateData()
+
+    saveable.invalidateData()
   }
 
   fun hideUser(pubkeyHex: String) {
     hiddenUsers = hiddenUsers + pubkeyHex
-    invalidateData(live)
+    live.invalidateData()
+    saveable.invalidateData()
   }
 
   fun showUser(pubkeyHex: String) {
     hiddenUsers = hiddenUsers - pubkeyHex
-    invalidateData(live)
+    transientHiddenUsers = transientHiddenUsers - pubkeyHex
+    live.invalidateData()
+    saveable.invalidateData()
+  }
+
+  fun changeZapAmounts(newAmounts: List<Long>) {
+    zapAmountChoices = newAmounts
+    live.invalidateData()
+    saveable.invalidateData()
   }
 
   fun sendChangeChannel(name: String, about: String, picture: String, channel: Channel) {
@@ -369,12 +471,35 @@ class Account(
 
   fun addDontTranslateFrom(languageCode: String) {
     dontTranslateFrom = dontTranslateFrom.plus(languageCode)
-    invalidateData(liveLanguages)
+    liveLanguages.invalidateData()
+
+    saveable.invalidateData()
   }
 
   fun updateTranslateTo(languageCode: String) {
     translateTo = languageCode
-    invalidateData(liveLanguages)
+    liveLanguages.invalidateData()
+
+    saveable.invalidateData()
+  }
+
+  fun prefer(source: String, target: String, preference: String) {
+    languagePreferences = languagePreferences + Pair("$source,$target", preference)
+    saveable.invalidateData()
+  }
+
+  fun preferenceBetween(source: String, target: String): String? {
+    return languagePreferences.get("$source,$target")
+  }
+
+  private fun updateContactListTo(newContactList: ContactListEvent?) {
+    if (newContactList?.follows.isNullOrEmpty()) return
+
+    // Events might be different objects, we have to compare their ids.
+    if (backupContactList?.id?.toHex() != newContactList?.id?.toHex()) {
+      backupContactList = newContactList
+      saveable.invalidateData()
+    }
   }
 
   fun activeRelays(): Array<Relay>? {
@@ -390,39 +515,19 @@ class Account(
     }.toTypedArray()
   }
 
-  init {
-    userProfile().subscribe(object: User.Listener() {
-      override fun onRelayChange() {
-        Client.disconnect()
-        Client.connect(activeRelays() ?: convertLocalRelays())
-        RelayPool.requestAndWatch()
-      }
-    })
-  }
-
-  // Observers line up here.
-  val live: AccountLiveData = AccountLiveData(this)
-  val liveLanguages: AccountLiveData = AccountLiveData(this)
-
-  var handlerWaiting = AtomicBoolean()
-
-  @Synchronized
-  private fun invalidateData(live: AccountLiveData) {
-    if (handlerWaiting.getAndSet(true)) return
-
-    handlerWaiting.set(true)
-    val scope = CoroutineScope(Job() + Dispatchers.Default)
-    scope.launch {
-      delay(100)
-      live.refresh()
-      handlerWaiting.set(false)
+  fun reconnectIfRelaysHaveChanged() {
+    val newRelaySet = activeRelays() ?: convertLocalRelays()
+    if (!Client.isSameRelaySetConfig(newRelaySet)) {
+      Client.disconnect()
+      Client.connect(newRelaySet)
+      RelayPool.requestAndWatch()
     }
   }
 
-  fun isHidden(user: User) = user in hiddenUsers()
+  fun isHidden(user: User) = user.pubkeyHex in hiddenUsers || user.pubkeyHex in transientHiddenUsers
 
   fun isAcceptable(user: User): Boolean {
-    return user !in hiddenUsers()  // if user hasn't hided this author
+    return !isHidden(user)  // if user hasn't hided this author
         && user.reportsBy( userProfile() ).isEmpty() // if user has not reported this post
         && user.reportAuthorsBy( userProfile().follows ).size < 5
   }
@@ -457,10 +562,67 @@ class Account(
   fun saveRelayList(value: List<RelaySetupInfo>) {
     localRelays = value.toSet()
     sendNewRelayList(value.associate { it.url to ContactListEvent.ReadWrite(it.read, it.write) } )
+
+    saveable.invalidateData()
+  }
+
+  init {
+    backupContactList?.let {
+      println("Loading saved contacts ${it.toJson()}")
+      if (userProfile().latestContactList == null) {
+        LocalCache.consume(it)
+      }
+    }
+
+    // Observes relays to restart connections
+    userProfile().live().relays.observeForever {
+      GlobalScope.launch(Dispatchers.IO) {
+        reconnectIfRelaysHaveChanged()
+      }
+    }
+
+    // saves contact list for the next time.
+    userProfile().live().follows.observeForever {
+      updateContactListTo(userProfile().latestContactList)
+    }
+
+    // imports transient blocks due to spam.
+    LocalCache.antiSpam.liveSpam.observeForever {
+      GlobalScope.launch(Dispatchers.IO) {
+        it.cache.spamMessages.snapshot().values.forEach {
+          if (it.pubkeyHex !in transientHiddenUsers && it.duplicatedMessages.size >= 5) {
+            val userToBlock = LocalCache.getOrCreateUser(it.pubkeyHex)
+            if (userToBlock != userProfile() && userToBlock !in userProfile().follows) {
+              transientHiddenUsers = transientHiddenUsers + it.pubkeyHex
+            }
+          }
+        }
+      }
+    }
   }
 }
 
 class AccountLiveData(private val account: Account): LiveData<AccountState>(AccountState(account)) {
+  var handlerWaiting = AtomicBoolean()
+
+  @Synchronized
+  fun invalidateData() {
+    if (handlerWaiting.getAndSet(true)) return
+
+    handlerWaiting.set(true)
+    val scope = CoroutineScope(Job() + Dispatchers.Default)
+    scope.launch {
+      try {
+        delay(100)
+        refresh()
+      } finally {
+        withContext(NonCancellable) {
+          handlerWaiting.set(false)
+        }
+      }
+    }
+  }
+
   fun refresh() {
     postValue(AccountState(account))
   }

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

@@ -0,0 +1,96 @@
+package com.vitorpamplona.amethyst.model
+
+import android.util.Log
+import android.util.LruCache
+import androidx.lifecycle.LiveData
+import java.util.concurrent.atomic.AtomicBoolean
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.NonCancellable
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import nostr.postr.events.Event
+import nostr.postr.toHex
+
+data class Spammer(val pubkeyHex: HexKey, var duplicatedMessages: Set<HexKey>)
+
+class AntiSpamFilter {
+  val recentMessages = LruCache<Int, String>(1000)
+  val spamMessages = LruCache<Int, Spammer>(1000)
+
+  @Synchronized
+  fun isSpam(event: Event): Boolean {
+    val idHex = event.id.toHexKey()
+
+    // if already processed, ok
+    if (LocalCache.notes[idHex] != null) return false
+
+    // if short message, ok
+    if (event.content.length < 50) return false
+
+    // double list strategy:
+    // if duplicated, it goes into spam. 1000 spam messages are saved into the spam list.
+
+    // Considers tags so that same replies to different people don't count.
+    val hash = (event.content + event.tags.flatten().joinToString(",")).hashCode()
+
+    if ((recentMessages[hash] != null && recentMessages[hash] != idHex) || spamMessages[hash] != null) {
+      Log.w("Potential SPAM Message", "${event.id.toHex()} ${recentMessages[hash]} ${spamMessages[hash] != null} ${event.content.replace("\n", " | ")}")
+
+      // Log down offenders
+      if (spamMessages.get(hash) == null) {
+        spamMessages.put(hash, Spammer(event.pubKey.toHexKey(), setOf(recentMessages[hash], event.id.toHex())))
+        liveSpam.invalidateData()
+      } else {
+        val spammer = spamMessages.get(hash)
+        spammer.duplicatedMessages = spammer.duplicatedMessages + event.id.toHex()
+
+        liveSpam.invalidateData()
+      }
+
+      return true
+    }
+
+    recentMessages.put(hash, idHex)
+
+    return false
+  }
+
+  val liveSpam: AntiSpamLiveData = AntiSpamLiveData(this)
+}
+
+
+class AntiSpamLiveData(val cache: AntiSpamFilter): LiveData<AntiSpamState>(AntiSpamState(cache)) {
+
+  // Refreshes observers in batches.
+  var handlerWaiting = AtomicBoolean()
+
+  @Synchronized
+  fun invalidateData() {
+    if (!hasActiveObservers()) return
+    if (handlerWaiting.getAndSet(true)) return
+
+    handlerWaiting.set(true)
+    val scope = CoroutineScope(Job() + Dispatchers.Main)
+    scope.launch {
+      try {
+        delay(100)
+        refresh()
+      } finally {
+        withContext(NonCancellable) {
+          handlerWaiting.set(false)
+        }
+      }
+    }
+  }
+
+  private fun refresh() {
+    postValue(AntiSpamState(cache))
+  }
+}
+
+class AntiSpamState(val cache: AntiSpamFilter) {
+
+}

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

@@ -1,15 +1,15 @@
 package com.vitorpamplona.amethyst.model
 
 import androidx.lifecycle.LiveData
+import com.vitorpamplona.amethyst.service.NostrSingleChannelDataSource
 import com.vitorpamplona.amethyst.service.NostrSingleEventDataSource
 import com.vitorpamplona.amethyst.service.model.ChannelCreateEvent
+import com.vitorpamplona.amethyst.ui.dal.ChannelFeedFilter
 import com.vitorpamplona.amethyst.ui.note.toShortenHex
+import fr.acinq.secp256k1.Hex
 import java.util.concurrent.ConcurrentHashMap
 
-class Channel(val id: ByteArray) {
-    val idHex = id.toHexKey()
-    val idDisplayHex = id.toShortenHex()
-
+class Channel(val idHex: String) {
     var creator: User? = null
     var info = ChannelCreateEvent.ChannelData(null, null, null)
 
@@ -17,8 +17,12 @@ class Channel(val id: ByteArray) {
 
     val notes = ConcurrentHashMap<HexKey, Note>()
 
+    fun id() = Hex.decode(idHex)
+    fun idNote() = id().toNote()
+    fun idDisplayNote() = idNote().toShortenHex()
+
     fun toBestDisplayName(): String {
-        return info.name ?: idDisplayHex
+        return info.name ?: idDisplayNote()
     }
 
     @Synchronized
@@ -47,8 +51,21 @@ class Channel(val id: ByteArray) {
     // Observers line up here.
     val live: ChannelLiveData = ChannelLiveData(this)
 
-    private fun refreshObservers() {
-        live.refresh()
+    fun pruneOldAndHiddenMessages(account: Account): Set<Note> {
+        val important = notes.values
+            .filter { it.author?.let { it1 -> account.isHidden(it1) } == false }
+            .sortedBy { it.event?.createdAt }
+            .reversed()
+            .take(1000)
+            .toSet()
+
+        val toBeRemoved = notes.values.filter { it !in important }.toSet()
+
+        toBeRemoved.forEach {
+            notes.remove(it.idHex)
+        }
+
+        return toBeRemoved
     }
 }
 
@@ -60,12 +77,12 @@ class ChannelLiveData(val channel: Channel): LiveData<ChannelState>(ChannelState
 
     override fun onActive() {
         super.onActive()
-        NostrSingleEventDataSource.add(channel.idHex)
+        NostrSingleChannelDataSource.add(channel.idHex)
     }
 
     override fun onInactive() {
         super.onInactive()
-        NostrSingleEventDataSource.remove(channel.idHex)
+        NostrSingleChannelDataSource.remove(channel.idHex)
     }
 }
 

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

@@ -41,8 +41,43 @@ fun decodePublicKey(key: String): ByteArray {
     Persona(privKey = key.bechToBytes()).pubKey
   } else if (key.startsWith("npub")) {
     key.bechToBytes()
+  } else if (key.startsWith("note")) {
+    key.bechToBytes()
   } else { //if (pattern.matcher(key).matches()) {
   //} else {
     Hex.decode(key)
   }
+}
+
+data class DirtyKeyInfo(val type: String, val keyHex: String, val restOfWord: String)
+
+fun parseDirtyWordForKey(mightBeAKey: String): DirtyKeyInfo? {
+  var key = mightBeAKey
+  if (key.startsWith("nostr:", true)) {
+    key = key.substring("nostr:".length)
+  }
+
+  key = key.removePrefix("@")
+
+  if (key.length < 63)
+    return null
+
+  try {
+
+    val keyB32 = key.substring(0, 63)
+    val restOfWord = key.substring(63)
+
+    if (key.startsWith("nsec1", true)) {
+      return DirtyKeyInfo("npub", Persona(privKey = keyB32.bechToBytes()).pubKey.toHexKey(), restOfWord)
+    } else if (key.startsWith("npub1", true)) {
+      return DirtyKeyInfo("npub", keyB32.bechToBytes().toHexKey(), restOfWord)
+    } else if (key.startsWith("note1", true)) {
+      return DirtyKeyInfo("note", keyB32.bechToBytes().toHexKey(), restOfWord)
+    }
+
+  } catch (e: Exception) {
+    e.printStackTrace()
+  }
+
+  return null
 }

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

@@ -15,13 +15,21 @@ import com.vitorpamplona.amethyst.service.model.LnZapRequestEvent
 import com.vitorpamplona.amethyst.service.model.ReactionEvent
 import com.vitorpamplona.amethyst.service.model.ReportEvent
 import com.vitorpamplona.amethyst.service.model.RepostEvent
+import com.vitorpamplona.amethyst.service.relays.Relay
+import fr.acinq.secp256k1.Hex
 import java.io.ByteArrayInputStream
 import java.time.Instant
 import java.time.ZoneId
 import java.time.format.DateTimeFormatter
-import java.util.Collections
 import java.util.concurrent.ConcurrentHashMap
-import com.vitorpamplona.amethyst.service.relays.Relay
+import java.util.concurrent.atomic.AtomicBoolean
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.NonCancellable
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import nostr.postr.events.ContactListEvent
 import nostr.postr.events.DeletionEvent
 import nostr.postr.events.Event
@@ -38,10 +46,22 @@ object LocalCache {
     .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
     .readerFor(UserMetadata::class.java)
 
+  val antiSpam = AntiSpamFilter()
+
   val users = ConcurrentHashMap<HexKey, User>()
   val notes = ConcurrentHashMap<HexKey, Note>()
   val channels = ConcurrentHashMap<HexKey, Channel>()
 
+  fun checkGetOrCreateUser(key: String): User? {
+    return try {
+      val checkHex = Hex.decode(key).toNpub() // Checks if this is a valid Hex
+      getOrCreateUser(key)
+    } catch (e: IllegalArgumentException) {
+      Log.e("LocalCache", "Invalid Key to create user: $key", e)
+      null
+    }
+  }
+
   @Synchronized
   fun getOrCreateUser(key: HexKey): User {
     return users[key] ?: run {
@@ -51,6 +71,16 @@ object LocalCache {
     }
   }
 
+  fun checkGetOrCreateNote(key: String): Note? {
+    return try {
+      val checkHex = Hex.decode(key).toNote() // Checks if this is a valid Hex
+      getOrCreateNote(key)
+    } catch (e: IllegalArgumentException) {
+      Log.e("LocalCache", "Invalid Key to create note: $key", e)
+      null
+    }
+  }
+
   @Synchronized
   fun getOrCreateNote(idHex: String): Note {
     return notes[idHex] ?: run {
@@ -60,10 +90,21 @@ object LocalCache {
     }
   }
 
+  fun checkGetOrCreateChannel(key: String): Channel? {
+    return try {
+      val checkHex = Hex.decode(key).toNote() // Checks if this is a valid Hex
+      getOrCreateChannel(key)
+    } catch (e: IllegalArgumentException) {
+      Log.e("LocalCache", "Invalid Key to create channel: $key", e)
+      null
+    }
+  }
+
+
   @Synchronized
   fun getOrCreateChannel(key: String): Channel {
     return channels[key] ?: run {
-      val answer = Channel(key.toByteArray())
+      val answer = Channel(key)
       channels.put(key, answer)
       answer
     }
@@ -73,18 +114,19 @@ object LocalCache {
   fun consume(event: MetadataEvent) {
     // new event
     val oldUser = getOrCreateUser(event.pubKey.toHexKey())
-    if (event.createdAt > oldUser.updatedMetadataAt) {
+    if (oldUser.info == null || event.createdAt > oldUser.info!!.updatedMetadataAt) {
       val newUser = try {
-        metadataParser.readValue<UserMetadata>(ByteArrayInputStream(event.content.toByteArray(Charsets.UTF_8)), UserMetadata::class.java)
+        metadataParser.readValue(
+          ByteArrayInputStream(event.content.toByteArray(Charsets.UTF_8)),
+          UserMetadata::class.java
+        )
       } catch (e: Exception) {
         e.printStackTrace()
         Log.w("MT", "Content Parse Error ${e.localizedMessage} ${event.content}")
         return
       }
 
-      oldUser.updateUserInfo(newUser, event.createdAt)
-      oldUser.latestMetadata = event
-
+      oldUser.updateUserInfo(newUser, event)
       //Log.d("MT", "New User Metadata ${oldUser.pubkeyDisplayHex} ${oldUser.toBestDisplayName()}")
     } else {
       //Log.d("MT","Relay sent a previous Metadata Event ${oldUser.toBestDisplayName()} ${formattedDateTime(event.createdAt)} > ${formattedDateTime(oldUser.updatedAt)}")
@@ -96,21 +138,28 @@ object LocalCache {
       .format(DateTimeFormatter.ofPattern("uuuu MMM d hh:mm a"))
   }
 
-  fun consume(event: TextNoteEvent, relay: Relay? = null) {
-    val note = getOrCreateNote(event.id.toHex())
 
+  fun consume(event: TextNoteEvent, relay: Relay? = null) {
+    if (antiSpam.isSpam(event)) {
+      relay?.let {
+        it.spamCounter++
+      }
+      return
+    }
+
+    val note = getOrCreateNote(event.id.toHex())
     val author = getOrCreateUser(event.pubKey.toHexKey())
 
     if (relay != null) {
-      author.addRelay(relay, event.createdAt)
+      author.addRelayBeingUsed(relay, event.createdAt)
       note.addRelay(relay)
     }
 
     // Already processed this event.
     if (note.event != null) return
 
-    val mentions = event.mentions.map { getOrCreateUser(it) }
-    val replyTo = event.replyTos.map { getOrCreateNote(it) }
+    val mentions = event.mentions.mapNotNull { checkGetOrCreateUser(it) }
+    val replyTo = replyToWithoutCitations(event).mapNotNull { checkGetOrCreateNote(it) }
 
     note.loadEvent(event, author, mentions, replyTo)
 
@@ -135,6 +184,24 @@ object LocalCache {
     refreshObservers()
   }
 
+  private fun replyToWithoutCitations(event: TextNoteEvent): List<String> {
+    var citations = mutableSetOf<String>()
+    // Removes citations from replies:
+    val matcher = tagSearch.matcher(event.content)
+    while (matcher.find()) {
+      try {
+        val tag = matcher.group(1)?.let { event.tags[it.toInt()] }
+        if (tag != null && tag[0] == "e") {
+          citations.add(tag[1])
+        }
+      } catch (e: Exception) {
+
+      }
+    }
+
+    return event.replyTos.filter { it !in citations }
+  }
+
   fun consume(event: RecommendRelayEvent) {
     //Log.d("RR", event.toJson())
   }
@@ -142,8 +209,10 @@ object LocalCache {
   fun consume(event: ContactListEvent) {
     val user = getOrCreateUser(event.pubKey.toHexKey())
 
-    if (event.createdAt > user.updatedFollowsAt) {
-      //Log.d("CL", "AAA ${user.toBestDisplayName()} ${event.follows.size}")
+    if (event.createdAt > user.updatedFollowsAt && event.follows.isNotEmpty()) {
+      // Saves relay list only if it's a user that is currently been seen
+      user.latestContactList = event
+
       user.updateFollows(
         event.follows.map {
           try {
@@ -159,6 +228,7 @@ object LocalCache {
         event.createdAt
       )
 
+      // Saves relay list only if it's a user that is currently been seen
       try {
         if (event.content.isNotEmpty()) {
           val relays: Map<String, ContactListEvent.ReadWrite> =
@@ -170,10 +240,14 @@ object LocalCache {
           user.updateRelays(relays)
         }
       } catch (e: Exception) {
+        println("relay import issue")
         e.printStackTrace()
       }
 
-      user.latestContactList = event
+      Log.d(
+        "CL",
+        "AAA ${user.toBestDisplayName()} ${event.follows.size}"
+      )
     }
   }
 
@@ -182,7 +256,7 @@ object LocalCache {
     val author = getOrCreateUser(event.pubKey.toHexKey())
 
     if (relay != null) {
-      author.addRelay(relay, event.createdAt)
+      author.addRelayBeingUsed(relay, event.createdAt)
       note.addRelay(relay)
     }
 
@@ -193,8 +267,8 @@ object LocalCache {
 
     //Log.d("PM", "${author.toBestDisplayName()} to ${recipient?.toBestDisplayName()}")
 
-    val repliesTo = event.tags.filter { it.firstOrNull() == "e" }.mapNotNull { it.getOrNull(1) }.map { getOrCreateNote(it) }
-    val mentions = event.tags.filter { it.firstOrNull() == "p" }.mapNotNull { it.getOrNull(1) }.map { getOrCreateUser(it) }
+    val repliesTo = event.tags.filter { it.firstOrNull() == "e" }.mapNotNull { it.getOrNull(1) }.mapNotNull { checkGetOrCreateNote(it) }
+    val mentions = event.tags.filter { it.firstOrNull() == "p" }.mapNotNull { it.getOrNull(1) }.mapNotNull { checkGetOrCreateUser(it) }
 
     note.loadEvent(event, author, mentions, repliesTo)
 
@@ -207,7 +281,41 @@ object LocalCache {
   }
 
   fun consume(event: DeletionEvent) {
-    //Log.d("DEL", event.toJson())
+    var deletedAtLeastOne = false
+
+    event.deleteEvents.mapNotNull { notes[it] }.forEach { deleteNote ->
+      // must be the same author
+      if (deleteNote.author?.pubkeyHex == event.pubKey.toHexKey()) {
+        deleteNote.author?.removeNote(deleteNote)
+
+        // reverts the add
+        deleteNote.mentions?.forEach { user ->
+          user.removeTaggedPost(deleteNote)
+          user.removeReport(deleteNote)
+        }
+
+        deleteNote.replyTo?.forEach { replyingNote ->
+          replyingNote.author?.removeTaggedPost(deleteNote)
+        }
+
+        // Counts the replies
+        deleteNote.replyTo?.forEach { masterNote ->
+          masterNote.removeReply(deleteNote)
+          masterNote.removeBoost(deleteNote)
+          masterNote.removeReaction(deleteNote)
+          masterNote.removeZap(deleteNote)
+          masterNote.removeReport(deleteNote)
+        }
+
+        notes.remove(deleteNote.idHex)
+
+        deletedAtLeastOne = true
+      }
+    }
+
+    if (deletedAtLeastOne) {
+      live.invalidateData()
+    }
   }
 
   fun consume(event: RepostEvent) {
@@ -219,8 +327,8 @@ object LocalCache {
     //Log.d("TN", "New Boost (${notes.size},${users.size}) ${note.author?.toBestDisplayName()} ${formattedDateTime(event.createdAt)}")
 
     val author = getOrCreateUser(event.pubKey.toHexKey())
-    val mentions = event.originalAuthor.map { getOrCreateUser(it) }
-    val repliesTo = event.boostedPost.map { getOrCreateNote(it) }
+    val mentions = event.originalAuthor.mapNotNull { checkGetOrCreateUser(it) }
+    val repliesTo = event.boostedPost.mapNotNull { checkGetOrCreateNote(it) }
 
     note.loadEvent(event, author, mentions, repliesTo)
 
@@ -250,8 +358,8 @@ object LocalCache {
     if (note.event != null) return
 
     val author = getOrCreateUser(event.pubKey.toHexKey())
-    val mentions = event.originalAuthor.map { getOrCreateUser(it) }
-    val repliesTo = event.originalPost.map { getOrCreateNote(it) }
+    val mentions = event.originalAuthor.mapNotNull { checkGetOrCreateUser(it) }
+    val repliesTo = event.originalPost.mapNotNull { checkGetOrCreateNote(it) }
 
     note.loadEvent(event, author, mentions, repliesTo)
 
@@ -288,15 +396,20 @@ object LocalCache {
     }
   }
 
-  fun consume(event: ReportEvent) {
+  fun consume(event: ReportEvent, relay: Relay?) {
     val note = getOrCreateNote(event.id.toHex())
+    val author = getOrCreateUser(event.pubKey.toHexKey())
+
+    if (relay != null) {
+      author.addRelayBeingUsed(relay, event.createdAt)
+      note.addRelay(relay)
+    }
 
     // Already processed this event.
     if (note.event != null) return
 
-    val author = getOrCreateUser(event.pubKey.toHexKey())
-    val mentions = event.reportedAuthor.map { getOrCreateUser(it) }
-    val repliesTo = event.reportedPost.map { getOrCreateNote(it) }
+    val mentions = event.reportedAuthor.mapNotNull { checkGetOrCreateUser(it) }
+    val repliesTo = event.reportedPost.mapNotNull { checkGetOrCreateNote(it) }
 
     note.loadEvent(event, author, mentions, repliesTo)
 
@@ -337,7 +450,7 @@ object LocalCache {
     if (event.channel.isNullOrBlank()) return
 
     // new event
-    val oldChannel = getOrCreateChannel(event.channel)
+    val oldChannel = checkGetOrCreateChannel(event.channel) ?: return
     val author = getOrCreateUser(event.pubKey.toHexKey())
     if (event.createdAt > oldChannel.updatedMetadataAt) {
       if (oldChannel.creator == null || oldChannel.creator == author) {
@@ -357,8 +470,14 @@ object LocalCache {
 
   fun consume(event: ChannelMessageEvent, relay: Relay?) {
     if (event.channel.isNullOrBlank()) return
+    if (antiSpam.isSpam(event)) {
+      relay?.let {
+        it.spamCounter++
+      }
+      return
+    }
 
-    val channel = getOrCreateChannel(event.channel)
+    val channel = checkGetOrCreateChannel(event.channel) ?: return
 
     val note = getOrCreateNote(event.id.toHex())
     channel.addNote(note)
@@ -366,16 +485,16 @@ object LocalCache {
     val author = getOrCreateUser(event.pubKey.toHexKey())
 
     if (relay != null) {
-      author.addRelay(relay, event.createdAt)
+      author.addRelayBeingUsed(relay, event.createdAt)
       note.addRelay(relay)
     }
 
     // Already processed this event.
     if (note.event != null) return
 
-    val mentions = event.mentions.map { getOrCreateUser(it) }
+    val mentions = event.mentions.mapNotNull { checkGetOrCreateUser(it) }
     val replyTo = event.replyTos
-      .map { getOrCreateNote(it) }
+      .mapNotNull { checkGetOrCreateNote(it) }
       .filter { it.event !is ChannelCreateEvent }
 
     note.channel = channel
@@ -414,8 +533,8 @@ object LocalCache {
     if (note.event != null) return
 
     val author = getOrCreateUser(event.pubKey.toHexKey())
-    val mentions = event.zappedAuthor.map { getOrCreateUser(it) }
-    val repliesTo = event.zappedPost.map { getOrCreateNote(it) }
+    val mentions = event.zappedAuthor.mapNotNull { checkGetOrCreateUser(it) }
+    val repliesTo = event.zappedPost.mapNotNull { checkGetOrCreateNote(it) }
 
     note.loadEvent(event, author, mentions, repliesTo)
 
@@ -425,7 +544,7 @@ object LocalCache {
       return
     }
 
-    Log.d("ZP", "New ZapEvent ${event.content} (${notes.size},${users.size}) ${note.author?.toBestDisplayName()} ${formattedDateTime(event.createdAt)}")
+    //Log.d("ZP", "New ZapEvent ${event.content} (${notes.size},${users.size}) ${note.author?.toBestDisplayName()} ${formattedDateTime(event.createdAt)}")
 
     // Adds notifications to users.
     mentions.forEach {
@@ -450,12 +569,12 @@ object LocalCache {
     if (note.event != null) return
 
     val author = getOrCreateUser(event.pubKey.toHexKey())
-    val mentions = event.zappedAuthor.map { getOrCreateUser(it) }
-    val repliesTo = event.zappedPost.map { getOrCreateNote(it) }
+    val mentions = event.zappedAuthor.mapNotNull { checkGetOrCreateUser(it) }
+    val repliesTo = event.zappedPost.mapNotNull { checkGetOrCreateNote(it) }
 
     note.loadEvent(event, author, mentions, repliesTo)
 
-    Log.d("ZP", "New Zap Request ${event.content} (${notes.size},${users.size}) ${note.author?.toBestDisplayName()} ${formattedDateTime(event.createdAt)}")
+    //Log.d("ZP", "New Zap Request ${event.content} (${notes.size},${users.size}) ${note.author?.toBestDisplayName()} ${formattedDateTime(event.createdAt)}")
 
     // Adds notifications to users.
     mentions.forEach {
@@ -475,9 +594,9 @@ object LocalCache {
 
   fun findUsersStartingWith(username: String): List<User> {
     return users.values.filter {
-           it.info.anyNameStartsWith(username)
+          (it.anyNameStartsWith(username))
         || it.pubkeyHex.startsWith(username, true)
-        || it.pubkey.toNpub().startsWith(username, true)
+        || it.pubkeyNpub().startsWith(username, true)
     }
   }
 
@@ -486,28 +605,156 @@ object LocalCache {
       (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)
+        || it.idNote().startsWith(text, true)
     }
   }
 
   fun findChannelsStartingWith(text: String): List<Channel> {
     return channels.values.filter {
-      it.anyNameStartsWith(text)
+        it.anyNameStartsWith(text)
         || it.idHex.startsWith(text, true)
-        || it.id.toNote().startsWith(text, true)
+        || it.idNote().startsWith(text, true)
     }
   }
 
+  fun cleanObservers() {
+    notes.forEach {
+      it.value.clearLive()
+    }
+
+    users.forEach {
+      it.value.clearLive()
+    }
+  }
+
+  fun pruneOldAndHiddenMessages(account: Account) {
+    channels.forEach {
+      val toBeRemoved = it.value.pruneOldAndHiddenMessages(account)
+
+      toBeRemoved.forEach {
+        notes.remove(it.idHex)
+        // Doesn't need to clean up the replies and mentions.. Too small to matter.
+
+        // reverts the add
+        it.mentions?.forEach { user ->
+          user.removeTaggedPost(it)
+        }
+        it.replyTo?.forEach { replyingNote ->
+          replyingNote.author?.removeTaggedPost(it)
+        }
+
+        // Counts the replies
+        it.replyTo?.forEach { replyingNote ->
+          it.removeReply(it)
+        }
+      }
+
+      println("PRUNE: ${toBeRemoved.size} messages removed from ${it.value.info.name}")
+    }
+  }
+
+  fun pruneNonFollows(account: Account) {
+    val follows = account.userProfile().follows
+    val knownPMs = account.userProfile().privateChatrooms.filter {
+      account.userProfile().hasSentMessagesTo(it.key) && account.isAcceptable(it.key)
+    }
+
+    val followsFollow = follows.map {
+      it.follows
+    }.flatten()
+
+    val followSet = follows.plus(knownPMs).plus(account.userProfile()).plus(followsFollow)
+
+    val toBeRemoved = notes
+      .filter {
+        (it.value.author == null || it.value.author!! !in followSet) && it.value.event?.kind == TextNoteEvent.kind && it.value.liveSet?.isInUse() != true
+      }
+
+    toBeRemoved.forEach {
+      notes.remove(it.key)
+    }
+
+    val toBeRemovedUsers = users
+      .filter {
+        (it.value !in followSet) && it.value.liveSet?.isInUse() != true
+      }
+
+    toBeRemovedUsers.forEach {
+      users.remove(it.key)
+    }
+
+    println("PRUNE: ${toBeRemoved.size} messages removed because they came from NonFollows")
+    println("PRUNE: ${toBeRemovedUsers.size} users removed because are NonFollows")
+  }
+
+  fun pruneHiddenMessages(account: Account) {
+    val toBeRemoved = account.hiddenUsers.map {
+      users[it]?.notes ?: emptySet()
+    }.flatten()
+
+    account.hiddenUsers.forEach {
+      users[it]?.clearNotes()
+    }
+
+    toBeRemoved.forEach {
+      it.author?.removeNote(it)
+
+      // reverts the add
+      it.mentions?.forEach { user ->
+        user.removeTaggedPost(it)
+      }
+      it.replyTo?.forEach { replyingNote ->
+        replyingNote.author?.removeTaggedPost(it)
+      }
+
+      // Counts the replies
+      it.replyTo?.forEach { masterNote ->
+        masterNote.removeReply(it)
+        masterNote.removeBoost(it)
+        masterNote.removeReaction(it)
+        masterNote.removeZap(it)
+        masterNote.removeReport(it)
+      }
+
+      notes.remove(it.idHex)
+    }
+
+    println("PRUNE: ${toBeRemoved.size} messages removed because they were Hidden")
+  }
+
   // Observers line up here.
   val live: LocalCacheLiveData = LocalCacheLiveData(this)
 
   private fun refreshObservers() {
-    live.refresh()
+    live.invalidateData()
   }
 }
 
 class LocalCacheLiveData(val cache: LocalCache): LiveData<LocalCacheState>(LocalCacheState(cache)) {
-  fun refresh() {
+
+  // Refreshes observers in batches.
+  var handlerWaiting = AtomicBoolean()
+
+  @Synchronized
+  fun invalidateData() {
+    if (!hasActiveObservers()) return
+    if (handlerWaiting.getAndSet(true)) return
+
+    handlerWaiting.set(true)
+    val scope = CoroutineScope(Job() + Dispatchers.Main)
+    scope.launch {
+      try {
+        delay(100)
+        refresh()
+      } finally {
+        withContext(NonCancellable) {
+          handlerWaiting.set(false)
+        }
+      }
+    }
+  }
+
+  private fun refresh() {
     postValue(LocalCacheState(cache))
   }
 }

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

@@ -1,7 +1,6 @@
 package com.vitorpamplona.amethyst.model
 
 import androidx.lifecycle.LiveData
-import com.vitorpamplona.amethyst.lnurl.LnInvoiceUtil
 import com.vitorpamplona.amethyst.service.NostrSingleEventDataSource
 import com.vitorpamplona.amethyst.service.model.LnZapEvent
 import com.vitorpamplona.amethyst.service.model.ReactionEvent
@@ -11,7 +10,6 @@ import fr.acinq.secp256k1.Hex
 import java.time.Instant
 import java.time.ZoneId
 import java.time.format.DateTimeFormatter
-import java.util.Collections
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
@@ -21,18 +19,12 @@ import com.vitorpamplona.amethyst.service.relays.Relay
 import java.math.BigDecimal
 import java.util.Date
 import java.util.concurrent.atomic.AtomicBoolean
-import java.util.regex.Matcher
 import java.util.regex.Pattern
 import nostr.postr.events.Event
 
 val tagSearch = Pattern.compile("(?:\\s|\\A)\\#\\[([0-9]+)\\]")
 
 class Note(val idHex: String) {
-    // These fields are always available.
-    // They are immutable
-    val id = Hex.decode(idHex)
-    val idDisplayNote = id.toNote().toShortenHex()
-
     // These fields are only available after the Text Note event is received.
     // They are immutable after that.
     var event: Event? = null
@@ -59,13 +51,17 @@ class Note(val idHex: String) {
 
     var lastReactionsDownloadTime: Long? = null
 
+    fun id() = Hex.decode(idHex)
+    fun idNote() = id().toNote()
+    fun idDisplayNote() = idNote().toShortenHex()
+
     fun loadEvent(event: Event, author: User, mentions: List<User>, replyTo: List<Note>) {
         this.event = event
         this.author = author
         this.mentions = mentions
         this.replyTo = replyTo
 
-        live.invalidateData()
+        liveSet?.metadata?.invalidateData()
     }
 
     fun formattedDateTime(timestamp: Long): String {
@@ -73,56 +69,97 @@ class Note(val idHex: String) {
             .format(DateTimeFormatter.ofPattern("uuuu-MM-dd-HH:mm:ss"))
     }
 
-    fun replyLevelSignature(): String {
+    /**
+     * This method caches signatures during each execution to avoid recalculation in longer threads
+     */
+    fun replyLevelSignature(cachedSignatures: MutableMap<Note, String> = mutableMapOf()): String {
         val replyTo = replyTo
         if (replyTo == null || replyTo.isEmpty()) {
             return "/" + formattedDateTime(event?.createdAt ?: 0) + ";"
         }
 
         return replyTo
-            .map { it.replyLevelSignature() }
+            .map {
+                cachedSignatures[it] ?: it.replyLevelSignature(cachedSignatures).apply { cachedSignatures.put(it, this) }
+            }
             .maxBy { it.length }.removeSuffix(";") + "/" + formattedDateTime(event?.createdAt ?: 0) + ";"
     }
 
-    fun replyLevel(): Int {
+    fun replyLevel(cachedLevels: MutableMap<Note, Int> = mutableMapOf()): Int {
         val replyTo = replyTo
         if (replyTo == null || replyTo.isEmpty()) {
             return 0
         }
 
         return replyTo.maxOf {
-            it.replyLevel()
+            cachedLevels[it] ?: it.replyLevel(cachedLevels).apply { cachedLevels.put(it, this) }
         } + 1
     }
 
     fun addReply(note: Note) {
         if (note !in replies) {
             replies = replies + note
-            liveReplies.invalidateData()
+            liveSet?.replies?.invalidateData()
         }
     }
 
+    fun removeReply(note: Note) {
+        replies = replies - note
+        liveSet?.replies?.invalidateData()
+    }
+    fun removeBoost(note: Note) {
+        boosts = boosts - note
+        liveSet?.boosts?.invalidateData()
+    }
+    fun removeReaction(note: Note) {
+        reactions = reactions - note
+        liveSet?.reactions?.invalidateData()
+    }
+
+    fun removeReport(deleteNote: Note) {
+        val author = deleteNote.author ?: return
+
+        if (author in reports.keys && reports[author]?.contains(deleteNote) == true ) {
+            reports[author]?.let {
+                reports = reports + Pair(author, it.minus(deleteNote))
+                liveSet?.reports?.invalidateData()
+            }
+        }
+    }
+
+    fun removeZap(note: Note) {
+        if (zaps[note] != null) {
+            zaps = zaps.minus(note)
+            liveSet?.zaps?.invalidateData()
+        } else if (zaps.containsValue(note)) {
+            val toRemove = zaps.filterValues { it == note }
+            zaps = zaps.minus(toRemove.keys)
+            liveSet?.zaps?.invalidateData()
+        }
+    }
+
+
     fun addBoost(note: Note) {
         if (note !in boosts) {
             boosts = boosts + note
-            liveBoosts.invalidateData()
+            liveSet?.boosts?.invalidateData()
         }
     }
 
     fun addZap(zapRequest: Note, zap: Note?) {
         if (zapRequest !in zaps.keys) {
             zaps = zaps + Pair(zapRequest, zap)
-            liveZaps.invalidateData()
+            liveSet?.zaps?.invalidateData()
         } else if (zapRequest in zaps.keys && zaps[zapRequest] == null) {
             zaps = zaps + Pair(zapRequest, zap)
-            liveZaps.invalidateData()
+            liveSet?.zaps?.invalidateData()
         }
     }
 
     fun addReaction(note: Note) {
         if (note !in reactions) {
             reactions = reactions + note
-            liveReactions.invalidateData()
+            liveSet?.reactions?.invalidateData()
         }
     }
 
@@ -131,17 +168,17 @@ class Note(val idHex: String) {
 
         if (author !in reports.keys) {
             reports = reports + Pair(author, setOf(note))
-            liveReports.invalidateData()
-        } else {
+            liveSet?.reports?.invalidateData()
+        } else if (reports[author]?.contains(note) == false) {
             reports = reports + Pair(author, (reports[author] ?: emptySet()) + note)
-            liveReports.invalidateData()
+            liveSet?.reports?.invalidateData()
         }
     }
 
     fun addRelay(relay: Relay) {
         if (relay.url !in relays) {
             relays = relays + relay.url
-            liveRelays.invalidateData()
+            liveSet?.relays?.invalidateData()
         }
     }
 
@@ -184,7 +221,7 @@ class Note(val idHex: String) {
         val dayAgo = Date().time / 1000 - 24*60*60
         return reports.isNotEmpty() ||
           (author?.reports?.values?.filter {
-              it.firstOrNull { it.event?.createdAt ?: 0 > dayAgo } != null
+              it.firstOrNull { ( it.event?.createdAt ?: 0 ) > dayAgo } != null
           }?.isNotEmpty() ?: false)
     }
 
@@ -195,7 +232,9 @@ class Note(val idHex: String) {
             try {
                 val tag = matcher.group(1)?.let { event?.tags?.get(it.toInt()) }
                 if (tag != null && tag[0] == "p") {
-                    returningList.add(LocalCache.getOrCreateUser(tag[1]))
+                    LocalCache.checkGetOrCreateUser(tag[1])?.let {
+                        returningList.add(it)
+                    }
                 }
             } catch (e: Exception) {
 
@@ -220,23 +259,59 @@ class Note(val idHex: String) {
     }
 
     fun hasReacted(loggedIn: User, content: String): Boolean {
-        return reactions.firstOrNull { it.author == loggedIn && it.event?.content == content } != null
+        return reactedBy(loggedIn, content).isNotEmpty()
     }
 
-    fun hasBoosted(loggedIn: User): Boolean {
+    fun reactedBy(loggedIn: User, content: String): List<Note> {
+        return reactions.filter { it.author == loggedIn && it.event?.content == content }
+    }
+
+    fun hasBoostedInTheLast5Minutes(loggedIn: User): Boolean {
         val currentTime = Date().time / 1000
         return boosts.firstOrNull { it.author == loggedIn && (it.event?.createdAt ?: 0) > currentTime - (60 * 5)} != null // 5 minute protection
     }
 
-    // Observers line up here.
-    val live: NoteLiveData = NoteLiveData(this)
+    fun boostedBy(loggedIn: User): List<Note> {
+        return boosts.filter { it.author == loggedIn }
+    }
 
-    val liveReactions: NoteLiveData = NoteLiveData(this)
-    val liveBoosts: NoteLiveData = NoteLiveData(this)
-    val liveReplies: NoteLiveData = NoteLiveData(this)
-    val liveReports: NoteLiveData = NoteLiveData(this)
-    val liveRelays: NoteLiveData = NoteLiveData(this)
-    val liveZaps: NoteLiveData = NoteLiveData(this)
+    var liveSet: NoteLiveSet? = null
+
+    fun live(): NoteLiveSet {
+        if (liveSet == null) {
+            liveSet = NoteLiveSet(this)
+        }
+        return liveSet!!
+    }
+
+    fun clearLive() {
+        if (liveSet != null && liveSet?.isInUse() == false) {
+            liveSet = null
+        }
+    }
+}
+
+
+class NoteLiveSet(u: Note) {
+    // Observers line up here.
+    val metadata: NoteLiveData = NoteLiveData(u)
+
+    val reactions: NoteLiveData = NoteLiveData(u)
+    val boosts: NoteLiveData = NoteLiveData(u)
+    val replies: NoteLiveData = NoteLiveData(u)
+    val reports: NoteLiveData = NoteLiveData(u)
+    val relays: NoteLiveData = NoteLiveData(u)
+    val zaps: NoteLiveData = NoteLiveData(u)
+
+    fun isInUse(): Boolean {
+        return metadata.hasObservers()
+          || reactions.hasObservers()
+          || boosts.hasObservers()
+          || replies.hasObservers()
+          || reports.hasObservers()
+          || relays.hasObservers()
+          || zaps.hasObservers()
+    }
 }
 
 class NoteLiveData(val note: Note): LiveData<NoteState>(NoteState(note)) {

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

@@ -9,5 +9,6 @@ data class RelaySetupInfo(
     val errorCount: Int = 0,
     val downloadCount: Int = 0,
     val uploadCount: Int = 0,
+    val spamCount: Int = 0,
     val feedTypes: Set<FeedType>
 )

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

@@ -0,0 +1,66 @@
+package com.vitorpamplona.amethyst.model
+
+import kotlin.time.ExperimentalTime
+import kotlin.time.measureTimedValue
+
+class ThreadAssembler {
+
+  fun searchRoot(note: Note, testedNotes: MutableSet<Note> = mutableSetOf()): Note? {
+    if (note.replyTo == null || note.replyTo?.isEmpty() == true) return note
+
+    testedNotes.add(note)
+
+    val markedAsRoot = note.event?.tags?.firstOrNull { it[0] == "e" && it.size > 3 && it[3] == "root" }?.getOrNull(1)
+    if (markedAsRoot != null) return LocalCache.checkGetOrCreateNote(markedAsRoot)
+
+    val hasNoReplyTo = note.replyTo?.firstOrNull { it.replyTo?.isEmpty() == true }
+    if (hasNoReplyTo != null) return hasNoReplyTo
+
+    // 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
+  }
+
+  @OptIn(ExperimentalTime::class)
+  fun findThreadFor(noteId: String): Set<Note> {
+    val (result, elapsed) = measureTimedValue {
+      val note = LocalCache.getOrCreateNote(noteId)
+
+      if (note.event != null) {
+        val thread = mutableSetOf<Note>()
+
+        val threadRoot = searchRoot(note, thread) ?: note
+
+        loadDown(threadRoot, thread)
+
+        thread.toSet()
+      } else {
+        setOf(note)
+      }
+    }
+
+    println("Model Refresh: Thread loaded in ${elapsed}")
+
+    return result
+  }
+
+  fun loadDown(note: Note, thread: MutableSet<Note>) {
+    if (note !in thread) {
+      thread.add(note)
+
+      note.replies.forEach {
+        loadDown(it, thread)
+      }
+    }
+  }
+}

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

@@ -1,42 +1,34 @@
 package com.vitorpamplona.amethyst.model
 
 import androidx.lifecycle.LiveData
-import com.vitorpamplona.amethyst.lnurl.LnInvoiceUtil
 import com.vitorpamplona.amethyst.service.NostrSingleUserDataSource
 import com.vitorpamplona.amethyst.service.model.LnZapEvent
 import com.vitorpamplona.amethyst.service.model.ReportEvent
-import com.vitorpamplona.amethyst.service.relays.Client
-import com.vitorpamplona.amethyst.service.relays.FeedType
 import com.vitorpamplona.amethyst.service.relays.Relay
 import com.vitorpamplona.amethyst.ui.note.toShortenHex
 import fr.acinq.secp256k1.Hex
 import java.math.BigDecimal
-import java.util.Collections
-import java.util.concurrent.ConcurrentHashMap
 import java.util.concurrent.atomic.AtomicBoolean
-import kotlin.time.ExperimentalTime
-import kotlin.time.measureTimedValue
+import java.util.regex.Pattern
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
+import kotlinx.coroutines.NonCancellable
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import nostr.postr.Bech32
 import nostr.postr.events.ContactListEvent
-import nostr.postr.events.Event
 import nostr.postr.events.MetadataEvent
 import nostr.postr.toNpub
 
+val lnurlpPattern = Pattern.compile("(?i:http|https):\\/\\/((.+)\\/)*\\.well-known\\/lnurlp\\/(.*)")
+
 class User(val pubkeyHex: String) {
-    val pubkey = Hex.decode(pubkeyHex)
-    val pubkeyDisplayHex = pubkey.toNpub().toShortenHex()
+    var info: UserMetadata? = null
 
-    var info = UserMetadata()
-
-    var updatedMetadataAt: Long = 0;
     var updatedFollowsAt: Long = 0;
-
     var latestContactList: ContactListEvent? = null
-    var latestMetadata: MetadataEvent? = null
 
     var follows = setOf<User>()
         private set
@@ -50,6 +42,7 @@ class User(val pubkeyHex: String) {
 
     var reports = mapOf<User, Set<Note>>()
         private set
+    var latestReportTime: Long = 0
 
     var zaps = mapOf<Note, Note?>()
         private set
@@ -60,123 +53,134 @@ class User(val pubkeyHex: String) {
     var relaysBeingUsed = mapOf<String, RelayInfo>()
         private set
 
-    var messages = mapOf<User, Set<Note>>()
+    var privateChatrooms = mapOf<User, Chatroom>()
         private set
 
-    var latestMetadataRequestEOSE: Long? = null
-    var latestReportRequestEOSE: Long? = null
+    fun pubkey() = Hex.decode(pubkeyHex)
+    fun pubkeyNpub() = pubkey().toNpub()
+    fun pubkeyDisplayHex() = pubkeyNpub().toShortenHex()
 
     fun toBestDisplayName(): String {
-        return bestDisplayName() ?: bestUsername() ?: pubkeyDisplayHex
+        return bestDisplayName() ?: bestUsername() ?: pubkeyDisplayHex()
     }
 
     fun bestUsername(): String? {
-        return info.name?.ifBlank { null } ?: info.username?.ifBlank { null }
+        return info?.name?.ifBlank { null } ?: info?.username?.ifBlank { null }
     }
 
     fun bestDisplayName(): String? {
-        return info.displayName?.ifBlank { null } ?: info.display_name?.ifBlank { null }
+        return info?.displayName?.ifBlank { null } ?: info?.display_name?.ifBlank { null }
+    }
+
+    fun nip05(): String? {
+        return info?.nip05?.ifBlank { null }
     }
 
     fun profilePicture(): String? {
-        if (info.picture.isNullOrBlank()) info.picture = null
-        return info.picture
+        if (info?.picture.isNullOrBlank()) info?.picture = null
+        return info?.picture
     }
 
     fun follow(user: User, followedAt: Long) {
         follows = follows + user
         user.followers = user.followers + this
 
-        liveFollows.invalidateData()
-        user.liveFollows.invalidateData()
-
-        updateSubscribers {
-            it.onFollowsChange()
-        }
-
-        user.updateSubscribers {
-            it.onFollowsChange()
-        }
+        liveSet?.follows?.invalidateData()
+        user.liveSet?.follows?.invalidateData()
     }
+
     fun unfollow(user: User) {
         follows = follows - user
         user.followers = user.followers - this
 
-        liveFollows.invalidateData()
-        user.liveFollows.invalidateData()
-
-        updateSubscribers {
-            it.onFollowsChange()
-        }
-
-        user.updateSubscribers {
-            it.onFollowsChange()
-        }
+        liveSet?.follows?.invalidateData()
+        user.liveSet?.follows?.invalidateData()
     }
 
     fun follow(users: Set<User>, followedAt: Long) {
         follows = follows + users
         users.forEach {
-            it.followers = it.followers + this
-            it.liveFollows.invalidateData()
-            it.updateSubscribers {
-                it.onFollowsChange()
+            if (this !in it.followers && it.liveSet?.isInUse() == true) {
+                it.followers = it.followers + this
+                it.liveSet?.follows?.invalidateData()
             }
         }
 
-        liveFollows.invalidateData()
-        updateSubscribers {
-            it.onFollowsChange()
-        }
+        liveSet?.follows?.invalidateData()
     }
+
     fun unfollow(users: Set<User>) {
         follows = follows - users
         users.forEach {
-            it.followers = it.followers - this
-            it.liveFollows.invalidateData()
-            it.updateSubscribers {
-                it.onFollowsChange()
+            if (this in it.followers && it.liveSet?.isInUse() == true) {
+                it.followers = it.followers - this
+                it.liveSet?.follows?.invalidateData()
             }
         }
-        liveFollows.invalidateData()
-        updateSubscribers {
-            it.onFollowsChange()
-        }
+        liveSet?.follows?.invalidateData()
     }
 
     fun addTaggedPost(note: Note) {
         if (note !in taggedPosts) {
             taggedPosts = taggedPosts + note
-            updateSubscribers { it.onNewTaggedPosts() }
+            // No need for Listener yet
         }
     }
 
+    fun removeTaggedPost(note: Note) {
+        taggedPosts = taggedPosts - note
+    }
+
     fun addNote(note: Note) {
         if (note !in notes) {
             notes = notes + note
-            updateSubscribers { it.onNewNotes() }
+            // No need for Listener yet
         }
     }
 
+    fun removeNote(note: Note) {
+        notes = notes - note
+    }
+
+    fun clearNotes() {
+        notes = setOf<Note>()
+    }
+
     fun addReport(note: Note) {
         val author = note.author ?: return
 
         if (author !in reports.keys) {
             reports = reports + Pair(author, setOf(note))
-            liveReports.invalidateData()
-        } else {
+            liveSet?.reports?.invalidateData()
+        } else if (reports[author]?.contains(note) == false) {
             reports = reports + Pair(author, (reports[author] ?: emptySet()) + note)
-            liveReports.invalidateData()
+            liveSet?.reports?.invalidateData()
+        }
+
+        val reportTime = note.event?.createdAt ?: 0
+        if (reportTime > latestReportTime) {
+            latestReportTime = reportTime
+        }
+    }
+
+    fun removeReport(deleteNote: Note) {
+        val author = deleteNote.author ?: return
+
+        if (author in reports.keys && reports[author]?.contains(deleteNote) == true ) {
+            reports[author]?.let {
+                reports = reports + Pair(author, it.minus(deleteNote))
+                liveSet?.reports?.invalidateData()
+            }
         }
     }
 
     fun addZap(zapRequest: Note, zap: Note?) {
         if (zapRequest !in zaps.keys) {
             zaps = zaps + Pair(zapRequest, zap)
-            liveZaps.invalidateData()
+            liveSet?.zaps?.invalidateData()
         } else if (zapRequest in zaps.keys && zaps[zapRequest] == null) {
             zaps = zaps + Pair(zapRequest, zap)
-            liveZaps.invalidateData()
+            liveSet?.zaps?.invalidateData()
         }
     }
 
@@ -203,30 +207,23 @@ class User(val pubkeyHex: String) {
     }
 
     @Synchronized
-    fun getOrCreateChannel(user: User): Set<Note> {
-        return messages[user] ?: run {
-            val channel = setOf<Note>()
-            messages = messages + Pair(user, channel)
-            channel
+    fun getOrCreatePrivateChatroom(user: User): Chatroom {
+        return privateChatrooms[user] ?: run {
+            val privateChatroom = Chatroom(setOf<Note>())
+            privateChatrooms = privateChatrooms + Pair(user, privateChatroom)
+            privateChatroom
         }
     }
 
     fun addMessage(user: User, msg: Note) {
-        val channel = getOrCreateChannel(user)
-        if (msg !in channel) {
-            messages = messages + Pair(user, channel + msg)
-            liveMessages.invalidateData()
-            updateSubscribers { it.onNewMessage() }
+        val privateChatroom = getOrCreatePrivateChatroom(user)
+        if (msg !in privateChatroom.roomMessages) {
+            privateChatroom.roomMessages = privateChatroom.roomMessages + msg
+            liveSet?.messages?.invalidateData()
         }
     }
 
-    data class RelayInfo (
-        val url: String,
-        var lastEvent: Long,
-        var counter: Long
-    )
-
-    fun addRelay(relay: Relay, eventTime: Long) {
+    fun addRelayBeingUsed(relay: Relay, eventTime: Long) {
         val here = relaysBeingUsed[relay.url]
         if (here == null) {
             relaysBeingUsed = relaysBeingUsed + Pair(relay.url, RelayInfo(relay.url, eventTime, 1))
@@ -237,8 +234,7 @@ class User(val pubkeyHex: String) {
             here.counter++
         }
 
-        updateSubscribers { it.onNewRelayInfo() }
-        liveRelayInfo.invalidateData()
+        liveSet?.relayInfo?.invalidateData()
     }
     
     fun updateFollows(newFollows: Set<User>, updateAt: Long) {
@@ -251,24 +247,34 @@ class User(val pubkeyHex: String) {
         updatedFollowsAt = updateAt
     }
 
-    data class RelayMetadata(val read: Boolean, val write: Boolean, val activeTypes: Set<FeedType>)
-
     fun updateRelays(relayUse: Map<String, ContactListEvent.ReadWrite>) {
-        if (relays != relayUse) {
-            relays = relayUse
-            listeners.forEach {
-                it.onRelayChange()
+        // no need to test if relays are different. The Account will check for us.
+        relays = relayUse
+        liveSet?.relays?.invalidateData()
+    }
+
+    fun updateUserInfo(newUserInfo: UserMetadata, latestMetadata: MetadataEvent) {
+        info = newUserInfo
+        info?.latestMetadata = latestMetadata
+        info?.updatedMetadataAt = latestMetadata.createdAt
+
+        if (newUserInfo.lud16.isNullOrBlank() && newUserInfo.lud06?.toLowerCase()?.startsWith("lnurl") == true) {
+            try {
+                val url = String(Bech32.decodeBytes(newUserInfo.lud06!!, false).second)
+
+                val matcher = lnurlpPattern.matcher(url)
+                while (matcher.find()) {
+                    val domain = matcher.group(2)
+                    val username = matcher.group(3)
+
+                    info?.lud16 = "$username@$domain"
+                }
+            } catch (t: Throwable) {
+                // Doesn't create errors.
             }
         }
 
-        liveRelays.invalidateData()
-    }
-
-    fun updateUserInfo(newUserInfo: UserMetadata, updateAt: Long) {
-        info = newUserInfo
-        updatedMetadataAt = updateAt
-
-        liveMetadata.invalidateData()
+        liveSet?.metadata?.invalidateData()
     }
 
     fun isFollowing(user: User): Boolean {
@@ -276,9 +282,9 @@ class User(val pubkeyHex: String) {
     }
 
     fun hasSentMessagesTo(user: User?): Boolean {
-        val messagesToUser = messages[user] ?: return false
+        val messagesToUser = privateChatrooms[user] ?: return false
 
-        return messagesToUser.firstOrNull { this == it.author } != null
+        return messagesToUser.roomMessages.any { this == it.author }
     }
 
     fun hasReport(loggedIn: User, type: ReportEvent.ReportType): Boolean {
@@ -287,55 +293,55 @@ class User(val pubkeyHex: String) {
         } != null
     }
 
-    // Model Observers
-    private var listeners = setOf<Listener>()
-
-    fun subscribe(listener: Listener) {
-        listeners = listeners.plus(listener)
+    fun anyNameStartsWith(username: String): Boolean {
+        return info?.anyNameStartsWith(username) ?: false
     }
 
-    fun unsubscribe(listener: Listener) {
-        listeners = listeners.minus(listener)
+    var liveSet: UserLiveSet? = null
+
+    fun live(): UserLiveSet {
+        if (liveSet == null) {
+            liveSet = UserLiveSet(this)
+        }
+        return liveSet!!
     }
 
-    abstract class Listener {
-        open fun onRelayChange() = Unit
-        open fun onFollowsChange() = Unit
-        open fun onNewTaggedPosts() = Unit
-        open fun onNewNotes() = Unit
-        open fun onNewMessage() = Unit
-        open fun onNewRelayInfo() = Unit
-        open fun onNewReports() = Unit
-    }
-
-    // Refreshes observers in batches.
-    var modelHandlerWaiting = AtomicBoolean()
-
-    @Synchronized
-    fun updateSubscribers(on: (Listener) -> Unit) {
-        if (modelHandlerWaiting.getAndSet(true)) return
-
-        modelHandlerWaiting.set(true)
-        val scope = CoroutineScope(Job() + Dispatchers.Default)
-        scope.launch {
-            delay(100)
-            listeners.forEach {
-                on(it)
-            }
-            modelHandlerWaiting.set(false)
+    fun clearLive() {
+        if (liveSet != null && liveSet?.isInUse() == false) {
+            liveSet = null
         }
     }
-
-    // UI Observers line up here.
-    val liveFollows: UserLiveData = UserLiveData(this)
-    val liveReports: UserLiveData = UserLiveData(this)
-    val liveMessages: UserLiveData = UserLiveData(this)
-    val liveRelays: UserLiveData = UserLiveData(this)
-    val liveRelayInfo: UserLiveData = UserLiveData(this)
-    val liveMetadata: UserLiveData = UserLiveData(this)
-    val liveZaps: UserLiveData = UserLiveData(this)
 }
 
+class UserLiveSet(u: User) {
+    // UI Observers line up here.
+    val follows: UserLiveData = UserLiveData(u)
+    val reports: UserLiveData = UserLiveData(u)
+    val messages: UserLiveData = UserLiveData(u)
+    val relays: UserLiveData = UserLiveData(u)
+    val relayInfo: UserLiveData = UserLiveData(u)
+    val metadata: UserLiveData = UserLiveData(u)
+    val zaps: UserLiveData = UserLiveData(u)
+
+    fun isInUse(): Boolean {
+        return follows.hasObservers()
+          || reports.hasObservers()
+          || messages.hasObservers()
+          || relays.hasObservers()
+          || relayInfo.hasObservers()
+          || metadata.hasObservers()
+          || zaps.hasObservers()
+    }
+}
+
+data class RelayInfo (
+    val url: String,
+    var lastEvent: Long,
+    var counter: Long
+)
+
+data class Chatroom(var roomMessages: Set<Note>)
+
 class UserMetadata {
     var name: String? = null
     var username: String? = null
@@ -345,7 +351,11 @@ class UserMetadata {
     var banner: String? = null
     var website: String? = null
     var about: String? = null
+
     var nip05: String? = null
+    var nip05Verified: Boolean = false
+    var nip05LastVerificationTime: Long? = 0
+
     var domain: String? = null
     var lud06: String? = null
     var lud16: String? = null
@@ -355,6 +365,9 @@ class UserMetadata {
     var main_relay: String? = null
     var twitter: String? = null
 
+    var updatedMetadataAt: Long = 0;
+    var latestMetadata: MetadataEvent? = null
+
     fun anyNameStartsWith(prefix: String): Boolean {
         return listOfNotNull(name, username, display_name, displayName, nip05, lud06, lud16)
               .filter { it.startsWith(prefix, true) }.isNotEmpty()
@@ -368,15 +381,19 @@ class UserLiveData(val user: User): LiveData<UserState>(UserState(user)) {
 
     @Synchronized
     fun invalidateData() {
-        if (!hasActiveObservers()) return
         if (handlerWaiting.getAndSet(true)) return
 
         handlerWaiting.set(true)
         val scope = CoroutineScope(Job() + Dispatchers.Main)
         scope.launch {
-            delay(100)
-            refresh()
-            handlerWaiting.set(false)
+            try {
+                delay(100)
+                refresh()
+            } finally {
+                withContext(NonCancellable) {
+                    handlerWaiting.set(false)
+                }
+            }
         }
     }
 
@@ -386,13 +403,14 @@ class UserLiveData(val user: User): LiveData<UserState>(UserState(user)) {
 
     override fun onActive() {
         super.onActive()
-        NostrSingleUserDataSource.add(user.pubkeyHex)
+        NostrSingleUserDataSource.add(user)
     }
 
     override fun onInactive() {
         super.onInactive()
-        NostrSingleUserDataSource.remove(user.pubkeyHex)
+        NostrSingleUserDataSource.remove(user)
     }
 }
 
 class UserState(val user: User)
+

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

@@ -15,7 +15,7 @@ import nostr.postr.events.ContactListEvent
 import nostr.postr.events.MetadataEvent
 import nostr.postr.events.TextNoteEvent
 
-object NostrAccountDataSource: NostrDataSource<Note>("AccountData") {
+object NostrAccountDataSource: NostrDataSource("AccountData") {
   lateinit var account: Account
 
   fun createAccountContactListFilter(): TypedFilter {
@@ -63,15 +63,6 @@ object NostrAccountDataSource: NostrDataSource<Note>("AccountData") {
 
   val accountChannel = requestNewChannel()
 
-  override fun feed(): List<Note> {
-    val user = account.userProfile()
-
-    return LocalCache.notes.values
-      .filter { (it.event is TextNoteEvent || it.event is RepostEvent) && it.author in user.follows }
-      .sortedBy { it.event?.createdAt }
-      .reversed()
-  }
-
   override fun updateChannelFilters() {
     // gets everthing about the user logged in
     accountChannel.typedFilters = listOf(

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

@@ -1,6 +1,6 @@
 package com.vitorpamplona.amethyst.service
 
-import com.vitorpamplona.amethyst.model.Account
+import com.vitorpamplona.amethyst.model.Channel
 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
@@ -8,9 +8,8 @@ import com.vitorpamplona.amethyst.service.relays.FeedType
 import com.vitorpamplona.amethyst.service.relays.TypedFilter
 import nostr.postr.JsonFilter
 
-object NostrChannelDataSource: NostrDataSource<Note>("ChatroomFeed") {
-  lateinit var account: Account
-  var channel: com.vitorpamplona.amethyst.model.Channel? = null
+object NostrChannelDataSource: NostrDataSource("ChatroomFeed") {
+  var channel: Channel? = null
 
   fun loadMessagesBetween(channelId: String) {
     channel = LocalCache.getOrCreateChannel(channelId)
@@ -33,11 +32,6 @@ object NostrChannelDataSource: NostrDataSource<Note>("ChatroomFeed") {
 
   val messagesChannel = requestNewChannel()
 
-  // returns the last Note of each user.
-  override fun feed(): List<Note> {
-    return channel?.notes?.values?.filter { account.isAcceptable(it) }?.sortedBy { it.event?.createdAt }?.reversed() ?: emptyList()
-  }
-
   override fun updateChannelFilters() {
     messagesChannel.typedFilters = listOfNotNull(createMessagesToChannelFilter()).ifEmpty { null }
   }

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

@@ -9,13 +9,14 @@ import com.vitorpamplona.amethyst.service.relays.TypedFilter
 import nostr.postr.JsonFilter
 import nostr.postr.events.PrivateDmEvent
 
-object NostrChatRoomDataSource: NostrDataSource<Note>("ChatroomFeed") {
+object NostrChatroomDataSource: NostrDataSource("ChatroomFeed") {
   lateinit var account: Account
   var withUser: User? = null
 
   fun loadMessagesBetween(accountIn: Account, userId: String) {
     account = accountIn
     withUser = LocalCache.users[userId]
+    resetFilters()
   }
 
   fun createMessagesToMeFilter(): TypedFilter? {
@@ -40,7 +41,7 @@ object NostrChatRoomDataSource: NostrDataSource<Note>("ChatroomFeed") {
     
     return if (myPeer != null) {
       TypedFilter(
-        types = setOf(FeedType.PUBLIC_CHATS),
+        types = setOf(FeedType.PRIVATE_DMS),
         filter = JsonFilter(
           kinds = listOf(PrivateDmEvent.kind),
           authors = listOf(account.userProfile().pubkeyHex),
@@ -54,13 +55,6 @@ object NostrChatRoomDataSource: NostrDataSource<Note>("ChatroomFeed") {
 
   val inandoutChannel = requestNewChannel()
 
-  // returns the last Note of each user.
-  override fun feed(): List<Note> {
-    val messages = account.userProfile().messages[withUser] ?: return emptyList()
-
-    return messages.filter { account.isAcceptable(it) }.sortedBy { it.event?.createdAt }.reversed()
-  }
-
   override fun updateChannelFilters() {
     inandoutChannel.typedFilters = listOfNotNull(createMessagesToMeFilter(), createMessagesFromMeFilter()).ifEmpty { null }
   }

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

@@ -10,7 +10,7 @@ import com.vitorpamplona.amethyst.service.relays.TypedFilter
 import nostr.postr.JsonFilter
 import nostr.postr.events.PrivateDmEvent
 
-object NostrChatroomListDataSource: NostrDataSource<Note>("MailBoxFeed") {
+object NostrChatroomListDataSource: NostrDataSource("MailBoxFeed") {
   lateinit var account: Account
 
   fun createMessagesToMeFilter() = TypedFilter(
@@ -38,7 +38,7 @@ object NostrChatroomListDataSource: NostrDataSource<Note>("MailBoxFeed") {
   )
 
   fun createMyChannelsFilter() = TypedFilter(
-    types = setOf(FeedType.PUBLIC_CHATS),
+    types = FeedType.values().toSet(), // Metadata comes from any relay
       filter = JsonFilter(
       kinds = listOf(ChannelCreateEvent.kind),
       ids = account.followingChannels.toList()
@@ -48,7 +48,7 @@ object NostrChatroomListDataSource: NostrDataSource<Note>("MailBoxFeed") {
   fun createLastChannelInfoFilter(): List<TypedFilter> {
     return account.followingChannels.map {
       TypedFilter(
-        types = setOf(FeedType.PUBLIC_CHATS),
+        types = FeedType.values().toSet(), // Metadata comes from any relay
         filter = JsonFilter(
           kinds = listOf(ChannelMetadataEvent.kind),
           tags = mapOf("e" to listOf(it)),
@@ -65,7 +65,7 @@ object NostrChatroomListDataSource: NostrDataSource<Note>("MailBoxFeed") {
         filter = JsonFilter(
           kinds = listOf(ChannelMessageEvent.kind),
           tags = mapOf("e" to listOf(it)),
-          limit = 1
+          limit = 100 // Remember to consider spam that is being removed from the UI
         )
       )
     }
@@ -73,22 +73,6 @@ object NostrChatroomListDataSource: NostrDataSource<Note>("MailBoxFeed") {
 
   val chatroomListChannel = requestNewChannel()
 
-  // returns the last Note of each user.
-  override fun feed(): List<Note> {
-    val messages = account.userProfile().messages
-    val messagingWith = messages.keys.filter { account.isAcceptable(it) }
-
-    val privateMessages = messagingWith.mapNotNull {
-      messages[it]?.sortedBy { it.event?.createdAt }?.lastOrNull { it.event != null }
-    }
-
-    val publicChannels = account.followingChannels().map {
-      it.notes.values.filter { account.isAcceptable(it) }.sortedBy { it.event?.createdAt }.lastOrNull { it.event != null }
-    }
-
-    return (privateMessages + publicChannels).filterNotNull().sortedBy { it.event?.createdAt }.reversed()
-  }
-
   override fun updateChannelFilters() {
     val list = listOf(
       createMessagesToMeFilter(),

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

@@ -3,6 +3,7 @@ package com.vitorpamplona.amethyst.service
 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.model.UrlCachedPreviewer
+import com.vitorpamplona.amethyst.model.toHexKey
 import com.vitorpamplona.amethyst.service.model.ChannelCreateEvent
 import com.vitorpamplona.amethyst.service.model.ChannelHideMessageEvent
 import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
@@ -16,6 +17,7 @@ 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.Subscription
+import com.vitorpamplona.amethyst.service.relays.hasValidSignature
 import java.util.Date
 import java.util.UUID
 import kotlinx.coroutines.CoroutineScope
@@ -31,25 +33,29 @@ import nostr.postr.events.PrivateDmEvent
 import nostr.postr.events.RecommendRelayEvent
 import nostr.postr.events.TextNoteEvent
 
-abstract class NostrDataSource<T>(val debugName: String) {
+abstract class NostrDataSource(val debugName: String) {
   private var subscriptions = mapOf<String, Subscription>()
-  private var eventCounter = mapOf<String, Int>()
+  data class Counter(var counter:Int)
+
+  private var eventCounter = mapOf<String, Counter>()
 
   fun printCounter() {
     eventCounter.forEach {
-      println("AAA Count ${it.key}: ${it.value}")
+      println("AAA Count ${it.key}: ${it.value.counter}")
     }
   }
 
   private val clientListener = object : Client.Listener() {
     override fun onEvent(event: Event, subscriptionId: String, relay: Relay) {
       if (subscriptionId in subscriptions.keys) {
+        if (!event.hasValidSignature()) return
+
         val key = "${debugName} ${subscriptionId} ${event.kind}"
         val keyValue = eventCounter.get(key)
         if (keyValue != null) {
-          eventCounter = eventCounter + Pair(key, keyValue + 1)
+          keyValue.counter++
         } else {
-          eventCounter = eventCounter + Pair(key, 1)
+          eventCounter = eventCounter + Pair(key, Counter(1))
         }
 
         try {
@@ -68,7 +74,7 @@ abstract class NostrDataSource<T>(val debugName: String) {
                 LocalCache.consume(repostEvent)
               }
               ReactionEvent.kind -> LocalCache.consume(ReactionEvent(event.id, event.pubKey, event.createdAt, event.tags, event.content, event.sig))
-              ReportEvent.kind -> LocalCache.consume(ReportEvent(event.id, event.pubKey, event.createdAt, event.tags, event.content, event.sig))
+              ReportEvent.kind -> LocalCache.consume(ReportEvent(event.id, event.pubKey, event.createdAt, event.tags, event.content, event.sig), relay)
 
               LnZapEvent.kind -> {
                 val zapEvent = LnZapEvent(event.id, event.pubKey, event.createdAt, event.tags, event.content, event.sig)
@@ -125,30 +131,8 @@ abstract class NostrDataSource<T>(val debugName: String) {
 
   open fun stop() {
     subscriptions.values.forEach { channel ->
-      if (channel.typedFilters != null) {// if it is active, close
-        Client.close(channel.id)
-        channel.typedFilters = null
-      }
-    }
-  }
-
-  fun loadTop(): List<T> {
-    val returningList = feed().take(100)
-
-    // prepare previews
-    val scope = CoroutineScope(Job() + Dispatchers.IO)
-    scope.launch {
-      loadPreviews(returningList)
-    }
-
-    return returningList
-  }
-
-  fun loadPreviews(list: List<T>) {
-    list.forEach {
-      if (it is Note) {
-        UrlCachedPreviewer.preloadPreviewsFor(it)
-      }
+      Client.close(channel.id)
+      channel.typedFilters = null
     }
   }
 
@@ -224,5 +208,4 @@ abstract class NostrDataSource<T>(val debugName: String) {
   }
 
   abstract fun updateChannelFilters()
-  abstract fun feed(): List<T>
 }

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

@@ -9,7 +9,7 @@ import com.vitorpamplona.amethyst.service.relays.TypedFilter
 import nostr.postr.JsonFilter
 import nostr.postr.events.TextNoteEvent
 
-object NostrGlobalDataSource: NostrDataSource<Note>("GlobalFeed") {
+object NostrGlobalDataSource: NostrDataSource("GlobalFeed") {
   lateinit var account: Account
   fun createGlobalFilter() = TypedFilter(
     types = setOf(FeedType.GLOBAL),
@@ -21,15 +21,6 @@ object NostrGlobalDataSource: NostrDataSource<Note>("GlobalFeed") {
 
   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 ChannelMessageEvent && (it.event as ChannelMessageEvent).replyTos.isEmpty())
-    }
-    .sortedBy { it.event?.createdAt }
-    .reversed()
-
   override fun updateChannelFilters() {
     globalFeedChannel.typedFilters = listOf(createGlobalFilter()).ifEmpty { null }
   }

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

@@ -1,16 +0,0 @@
-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

@@ -2,41 +2,50 @@ package com.vitorpamplona.amethyst.service
 
 import com.vitorpamplona.amethyst.model.Account
 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.model.UserState
 import com.vitorpamplona.amethyst.service.model.RepostEvent
 import com.vitorpamplona.amethyst.service.relays.FeedType
 import com.vitorpamplona.amethyst.service.relays.TypedFilter
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
 import nostr.postr.JsonFilter
 import nostr.postr.events.TextNoteEvent
 import nostr.postr.toHex
 
-object NostrHomeDataSource: NostrDataSource<Note>("HomeFeed") {
+object NostrHomeDataSource: NostrDataSource("HomeFeed") {
   lateinit var account: Account
 
-  object cacheListener: User.Listener() {
-    override fun onFollowsChange() {
-      resetFilters()
-    }
+  private val cacheListener: (UserState) -> Unit = {
+    invalidateFilters()
   }
 
   override fun start() {
-    if (this::account.isInitialized)
-      account.userProfile().subscribe(cacheListener)
+    if (this::account.isInitialized) {
+      GlobalScope.launch(Dispatchers.Main) {
+        account.userProfile().live().follows.observeForever(cacheListener)
+      }
+    }
     super.start()
   }
 
   override fun stop() {
     super.stop()
-    if (this::account.isInitialized)
-      account.userProfile().unsubscribe(cacheListener)
+    if (this::account.isInitialized) {
+      GlobalScope.launch(Dispatchers.Main) {
+        account.userProfile().live().follows.removeObserver(cacheListener)
+      }
+    }
   }
 
   fun createFollowAccountsFilter(): TypedFilter {
     val follows = account.userProfile().follows
 
     val followKeys = follows.map {
-      it.pubkey.toHex().substring(0, 6)
+      it.pubkeyHex.substring(0, 6)
     }
 
     val followSet = followKeys.plus(account.userProfile().pubkeyHex.substring(0, 6))
@@ -44,7 +53,7 @@ object NostrHomeDataSource: NostrDataSource<Note>("HomeFeed") {
     return TypedFilter(
       types = setOf(FeedType.FOLLOWS),
       filter = JsonFilter(
-        kinds = listOf(TextNoteEvent.kind, RepostEvent.kind),
+        kinds = listOf(TextNoteEvent.kind),
         authors = followSet,
         limit = 400
       )
@@ -53,16 +62,6 @@ object NostrHomeDataSource: NostrDataSource<Note>("HomeFeed") {
 
   val followAccountChannel = requestNewChannel()
 
-  override fun feed(): List<Note> {
-    val user = account.userProfile()
-
-    return LocalCache.notes.values
-      .filter { (it.event is TextNoteEvent || it.event is RepostEvent) && it.author in user.follows }
-      .filter { account.isAcceptable(it) }
-      .sortedBy { it.event?.createdAt }
-      .reversed()
-  }
-
   override fun updateChannelFilters() {
     followAccountChannel.typedFilters = listOf(createFollowAccountsFilter()).ifEmpty { null }
   }

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

@@ -11,7 +11,7 @@ import nostr.postr.events.MetadataEvent
 import nostr.postr.events.TextNoteEvent
 import nostr.postr.toHex
 
-object NostrSearchEventOrUserDataSource: NostrDataSource<Note>("SingleEventFeed") {
+object NostrSearchEventOrUserDataSource: NostrDataSource("SingleEventFeed") {
   private var hexToWatch: String? = null
 
   private fun createAnythingWithIDFilter(): List<TypedFilter>? {
@@ -39,10 +39,6 @@ object NostrSearchEventOrUserDataSource: NostrDataSource<Note>("SingleEventFeed"
 
   val searchChannel = requestNewChannel()
 
-  override fun feed(): List<Note> {
-    return emptyList<Note>()
-  }
-
   override fun updateChannelFilters() {
     searchChannel.typedFilters = createAnythingWithIDFilter()
   }

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

@@ -8,7 +8,7 @@ import com.vitorpamplona.amethyst.service.relays.FeedType
 import com.vitorpamplona.amethyst.service.relays.TypedFilter
 import nostr.postr.JsonFilter
 
-object NostrSingleChannelDataSource: NostrDataSource<Note>("SingleChannelFeed") {
+object NostrSingleChannelDataSource: NostrDataSource("SingleChannelFeed") {
   private var channelsToWatch = setOf<String>()
 
   private fun createRepliesAndReactionsFilter(): TypedFilter? {
@@ -51,10 +51,6 @@ object NostrSingleChannelDataSource: NostrDataSource<Note>("SingleChannelFeed")
 
   val singleChannelChannel = requestNewChannel()
 
-  override fun feed(): List<Note> {
-    return emptyList()
-  }
-
   override fun updateChannelFilters() {
     val reactions = createRepliesAndReactionsFilter()
     val missing = createLoadEventsIfNotLoadedFilter()

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

@@ -6,6 +6,7 @@ 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.LnZapEvent
+import com.vitorpamplona.amethyst.service.model.LnZapRequestEvent
 import com.vitorpamplona.amethyst.service.model.ReactionEvent
 import com.vitorpamplona.amethyst.service.model.ReportEvent
 import com.vitorpamplona.amethyst.service.model.RepostEvent
@@ -15,7 +16,7 @@ import java.util.Date
 import nostr.postr.JsonFilter
 import nostr.postr.events.TextNoteEvent
 
-object NostrSingleEventDataSource: NostrDataSource<Note>("SingleEventFeed") {
+object NostrSingleEventDataSource: NostrDataSource("SingleEventFeed") {
   private var eventsToWatch = setOf<String>()
 
   private fun createRepliesAndReactionsFilter(): List<TypedFilter>? {
@@ -28,14 +29,14 @@ object NostrSingleEventDataSource: NostrDataSource<Note>("SingleEventFeed") {
     val now = Date().time / 1000
 
     return reactionsToWatch.filter {
-      val lastTime = it.lastReactionsDownloadTime;
+      val lastTime = it.lastReactionsDownloadTime
       lastTime == null || lastTime < (now - 10)
     }.map {
       TypedFilter(
         types = FeedType.values().toSet(),
         filter = JsonFilter(
           kinds = listOf(
-            TextNoteEvent.kind, ReactionEvent.kind, RepostEvent.kind, ReportEvent.kind, LnZapEvent.kind
+            TextNoteEvent.kind, ReactionEvent.kind, RepostEvent.kind, ReportEvent.kind, LnZapEvent.kind, LnZapRequestEvent.kind
           ),
           tags = mapOf("e" to listOf(it.idHex)),
           since = it.lastReactionsDownloadTime
@@ -69,7 +70,7 @@ object NostrSingleEventDataSource: NostrDataSource<Note>("SingleEventFeed") {
         types = FeedType.values().toSet(),
         filter = JsonFilter(
           kinds = listOf(
-            TextNoteEvent.kind, ReactionEvent.kind, RepostEvent.kind, LnZapEvent.kind,
+            TextNoteEvent.kind, ReactionEvent.kind, RepostEvent.kind, LnZapEvent.kind, LnZapRequestEvent.kind,
             ChannelMessageEvent.kind, ChannelCreateEvent.kind, ChannelMetadataEvent.kind
           ),
           ids = interestedEvents.toList()
@@ -78,7 +79,7 @@ object NostrSingleEventDataSource: NostrDataSource<Note>("SingleEventFeed") {
     )
   }
 
-  val singleEventChannel = requestNewChannel() { time ->
+  val singleEventChannel = requestNewChannel { time ->
     eventsToWatch.forEach {
       LocalCache.getOrCreateNote(it).lastReactionsDownloadTime = time
     }
@@ -87,14 +88,6 @@ object NostrSingleEventDataSource: NostrDataSource<Note>("SingleEventFeed") {
     invalidateFilters()
   }
 
-  override fun feed(): List<Note> {
-    return synchronized(eventsToWatch) {
-      eventsToWatch.map {
-        LocalCache.notes[it]
-      }.filterNotNull()
-    }
-  }
-
   override fun updateChannelFilters() {
     val reactions = createRepliesAndReactionsFilter()
     val missing = createLoadEventsIfNotLoadedFilter()

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

@@ -8,18 +8,18 @@ import com.vitorpamplona.amethyst.service.relays.TypedFilter
 import nostr.postr.JsonFilter
 import nostr.postr.events.MetadataEvent
 
-object NostrSingleUserDataSource: NostrDataSource<User>("SingleUserFeed") {
-  var usersToWatch = setOf<String>()
+object NostrSingleUserDataSource: NostrDataSource("SingleUserFeed") {
+  var usersToWatch = setOf<User>()
 
   fun createUserFilter(): List<TypedFilter>? {
     if (usersToWatch.isEmpty()) return null
 
-    return usersToWatch.filter { LocalCache.getOrCreateUser(it).latestMetadata == null }.map {
+    return usersToWatch.filter { it.info?.latestMetadata == null }.map {
       TypedFilter(
         types = FeedType.values().toSet(),
         filter = JsonFilter(
           kinds = listOf(MetadataEvent.kind),
-          authors = listOf(it),
+          authors = listOf(it.pubkeyHex),
           limit = 1
         )
       )
@@ -34,7 +34,8 @@ object NostrSingleUserDataSource: NostrDataSource<User>("SingleUserFeed") {
         types = FeedType.values().toSet(),
         filter = JsonFilter(
           kinds = listOf(ReportEvent.kind),
-          tags = mapOf("p" to listOf(it))
+          tags = mapOf("p" to listOf(it.pubkeyHex)),
+          since = it.latestReportTime
         )
       )
     }
@@ -46,25 +47,20 @@ object NostrSingleUserDataSource: NostrDataSource<User>("SingleUserFeed") {
     invalidateFilters()
   }
 
-  override fun feed(): List<User> {
-    return synchronized(usersToWatch) {
-      usersToWatch.map {
-        LocalCache.users[it]
-      }.filterNotNull()
-    }
-  }
+  val userChannelOnce = requestNewChannel()
 
   override fun updateChannelFilters() {
-    userChannel.typedFilters = listOfNotNull(createUserFilter(), createUserReportFilter()).flatten()
+    userChannel.typedFilters = listOfNotNull(createUserFilter()).flatten().ifEmpty { null }
+    userChannelOnce.typedFilters = listOfNotNull(createUserReportFilter()).flatten().ifEmpty { null }
   }
 
-  fun add(userId: String) {
-    usersToWatch = usersToWatch.plus(userId)
+  fun add(user: User) {
+    usersToWatch = usersToWatch.plus(user)
     invalidateFilters()
   }
 
-  fun remove(userId: String) {
-    usersToWatch = usersToWatch.minus(userId)
+  fun remove(user: User) {
+    usersToWatch = usersToWatch.minus(user)
     invalidateFilters()
   }
 }

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

@@ -2,117 +2,48 @@ package com.vitorpamplona.amethyst.service
 
 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.model.ThreadAssembler
 import com.vitorpamplona.amethyst.service.model.ReactionEvent
 import com.vitorpamplona.amethyst.service.model.RepostEvent
 import com.vitorpamplona.amethyst.service.relays.FeedType
 import com.vitorpamplona.amethyst.service.relays.TypedFilter
+import com.vitorpamplona.amethyst.ui.dal.ThreadFeedFilter
 import nostr.postr.JsonFilter
 import nostr.postr.events.TextNoteEvent
 
-object NostrThreadDataSource: NostrDataSource<Note>("SingleThreadFeed") {
-  private var eventsToWatch = setOf<String>()
-
-  fun createRepliesAndReactionsFilter(): TypedFilter? {
-    if (eventsToWatch.isEmpty()) {
-      return null
-    }
-
-    return TypedFilter(
-      types = FeedType.values().toSet(),
-      filter = JsonFilter(
-        kinds = listOf(TextNoteEvent.kind, ReactionEvent.kind, RepostEvent.kind),
-        tags = mapOf("e" to eventsToWatch.toList())
-      )
-    )
-  }
+object NostrThreadDataSource: NostrDataSource("SingleThreadFeed") {
+  private var eventToWatch: String? = null
 
   fun createLoadEventsIfNotLoadedFilter(): TypedFilter? {
-    val nodes = eventsToWatch.map { LocalCache.getOrCreateNote(it) }
+    val threadToLoad = eventToWatch ?: return null
 
-    val eventsToLoad = nodes
+    val eventsToLoad = ThreadAssembler().findThreadFor(threadToLoad)
       .filter { it.event == null }
-      .map { it.idHex.substring(0, 8) }
-
-    if (eventsToLoad.isEmpty()) {
-      return null
-    }
+      .map { it.idHex }
+      .toSet()
+      .ifEmpty { null } ?: return null
 
     return TypedFilter(
       types = FeedType.values().toSet(),
       filter = JsonFilter(
-        ids = eventsToLoad
+        ids = eventsToLoad.map { it.substring(0, 8) }
       )
     )
   }
 
-  val loadEventsChannel = requestNewChannel()
-
-  override fun feed(): List<Note> {
-    // Currently orders by date of each event, descending, at each level of the reply stack
-    val order = compareByDescending<Note> { it.replyLevelSignature() }
-
-    return eventsToWatch.map {
-      LocalCache.getOrCreateNote(it)
-    }.sortedWith(order)
-  }
-
-  override fun updateChannelFilters() {
-    loadEventsChannel.typedFilters = listOfNotNull(createLoadEventsIfNotLoadedFilter(), createRepliesAndReactionsFilter()).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.getOrCreateNote(noteId)
-
-    if (note.event != null) {
-      val thread = mutableListOf<Note>()
-      val threadSet = mutableSetOf<Note>()
-
-      val threadRoot = searchRoot(note) ?: note
-
-      loadDown(threadRoot, thread, threadSet)
-
-      eventsToWatch = thread.map { it.idHex }.toSet()
-    } else {
-      eventsToWatch = setOf(noteId)
-    }
-
+  val loadEventsChannel = requestNewChannel(){
+    // Many relays operate with limits in the amount of filters.
+    // As information comes, the filters will be rotated to get more data.
     invalidateFilters()
   }
 
-  fun loadDown(note: Note, thread: MutableList<Note>, threadSet: MutableSet<Note>) {
-    if (note !in threadSet) {
-      thread.add(note)
-      threadSet.add(note)
+  override fun updateChannelFilters() {
+    loadEventsChannel.typedFilters = listOfNotNull(createLoadEventsIfNotLoadedFilter()).ifEmpty { null }
+  }
 
-      note.replies.forEach {
-        loadDown(it, thread, threadSet)
-      }
-    }
+  fun loadThread(noteId: String?) {
+    eventToWatch = noteId
+
+    invalidateFilters()
   }
 }

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

@@ -1,6 +1,6 @@
 package com.vitorpamplona.amethyst.service
 
-import com.vitorpamplona.amethyst.model.Account
+import android.util.Log
 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.model.User
@@ -12,79 +12,76 @@ import nostr.postr.events.ContactListEvent
 import nostr.postr.events.MetadataEvent
 import nostr.postr.events.TextNoteEvent
 
-object NostrUserProfileDataSource: NostrDataSource<Note>("UserProfileFeed") {
-  lateinit var account: Account
+object NostrUserProfileDataSource: NostrDataSource("UserProfileFeed") {
   var user: User? = null
 
-  fun loadUserProfile(userId: String) {
-    user = LocalCache.getOrCreateUser(userId)
+  fun loadUserProfile(userId: String?) {
+    if (userId != null) {
+      user = LocalCache.getOrCreateUser(userId)
+    } else {
+      user = null
+    }
+
     resetFilters()
   }
 
-  fun createUserInfoFilter(): TypedFilter {
-    return TypedFilter(
+  fun createUserInfoFilter() = user?.let {
+    TypedFilter(
       types = FeedType.values().toSet(),
       filter = JsonFilter(
         kinds = listOf(MetadataEvent.kind),
-        authors = listOf(user!!.pubkeyHex),
+        authors = listOf(it.pubkeyHex),
         limit = 1
       )
     )
   }
 
-  fun createUserPostsFilter(): TypedFilter {
-    return TypedFilter(
+  fun createUserPostsFilter() = user?.let {
+    TypedFilter(
       types = FeedType.values().toSet(),
       filter = JsonFilter(
         kinds = listOf(TextNoteEvent.kind),
-        authors = listOf(user!!.pubkeyHex),
-        limit = 100
+        authors = listOf(it.pubkeyHex),
+        limit = 200
       )
     )
   }
 
-  fun createUserReceivedZapsFilter(): TypedFilter {
-    return TypedFilter(
+  fun createUserReceivedZapsFilter() = user?.let {
+    TypedFilter(
       types = FeedType.values().toSet(),
       filter = JsonFilter(
         kinds = listOf(LnZapEvent.kind),
-        tags = mapOf("e" to listOf(user!!.pubkeyHex)),
-        limit = 100
+        tags = mapOf("p" to listOf(it.pubkeyHex))
       )
     )
   }
 
-  fun createFollowFilter(): TypedFilter {
-    return TypedFilter(
+  fun createFollowFilter() = user?.let {
+    TypedFilter(
       types = FeedType.values().toSet(),
       filter = JsonFilter(
         kinds = listOf(ContactListEvent.kind),
-        authors = listOf(user!!.pubkeyHex),
+        authors = listOf(it.pubkeyHex),
         limit = 1
       )
     )
   }
 
-  fun createFollowersFilter() = TypedFilter(
-    types = FeedType.values().toSet(),
-    filter = JsonFilter(
-      kinds = listOf(ContactListEvent.kind),
-      tags = mapOf("p" to listOf(user!!.pubkeyHex))
+  fun createFollowersFilter() = user?.let {
+    TypedFilter(
+      types = FeedType.values().toSet(),
+      filter = JsonFilter(
+        kinds = listOf(ContactListEvent.kind),
+        tags = mapOf("p" to listOf(it.pubkeyHex))
+      )
     )
-  )
+  }
 
   val userInfoChannel = requestNewChannel()
 
-  override fun feed(): List<Note> {
-    return user?.notes
-      ?.filter { account.isAcceptable(it) }
-      ?.sortedBy { it.event?.createdAt }
-      ?.reversed()
-      ?: emptyList()
-  }
-
   override fun updateChannelFilters() {
-    userInfoChannel.typedFilters = listOf(
+    userInfoChannel.typedFilters = listOfNotNull(
       createUserInfoFilter(),
       createUserPostsFilter(),
       createFollowFilter(),

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

@@ -1,23 +0,0 @@
-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) {
-    user = LocalCache.users[userId]
-    resetFilters()
-  }
-
-  override fun feed(): List<User> {
-    return user?.follows?.filter { account.isAcceptable(it) } ?: emptyList()
-  }
-
-  override fun updateChannelFilters() {}
-}

app/src/main/java/com/vitorpamplona/amethyst/service/lang/LanguageTranslatorService.kt

@@ -8,7 +8,9 @@ import com.google.mlkit.nl.translate.TranslateLanguage
 import com.google.mlkit.nl.translate.Translation
 import com.google.mlkit.nl.translate.Translator
 import com.google.mlkit.nl.translate.TranslatorOptions
-import java.util.ArrayList
+import com.linkedin.urls.detection.UrlDetector
+import com.linkedin.urls.detection.UrlDetectorOptions
+import java.util.regex.Pattern
 
 class ResultOrError(
   var result: String?,
@@ -19,6 +21,7 @@ class ResultOrError(
 
 object LanguageTranslatorService {
   private val languageIdentification = LanguageIdentification.getClient()
+  val lnRegex = Pattern.compile("\\blnbc[a-z0-9]+\\b")
 
   private val translators =
     object : LruCache<TranslatorOptions, Translator>(10) {
@@ -43,6 +46,7 @@ object LanguageTranslatorService {
   fun translate(text: String, source: String, target: String): Task<ResultOrError> {
     val sourceLangCode = TranslateLanguage.fromLanguageTag(source)
     val targetLangCode = TranslateLanguage.fromLanguageTag(target)
+
     if (sourceLangCode == null || targetLangCode == null) {
       return Tasks.forCanceled()
     }
@@ -56,20 +60,67 @@ object LanguageTranslatorService {
 
     return translator.downloadModelIfNeeded().onSuccessTask {
       val tasks = mutableListOf<Task<String>>()
-      for (paragraph in text.split("\n")) {
+
+      val dict = lnDictionary(text) + urlDictionary(text)
+
+      for (paragraph in encodeDictionary(text, dict).split("\n")) {
         tasks.add(translator.translate(paragraph))
       }
 
       Tasks.whenAll(tasks).continueWith {
         val results: MutableList<String> = ArrayList()
         for (task in tasks) {
-          results.add(task.result)
+          var fixedText = task.result.replace("# [","#[") // fixes tags that always return with a space
+          results.add(decodeDictionary(fixedText, dict))
         }
         ResultOrError(results.joinToString("\n"), source, target, null)
       }
     }
   }
 
+  private fun encodeDictionary(text: String, dict: Map<String, String>): String {
+    var newText = text
+    for (pair in dict) {
+      newText = newText.replace(pair.value, pair.key, true)
+    }
+    return newText
+  }
+
+  private fun decodeDictionary(text: String, dict: Map<String, String>): String {
+    var newText = text
+    for (pair in dict) {
+      newText = newText.replace(pair.key, pair.value, true)
+    }
+    return newText
+  }
+
+  private fun lnDictionary(text: String): Map<String, String> {
+    val matcher = lnRegex.matcher(text)
+    val returningList = mutableMapOf<String, String>()
+    val counter = 0
+    while (matcher.find()) {
+      try {
+        val lnInvoice = matcher.group()
+        val short = "Amethystlnindexer${counter}"
+        returningList.put(short, lnInvoice)
+      } catch (e: Exception) {
+
+      }
+    }
+    return returningList
+  }
+
+  private fun urlDictionary(text: String): Map<String, String> {
+    val parser = UrlDetector(text, UrlDetectorOptions.Default)
+    val urlsInText = parser.detect()
+
+    val counter = 0
+
+    return urlsInText.filter { !it.originalUrl.contains("，") || !it.originalUrl.contains("。")  }.associate {
+      "Amethysturlindexer${counter}" to it.originalUrl
+    }
+  }
+
   fun autoTranslate(text: String, dontTranslateFrom: Set<String>, translateTo: String): Task<ResultOrError> {
     return identifyLanguage(text).onSuccessTask {
       if (it == translateTo) {

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

@@ -1,5 +1,6 @@
 package com.vitorpamplona.amethyst.service.model
 
+import android.util.Log
 import java.util.Date
 import nostr.postr.Utils
 import nostr.postr.events.Event
@@ -16,10 +17,11 @@ class ChannelCreateEvent (
   @Transient val channelInfo: ChannelData
 
   init {
-    try {
-      channelInfo = MetadataEvent.gson.fromJson(content, ChannelData::class.java)
+    channelInfo = try {
+      MetadataEvent.gson.fromJson(content, ChannelData::class.java)
     } catch (e: Exception) {
-      throw Error("can't parse $content", e)
+      Log.e("ChannelMetadataEvent", "Can't parse channel info $content", e)
+      ChannelData(null, null, null)
     }
   }
 
@@ -27,10 +29,15 @@ class ChannelCreateEvent (
     const val kind = 40
 
     fun create(channelInfo: ChannelData?, privateKey: ByteArray, createdAt: Long = Date().time / 1000): ChannelCreateEvent {
-      val content = if (channelInfo != null)
-        gson.toJson(channelInfo)
-      else
+      val content = try {
+        if (channelInfo != null)
+          gson.toJson(channelInfo)
+        else
+          ""
+      } catch (t: Throwable) {
+        Log.e("ChannelCreateEvent", "Couldn't parse channel information", t)
         ""
+      }
 
       val pubKey = Utils.pubkeyCreate(privateKey)
       val tags = emptyList<List<String>>()

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

@@ -1,5 +1,6 @@
 package com.vitorpamplona.amethyst.service.model
 
+import android.util.Log
 import java.util.Date
 import nostr.postr.ContactMetaData
 import nostr.postr.Utils
@@ -20,21 +21,24 @@ class ChannelMetadataEvent (
 
   init {
     channel = tags.firstOrNull { it.firstOrNull() == "e" }?.getOrNull(1)
-    try {
-      channelInfo = MetadataEvent.gson.fromJson(content, ChannelCreateEvent.ChannelData::class.java)
-    } catch (e: Exception) {
-      throw Error("can't parse $content", e)
-    }
+    channelInfo =
+      try {
+        MetadataEvent.gson.fromJson(content, ChannelCreateEvent.ChannelData::class.java)
+      } catch (e: Exception) {
+        Log.e("ChannelMetadataEvent", "Can't parse channel info $content", e)
+        ChannelCreateEvent.ChannelData(null, null, null)
+      }
   }
 
   companion object {
     const val kind = 41
 
     fun create(newChannelInfo: ChannelCreateEvent.ChannelData?, originalChannelIdHex: String, privateKey: ByteArray, createdAt: Long = Date().time / 1000): ChannelMetadataEvent {
-      val content = if (newChannelInfo != null)
-        gson.toJson(newChannelInfo)
-      else
-        ""
+      val content =
+        if (newChannelInfo != null)
+          gson.toJson(newChannelInfo)
+        else
+          ""
 
       val pubKey = Utils.pubkeyCreate(privateKey)
       val tags = listOf( listOf("e", originalChannelIdHex, "", "root") )

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

@@ -1,6 +1,9 @@
 package com.vitorpamplona.amethyst.service.relays
 
 import java.util.UUID
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
 import nostr.postr.events.Event
 
 /**
@@ -23,6 +26,7 @@ object Client: RelayPool.Listener {
     private var relays = Constants.convertDefaultRelays()
     private var subscriptions = mapOf<String, List<TypedFilter>>()
 
+    @Synchronized
     fun connect(relays: Array<Relay>) {
         RelayPool.register(this)
         RelayPool.unloadRelays()
@@ -30,6 +34,20 @@ object Client: RelayPool.Listener {
         this.relays = relays
     }
 
+    fun isSameRelaySetConfig(newRelayConfig: Array<Relay>): Boolean {
+        if (relays.size != newRelayConfig.size) return false
+
+        relays.forEach { oldRelayInfo ->
+            val newRelayInfo = newRelayConfig.find { it.url == oldRelayInfo.url }
+
+            if (newRelayInfo == null) return false
+
+            if (!oldRelayInfo.isSameRelayConfig(newRelayInfo)) return false
+        }
+
+        return true
+    }
+
     fun sendFilter(
         subscriptionId: String = UUID.randomUUID().toString().substring(0..10),
         filters: List<TypedFilter> = listOf()
@@ -50,8 +68,9 @@ object Client: RelayPool.Listener {
         RelayPool.send(signedEvent)
     }
 
-    fun close(subscriptionId: String){
+    fun close(subscriptionId: String) {
         RelayPool.close(subscriptionId)
+        subscriptions = subscriptions.minus(subscriptionId)
     }
 
     fun disconnect() {
@@ -61,19 +80,35 @@ object Client: RelayPool.Listener {
     }
 
     override fun onEvent(event: Event, subscriptionId: String, relay: Relay) {
-        listeners.forEach { it.onEvent(event, subscriptionId, relay) }
+        // Releases the Web thread for the new payload.
+        // May need to add a processing queue if processing new events become too costly.
+        GlobalScope.launch(Dispatchers.Default) {
+            listeners.forEach { it.onEvent(event, subscriptionId, relay) }
+        }
     }
 
     override fun onError(error: Error, subscriptionId: String, relay: Relay) {
-        listeners.forEach { it.onError(error, subscriptionId, relay) }
+        // Releases the Web thread for the new payload.
+        // May need to add a processing queue if processing new events become too costly.
+        GlobalScope.launch(Dispatchers.Default) {
+            listeners.forEach { it.onError(error, subscriptionId, relay) }
+        }
     }
 
     override fun onRelayStateChange(type: Relay.Type, relay: Relay, channel: String?) {
-        listeners.forEach { it.onRelayStateChange(type, relay, channel) }
+        // Releases the Web thread for the new payload.
+        // May need to add a processing queue if processing new events become too costly.
+        GlobalScope.launch(Dispatchers.Default) {
+            listeners.forEach { it.onRelayStateChange(type, relay, channel) }
+        }
     }
 
     override fun onSendResponse(eventId: String, success: Boolean, message: String, relay: Relay) {
-        listeners.forEach { it.onSendResponse(eventId, success, message, relay) }
+        // Releases the Web thread for the new payload.
+        // May need to add a processing queue if processing new events become too costly.
+        GlobalScope.launch(Dispatchers.Default) {
+            listeners.forEach { it.onSendResponse(eventId, success, message, relay) }
+        }
     }
 
     fun subscribe(listener: Listener) {

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

@@ -0,0 +1,16 @@
+package com.vitorpamplona.amethyst.service.relays
+
+import fr.acinq.secp256k1.Secp256k1
+import nostr.postr.events.Event
+import nostr.postr.events.generateId
+
+fun Event.hasValidSignature(): Boolean {
+  if (!id.contentEquals(generateId())) {
+    return false
+  }
+  if (!Secp256k1.get().verifySchnorr(sig, id, pubKey)) {
+    return false
+  }
+
+  return true
+}

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

@@ -22,9 +22,6 @@ class Relay(
     var activeTypes: Set<FeedType> = FeedType.values().toSet(),
 ) {
     private val httpClient = OkHttpClient.Builder()
-        .connectTimeout(100, TimeUnit.SECONDS)
-        .readTimeout(100, TimeUnit.SECONDS)
-        .callTimeout(100, TimeUnit.SECONDS)
         .followRedirects(true)
         .followSslRedirects(true)
         .build();
@@ -34,6 +31,7 @@ class Relay(
     private var isReady: Boolean = false
 
     var eventDownloadCounter = 0
+    var spamCounter = 0
     var eventUploadCounter = 0
     var errorCounter = 0
     var ping: Long? = null
@@ -148,6 +146,8 @@ class Relay(
 
             socket = httpClient.newWebSocket(request, listener)
         } catch (e: Exception) {
+            errorCounter++
+            isReady = false
             closingTime = Date().time / 1000
             Log.e("Relay", "Relay Invalid $url")
             e.printStackTrace()
@@ -205,6 +205,13 @@ class Relay(
         socket?.send("""["CLOSE","$subscriptionId"]""")
     }
 
+    fun isSameRelayConfig(other: Relay): Boolean {
+        return url == other.url
+            && write == other.write
+            && read == other.read
+            && activeTypes == other.activeTypes
+    }
+
     enum class Type {
         // Websocket connected
         CONNECT,

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

@@ -1,6 +1,5 @@
 package com.vitorpamplona.amethyst.ui
 
-import android.net.Uri
 import android.os.Build.VERSION.SDK_INT
 import android.os.Bundle
 import androidx.activity.ComponentActivity
@@ -15,21 +14,14 @@ import coil.ImageLoader
 import coil.decode.GifDecoder
 import coil.decode.ImageDecoderDecoder
 import coil.decode.SvgDecoder
-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.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
+import java.util.*
 
 class MainActivity : ComponentActivity() {
   override fun onCreate(savedInstanceState: Bundle?) {
@@ -50,7 +42,7 @@ class MainActivity : ComponentActivity() {
           add(GifDecoder.Factory())
         }
         add(SvgDecoder.Factory())
-      }
+      } //.logger(DebugLogger())
         .respectCacheHeaders(false)
         .build()
     }
@@ -60,11 +52,11 @@ class MainActivity : ComponentActivity() {
         // A surface container using the 'background' color from the theme
         Surface(modifier = Modifier.fillMaxSize(), color = MaterialTheme.colors.background) {
 
-          val accountViewModel: AccountStateViewModel = viewModel {
+          val accountStateViewModel: AccountStateViewModel = viewModel {
             AccountStateViewModel(LocalPreferences(applicationContext))
           }
 
-          AccountScreen(accountViewModel, startingPage)
+          AccountScreen(accountStateViewModel, startingPage)
         }
       }
     }
@@ -74,7 +66,8 @@ class MainActivity : ComponentActivity() {
 
   override fun onResume() {
     super.onResume()
-
+    
+    // Only starts after login
     ServiceManager.start()
   }
 
@@ -83,4 +76,14 @@ class MainActivity : ComponentActivity() {
 
     super.onPause()
   }
+
+  /**
+   * Release memory when the UI becomes hidden or when system resources become low.
+   * @param level the memory-related event that was raised.
+   */
+  override fun onTrimMemory(level: Int) {
+    super.onTrimMemory(level)
+    println("Trim Memory $level")
+    ServiceManager.cleanUp()
+  }
 }

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

@@ -38,8 +38,6 @@ class NewChannelViewModel: ViewModel() {
                     channelDescription.value.text,
                     channelPicture.value.text
                 )
-
-                LocalPreferences(context).saveToEncryptedStorage(account)
             } else
                 account.sendChangeChannel(
                     channelName.value.text,

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

@@ -5,8 +5,10 @@ import androidx.compose.foundation.border
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.itemsIndexed
+import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.*
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
@@ -43,18 +45,19 @@ import nostr.postr.events.TextNoteEvent
 
 @OptIn(ExperimentalComposeUiApi::class)
 @Composable
-fun NewPostView(onClose: () -> Unit, baseReplyTo: Note? = null, account: Account) {
+fun NewPostView(onClose: () -> Unit, baseReplyTo: Note? = null, quote: Note? = null, account: Account) {
     val postViewModel: NewPostViewModel = viewModel()
 
-    postViewModel.load(account, baseReplyTo)
-
     val context = LocalContext.current
 
     // initialize focus reference to be able to request focus programmatically
     val focusRequester = remember { FocusRequester() }
     val keyboardController = LocalSoftwareKeyboardController.current
 
+    val scroolState = rememberScrollState()
+
     LaunchedEffect(Unit) {
+        postViewModel.load(account, baseReplyTo, quote)
         delay(100)
         focusRequester.requestFocus()
 
@@ -71,125 +74,133 @@ fun NewPostView(onClose: () -> Unit, baseReplyTo: Note? = null, account: Account
             decorFitsSystemWindows = false
         )
     ) {
-        Surface(
-            modifier = Modifier
-                .fillMaxWidth().fillMaxHeight()
-        ) {
-            Column(
-                modifier = Modifier.padding(10.dp)
-            ) {
-                Row(
-                    modifier = Modifier
-                        .fillMaxWidth(),
-                    horizontalArrangement = Arrangement.SpaceBetween,
-                    verticalAlignment = Alignment.CenterVertically
-                ) {
-                    CloseButton(onCancel = {
-                        postViewModel.cancel()
-                        onClose()
-                    })
-
-                    UploadFromGallery(
-                        isUploading = postViewModel.isUploadingImage,
+        Surface(modifier = Modifier.fillMaxWidth().fillMaxHeight()) {
+            Column(modifier = Modifier.fillMaxWidth().fillMaxHeight()) {
+                Column(modifier = Modifier.padding(10.dp).imePadding().weight(1f)) {
+                    Row(
+                        modifier = Modifier.fillMaxWidth(),
+                        horizontalArrangement = Arrangement.SpaceBetween,
+                        verticalAlignment = Alignment.CenterVertically
                     ) {
-                        postViewModel.upload(it, context)
-                    }
-
-                    PostButton(
-                        onPost = {
-                            postViewModel.sendPost()
+                        CloseButton(onCancel = {
+                            postViewModel.cancel()
                             onClose()
-                        },
-                        isActive = postViewModel.message.text.isNotBlank()
-                                && !postViewModel.isUploadingImage
-                    )
-                }
+                        })
 
-                if (postViewModel.replyTos != null && baseReplyTo?.event is TextNoteEvent) {
-                    ReplyInformation(postViewModel.replyTos, postViewModel.mentions, "✖ ") {
-                        postViewModel.removeFromReplyList(it)
+                        UploadFromGallery(
+                            isUploading = postViewModel.isUploadingImage,
+                        ) {
+                            postViewModel.upload(it, context)
+                        }
+
+                        PostButton(
+                            onPost = {
+                                postViewModel.sendPost()
+                                onClose()
+                            },
+                            isActive = postViewModel.message.text.isNotBlank()
+                              && !postViewModel.isUploadingImage
+                        )
                     }
-                }
 
-                OutlinedTextField(
-                    value = postViewModel.message,
-                    onValueChange = {
-                        postViewModel.updateMessage(it)
-                    },
-                    keyboardOptions = KeyboardOptions.Default.copy(
-                        capitalization = KeyboardCapitalization.Sentences
-                    ),
-                    modifier = Modifier
-                        .fillMaxWidth()
-                        .border(
-                            width = 1.dp,
-                            color = MaterialTheme.colors.surface,
-                            shape = RoundedCornerShape(8.dp)
-                        )
-                        .focusRequester(focusRequester)
-                        .onFocusChanged {
-                            if (it.isFocused) {
-                                keyboardController?.show()
-                            }
-                        }.imePadding(),
-                    placeholder = {
-                        Text(
-                            text = "What's on your mind?",
-                            color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
-                        )
-                    },
-                    colors = TextFieldDefaults
-                        .outlinedTextFieldColors(
-                            unfocusedBorderColor = Color.Transparent,
-                            focusedBorderColor = Color.Transparent
-                        ),
-                    visualTransformation = UrlUserTagTransformation(MaterialTheme.colors.primary),
-                    textStyle = LocalTextStyle.current.copy(textDirection = TextDirection.Content)
-                )
-
-                val userSuggestions = postViewModel.userSuggestions
-                if (userSuggestions.isNotEmpty()) {
-                    LazyColumn(
-                        contentPadding = PaddingValues(
-                            top = 10.dp,
-                            bottom = 10.dp
-                        )
+                    Row(
+                        modifier = Modifier.fillMaxWidth().weight(1f)
                     ) {
-                        itemsIndexed(userSuggestions, key = { _, item -> item.pubkeyHex }) { index, item ->
-                            UserLine(item, account) {
-                                postViewModel.autocompleteWithUser(item)
+                        Column(modifier = Modifier.fillMaxWidth().verticalScroll(scroolState)) {
+                            if (postViewModel.replyTos != null && baseReplyTo?.event is TextNoteEvent) {
+                                ReplyInformation(postViewModel.replyTos, postViewModel.mentions, account, "✖ ") {
+                                    postViewModel.removeFromReplyList(it)
+                                }
+                            }
+
+                            OutlinedTextField(
+                                value = postViewModel.message,
+                                onValueChange = {
+                                    postViewModel.updateMessage(it)
+                                },
+                                keyboardOptions = KeyboardOptions.Default.copy(
+                                    capitalization = KeyboardCapitalization.Sentences
+                                ),
+                                modifier = Modifier
+                                    .fillMaxWidth()
+                                    .border(
+                                        width = 1.dp,
+                                        color = MaterialTheme.colors.surface,
+                                        shape = RoundedCornerShape(8.dp)
+                                    )
+                                    .focusRequester(focusRequester)
+                                    .onFocusChanged {
+                                        if (it.isFocused) {
+                                            keyboardController?.show()
+                                        }
+                                    },
+                                placeholder = {
+                                    Text(
+                                        text = "What's on your mind?",
+                                        color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                                    )
+                                },
+                                colors = TextFieldDefaults
+                                    .outlinedTextFieldColors(
+                                        unfocusedBorderColor = Color.Transparent,
+                                        focusedBorderColor = Color.Transparent
+                                    ),
+                                visualTransformation = UrlUserTagTransformation(MaterialTheme.colors.primary),
+                                textStyle = LocalTextStyle.current.copy(textDirection = TextDirection.Content)
+                            )
+
+                            val myUrlPreview = postViewModel.urlPreview
+                            if (myUrlPreview != null) {
+                                Row(modifier = Modifier.padding(top = 5.dp)) {
+                                    if (isValidURL(myUrlPreview)) {
+                                        val removedParamsFromUrl =
+                                            myUrlPreview.split("?")[0].toLowerCase()
+                                        if (imageExtension.matcher(removedParamsFromUrl).matches()) {
+                                            AsyncImage(
+                                                model = myUrlPreview,
+                                                contentDescription = myUrlPreview,
+                                                contentScale = ContentScale.FillWidth,
+                                                modifier = Modifier
+                                                    .padding(top = 4.dp)
+                                                    .fillMaxWidth()
+                                                    .clip(shape = RoundedCornerShape(15.dp))
+                                                    .border(
+                                                        1.dp,
+                                                        MaterialTheme.colors.onSurface.copy(alpha = 0.12f),
+                                                        RoundedCornerShape(15.dp)
+                                                    )
+                                            )
+                                        } else if (videoExtension.matcher(removedParamsFromUrl)
+                                                .matches()
+                                        ) {
+                                            VideoView(myUrlPreview)
+                                        } else {
+                                            UrlPreview(myUrlPreview, myUrlPreview)
+                                        }
+                                    } else if (noProtocolUrlValidator.matcher(myUrlPreview).matches()) {
+                                        UrlPreview("https://$myUrlPreview", myUrlPreview)
+                                    }
+                                }
                             }
                         }
-                    }
-                }
 
-                val myUrlPreview = postViewModel.urlPreview
-                if (myUrlPreview != null) {
-                    Column(modifier = Modifier.padding(top = 5.dp)) {
-                        if (isValidURL(myUrlPreview)) {
-                            val removedParamsFromUrl = myUrlPreview.split("?")[0].toLowerCase()
-                            if (imageExtension.matcher(removedParamsFromUrl).matches()) {
-                                AsyncImage(
-                                    model = myUrlPreview,
-                                    contentDescription = myUrlPreview,
-                                    contentScale = ContentScale.FillWidth,
-                                    modifier = Modifier
-                                        .padding(top = 4.dp)
-                                        .fillMaxWidth()
-                                        .clip(shape = RoundedCornerShape(15.dp))
-                                        .border(
-                                            1.dp,
-                                            MaterialTheme.colors.onSurface.copy(alpha = 0.12f),
-                                            RoundedCornerShape(15.dp)
-                                        )
-                                )
-                            } else if (videoExtension.matcher(removedParamsFromUrl).matches()) {
-                                VideoView(myUrlPreview)
-                            } else {
-                                UrlPreview(myUrlPreview, myUrlPreview)
+                    }
+
+                    val userSuggestions = postViewModel.userSuggestions
+                    if (userSuggestions.isNotEmpty()) {
+                        LazyColumn(
+                            contentPadding = PaddingValues(
+                                top = 10.dp
+                            ),
+                            modifier = Modifier.heightIn(0.dp, 300.dp)
+                        ) {
+                            itemsIndexed(
+                                userSuggestions,
+                                key = { _, item -> item.pubkeyHex }) { index, item ->
+                                UserLine(item, account) {
+                                    postViewModel.autocompleteWithUser(item)
+                                }
                             }
-                        } else if (noProtocolUrlValidator.matcher(myUrlPreview).matches()) {
-                            UrlPreview("https://$myUrlPreview", myUrlPreview)
                         }
                     }
                 }
@@ -233,6 +244,25 @@ fun PostButton(onPost: () -> Unit = {}, isActive: Boolean, modifier: Modifier =
     }
 }
 
+@Composable
+fun SaveButton(onPost: () -> Unit = {}, isActive: Boolean, modifier: Modifier = Modifier) {
+    Button(
+        modifier = modifier,
+        onClick = {
+            if (isActive) {
+                onPost()
+            }
+        },
+        shape = RoundedCornerShape(20.dp),
+        colors = ButtonDefaults
+            .buttonColors(
+                backgroundColor = if (isActive) MaterialTheme.colors.primary else Color.Gray
+            )
+    ) {
+        Text(text = "Save", color = Color.White)
+    }
+}
+
 @Composable
 fun CreateButton(onPost: () -> Unit = {}, isActive: Boolean, modifier: Modifier = Modifier) {
     Button(

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

@@ -31,7 +31,7 @@ class NewPostViewModel: ViewModel() {
     var userSuggestions by mutableStateOf<List<User>>(emptyList())
     var userSuggestionAnchor: TextRange? = null
 
-    fun load(account: Account, replyingTo: Note?) {
+    fun load(account: Account, replyingTo: Note?, quote: Note?) {
         originalNote = replyingTo
         replyingTo?.let { replyNote ->
             this.replyTos = (replyNote.replyTo ?: emptyList()).plus(replyNote)
@@ -45,49 +45,60 @@ class NewPostViewModel: ViewModel() {
 
             }
         }
+
+        quote?.let {
+            message = TextFieldValue(message.text + "\n\n@${it.idNote()}")
+        }
+
         this.account = account
     }
 
-    fun addUserToMentionsIfNotInAndReturnIndex(user: User): Int {
-        val replyToSize = replyTos?.size ?: 0
+    fun addUserToMentions(user: User) {
+        mentions = if (mentions?.contains(user) == true) mentions else mentions?.plus(user) ?: listOf(user)
+    }
 
-        var myMentions = mentions
-        if (myMentions == null) {
-            mentions = listOf(user)
-            return replyToSize + 0 // position of the user
-        }
+    fun addNoteToReplyTos(note: Note) {
+        note.author?.let { addUserToMentions(it) }
+        replyTos = if (replyTos?.contains(note) == true) replyTos else replyTos?.plus(note) ?: listOf(note)
+    }
 
-        val index = myMentions.indexOf(user)
+    fun tagIndex(user: User): Int {
+        // Postr Events assembles replies before mentions in the tag order
+        return (if (originalNote?.channel != null) 1 else 0) + (replyTos?.size ?: 0) + (mentions?.indexOf(user) ?: 0)
+    }
 
-        if (index >= 0) return replyToSize + index
-
-        myMentions = myMentions.plus(user)
-        mentions = myMentions
-        return replyToSize + myMentions.indexOf(user)
+    fun tagIndex(note: Note): Int {
+        // Postr Events assembles replies before mentions in the tag order
+        return (if (originalNote?.channel != null) 1 else 0) + (replyTos?.indexOf(note) ?: 0)
     }
 
     fun sendPost() {
-        // Moves @npub to mentions
+        // adds all references to mentions and reply tos
+        message.text.split('\n').forEach { paragraph: String ->
+            paragraph.split(' ').forEach { word: String ->
+                val results = parseDirtyWordForKey(word)
+
+                if (results?.type == "npub") {
+                    addUserToMentions(LocalCache.getOrCreateUser(results.keyHex))
+                } else if (results?.type == "note") {
+                    addNoteToReplyTos(LocalCache.getOrCreateNote(results.keyHex))
+                }
+            }
+        }
+
+        // Tags the text in the correct order.
         val newMessage = message.text.split('\n').map { paragraph: String ->
             paragraph.split(' ').map { word: String ->
-                try {
-                    if (word.startsWith("@npub") && word.length >= 64) {
-                        val keyB32 = word.substring(0, 64)
-                        val restOfWord = word.substring(64)
+                val results = parseDirtyWordForKey(word)
+                if (results?.type == "npub") {
+                    val user = LocalCache.getOrCreateUser(results.keyHex)
 
-                        val key = decodePublicKey(keyB32.removePrefix("@"))
-                        val user = LocalCache.getOrCreateUser(key.toHexKey())
+                    "#[${tagIndex(user)}]${results.restOfWord}"
+                } else if (results?.type == "note") {
+                    val note = LocalCache.getOrCreateNote(results.keyHex)
 
-                        val index = addUserToMentionsIfNotInAndReturnIndex(user)
-
-                        val newWord = "#[${index}]"
-
-                        newWord + restOfWord
-                    } else {
-                        word
-                    }
-                } catch (e: Exception) {
-                    // if it can't parse the key, don't try to change.
+                    "#[${tagIndex(note)}]${results.restOfWord}"
+                } else {
                     word
                 }
             }.joinToString(" ")
@@ -102,6 +113,7 @@ class NewPostViewModel: ViewModel() {
         message = TextFieldValue("")
         urlPreview = null
         isUploadingImage = false
+        mentions = null
     }
 
     fun upload(it: Uri, context: Context) {
@@ -128,6 +140,7 @@ class NewPostViewModel: ViewModel() {
         message = TextFieldValue("")
         urlPreview = null
         isUploadingImage = false
+        mentions = null
     }
 
     fun findUrlInMessage(): String? {
@@ -161,7 +174,7 @@ class NewPostViewModel: ViewModel() {
         userSuggestionAnchor?.let {
             val lastWord = message.text.substring(0, it.end).substringAfterLast("\n").substringAfterLast(" ")
             val lastWordStart = it.end - lastWord.length
-            val wordToInsert = "@${item.pubkey.toNpub()} "
+            val wordToInsert = "@${item.pubkeyNpub()} "
 
             message = TextFieldValue(
                 message.text.replaceRange(lastWordStart, it.end, wordToInsert),

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

@@ -23,6 +23,7 @@ import androidx.compose.material.Surface
 import androidx.compose.material.Text
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Cancel
+import androidx.compose.material.icons.filled.DeleteSweep
 import androidx.compose.material.icons.filled.Download
 import androidx.compose.material.icons.filled.Groups
 import androidx.compose.material.icons.filled.Public
@@ -148,7 +149,7 @@ fun ServerConfigHeader() {
                 }
             }
 
-            Column(Modifier.weight(1f)) {
+            Column(Modifier.weight(1.4f)) {
                 Row(verticalAlignment = Alignment.CenterVertically) {
                     Spacer(modifier = Modifier.size(25.dp))
 
@@ -181,6 +182,16 @@ fun ServerConfigHeader() {
                     )
 
                     Spacer(modifier = Modifier.size(5.dp))
+
+                    Text(
+                        text = "Spam",
+                        maxLines = 1,
+                        fontSize = 14.sp,
+                        modifier = Modifier.weight(1f),
+                        color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f),
+                    )
+
+                    Spacer(modifier = Modifier.size(2.dp))
                 }
             }
         }
@@ -290,7 +301,7 @@ fun ServerConfig(
                         }
                     }
 
-                    Column(Modifier.weight(1f)) {
+                    Column(Modifier.weight(1.4f)) {
                         Row(verticalAlignment = Alignment.CenterVertically) {
                             IconButton(
                                 modifier = Modifier.size(30.dp),
@@ -350,6 +361,21 @@ fun ServerConfig(
                                 modifier = Modifier.weight(1f),
                                 color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f),
                             )
+
+                            Icon(
+                                imageVector = Icons.Default.DeleteSweep,
+                                null,
+                                modifier = Modifier.padding(horizontal = 5.dp).size(15.dp),
+                                tint = if (item.spamCount > 0) Color.Yellow else Color.Green
+                            )
+
+                            Text(
+                                text = "${countToHumanReadable(item.spamCount)}",
+                                maxLines = 1,
+                                fontSize = 14.sp,
+                                modifier = Modifier.weight(1f),
+                                color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f),
+                            )
                         }
                     }
                 }

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

@@ -25,7 +25,6 @@ class NewRelayListViewModel: ViewModel() {
     fun create(ctx: Context) {
         relays.let {
             account.saveRelayList(it.value)
-            LocalPreferences(ctx).saveToEncryptedStorage(account)
         }
 
         clear(ctx)
@@ -43,8 +42,9 @@ class NewRelayListViewModel: ViewModel() {
                     val errorCounter = liveRelay?.errorCounter ?: 0
                     val eventDownloadCounter = liveRelay?.eventDownloadCounter ?: 0
                     val eventUploadCounter = liveRelay?.eventUploadCounter ?: 0
+                    val spamCounter = liveRelay?.spamCounter ?: 0
 
-                    RelaySetupInfo(it.key, it.value.read, it.value.write, errorCounter, eventDownloadCounter, eventUploadCounter, localInfoFeedTypes)
+                    RelaySetupInfo(it.key, it.value.read, it.value.write, errorCounter, eventDownloadCounter, eventUploadCounter, spamCounter, localInfoFeedTypes)
                 }.sortedBy { it.downloadCount }.reversed()
             else
                 account.localRelays.map {
@@ -53,8 +53,9 @@ class NewRelayListViewModel: ViewModel() {
                     val errorCounter = liveRelay?.errorCounter ?: 0
                     val eventDownloadCounter = liveRelay?.eventDownloadCounter ?: 0
                     val eventUploadCounter = liveRelay?.eventUploadCounter ?: 0
+                    val spamCounter = liveRelay?.spamCounter ?: 0
 
-                    RelaySetupInfo(it.url, it.read, it.write, errorCounter, eventDownloadCounter, eventUploadCounter, it.feedTypes)
+                    RelaySetupInfo(it.url, it.read, it.write, errorCounter, eventDownloadCounter, eventUploadCounter, spamCounter, it.feedTypes)
                 }.sortedBy { it.downloadCount }.reversed()
         }
     }

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

@@ -29,19 +29,19 @@ class NewUserMetadataViewModel: ViewModel() {
         account.userProfile().let {
             userName.value = it.bestUsername() ?: ""
             displayName.value = it.bestDisplayName() ?: ""
-            about.value = it.info.about ?: ""
-            picture.value = it.info.picture ?: ""
-            banner.value = it.info.banner ?: ""
-            website.value = it.info.website ?: ""
-            nip05.value = it.info.nip05 ?: ""
-            lnAddress.value = it.info.lud16 ?: ""
-            lnURL.value = it.info.lud06 ?: ""
+            about.value = it.info?.about ?: ""
+            picture.value = it.info?.picture ?: ""
+            banner.value = it.info?.banner ?: ""
+            website.value = it.info?.website ?: ""
+            nip05.value = it.info?.nip05 ?: ""
+            lnAddress.value = it.info?.lud16 ?: ""
+            lnURL.value = it.info?.lud06 ?: ""
         }
     }
 
     fun create() {
         // Tries to not delete any existing attribute that we do not work with.
-        val latest = account.userProfile().latestMetadata
+        val latest = account.userProfile().info?.latestMetadata
         val currentJson = if (latest != null) {
             ObjectMapper().readTree(
                 ByteArrayInputStream(latest.content.toByteArray(Charsets.UTF_8))
@@ -49,17 +49,17 @@ class NewUserMetadataViewModel: ViewModel() {
         } else {
             ObjectMapper().createObjectNode()
         }
-        currentJson.put("name", userName.value)
-        currentJson.put("username", userName.value)
-        currentJson.put("display_name", displayName.value)
-        currentJson.put("displayName", displayName.value)
-        currentJson.put("picture", picture.value)
-        currentJson.put("banner", banner.value)
-        currentJson.put("website", website.value)
-        currentJson.put("about", about.value)
-        currentJson.put("nip05", nip05.value)
-        currentJson.put("lud16", lnAddress.value)
-        currentJson.put("lud06", lnURL.value)
+        currentJson.put("name", userName.value.trim())
+        currentJson.put("username", userName.value.trim())
+        currentJson.put("display_name", displayName.value.trim())
+        currentJson.put("displayName", displayName.value.trim())
+        currentJson.put("picture", picture.value.trim())
+        currentJson.put("banner", banner.value.trim())
+        currentJson.put("website", website.value.trim())
+        currentJson.put("about", about.value.trim())
+        currentJson.put("nip05", nip05.value.trim())
+        currentJson.put("lud16", lnAddress.value.trim())
+        currentJson.put("lud06", lnURL.value.trim())
 
         val writer = StringWriter()
         ObjectMapper().writeValue(writer, currentJson)

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

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

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

@@ -18,7 +18,7 @@ fun ClickableNoteTag(
   navController: NavController
 ) {
   ClickableText(
-    text = AnnotatedString("@${baesNote.id.toNote().toShortenHex()} "),
+    text = AnnotatedString("@${baesNote.idNote().toShortenHex()} "),
     onClick = { navController.navigate("Note/${baesNote.idHex}") },
     style = LocalTextStyle.current.copy(color = MaterialTheme.colors.primary)
   )

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

@@ -9,13 +9,8 @@ import androidx.compose.runtime.livedata.observeAsState
 import androidx.compose.ui.text.AnnotatedString
 import androidx.navigation.NavController
 import com.vitorpamplona.amethyst.model.LocalCache
-import com.vitorpamplona.amethyst.model.User
-import com.vitorpamplona.amethyst.model.toByteArray
-import com.vitorpamplona.amethyst.model.toNote
 import com.vitorpamplona.amethyst.service.Nip19
 import com.vitorpamplona.amethyst.service.model.ChannelCreateEvent
-import com.vitorpamplona.amethyst.ui.note.toShortenHex
-import nostr.postr.toNpub
 
 @Composable
 fun ClickableRoute(
@@ -25,7 +20,7 @@ fun ClickableRoute(
   if (nip19.type == Nip19.Type.USER) {
     val userBase = LocalCache.getOrCreateUser(nip19.hex)
 
-    val userState by userBase.liveMetadata.observeAsState()
+    val userState by userBase.live().metadata.observeAsState()
     val user = userState?.user ?: return
 
     val route = "User/${nip19.hex}"
@@ -38,12 +33,12 @@ fun ClickableRoute(
     )
   } else {
     val noteBase = LocalCache.getOrCreateNote(nip19.hex)
-    val noteState by noteBase.live.observeAsState()
+    val noteState by noteBase.live().metadata.observeAsState()
     val note = noteState?.note ?: return
 
     if (note.event is ChannelCreateEvent) {
       ClickableText(
-        text = AnnotatedString("@${note.idDisplayNote} "),
+        text = AnnotatedString("@${note.idDisplayNote()} "),
         onClick = { navController.navigate("Channel/${nip19.hex}") },
         style = LocalTextStyle.current.copy(color = MaterialTheme.colors.primary)
       )
@@ -55,7 +50,7 @@ fun ClickableRoute(
       )
     } else {
       ClickableText(
-        text = AnnotatedString("@${note.idDisplayNote} "),
+        text = AnnotatedString("@${note.idDisplayNote()} "),
         onClick = { navController.navigate("Note/${nip19.hex}") },
         style = LocalTextStyle.current.copy(color = MaterialTheme.colors.primary)
       )

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

@@ -15,7 +15,7 @@ fun ClickableUserTag(
   user: User,
   navController: NavController
 ) {
-  val innerUserState by user.liveMetadata.observeAsState()
+  val innerUserState by user.live().metadata.observeAsState()
   ClickableText(
     text = AnnotatedString("@${innerUserState?.user?.toBestDisplayName()} "),
     onClick = { navController.navigate("User/${innerUserState?.user?.pubkeyHex}") },

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

@@ -21,14 +21,19 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Brush
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.compositeOver
 import androidx.compose.ui.unit.dp
 import androidx.navigation.NavController
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 
 @Composable
 fun ExpandableRichTextViewer(
   content: String,
   canPreview: Boolean,
+  modifier: Modifier = Modifier,
   tags: List<List<String>>?,
+  backgroundColor: Color,
+  accountViewModel: AccountViewModel,
   navController: NavController
 ) {
   var showFullText by remember { mutableStateOf(false) }
@@ -36,7 +41,7 @@ fun ExpandableRichTextViewer(
   val text = if (showFullText) content else content.take(350)
 
   Box(contentAlignment = Alignment.BottomCenter) {
-    RichTextViewer(text, canPreview, tags, navController)
+    RichTextViewer(text, canPreview, modifier, tags, backgroundColor, accountViewModel, navController)
 
     if (content.length > 350 && !showFullText) {
       Row(
@@ -47,8 +52,8 @@ fun ExpandableRichTextViewer(
           .background(
             brush = Brush.verticalGradient(
               colors = listOf(
-                MaterialTheme.colors.background.copy(alpha = 0f),
-                MaterialTheme.colors.background
+                backgroundColor.copy(alpha = 0f),
+                backgroundColor
               )
             )
           )
@@ -58,7 +63,7 @@ fun ExpandableRichTextViewer(
           onClick = { showFullText = !showFullText },
           shape = RoundedCornerShape(20.dp),
           colors = ButtonDefaults.buttonColors(
-            backgroundColor = MaterialTheme.colors.primary
+            backgroundColor = MaterialTheme.colors.primary.copy(alpha = 0.32f).compositeOver(MaterialTheme.colors.background)
           ),
           contentPadding = PaddingValues(vertical = 6.dp, horizontal = 16.dp)
         ) {

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

@@ -38,10 +38,11 @@ import androidx.compose.ui.unit.sp
 import androidx.core.content.ContextCompat.startActivity
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.lnurl.LightningAddressResolver
+import com.vitorpamplona.amethyst.model.Account
 import kotlinx.coroutines.launch
 
 @Composable
-fun InvoiceRequest(lud16: String, onClose: () -> Unit ) {
+fun InvoiceRequest(lud16: String, toUserPubKeyHex: String, account: Account, onClose: () -> Unit ) {
   val context = LocalContext.current
   val scope = rememberCoroutineScope()
 
@@ -128,7 +129,9 @@ fun InvoiceRequest(lud16: String, onClose: () -> Unit ) {
       Button(
         modifier = Modifier.fillMaxWidth().padding(vertical = 10.dp),
         onClick = {
-          LightningAddressResolver().lnAddressInvoice(lud16, amount * 1000, message,
+          val zapRequest = account.createZapRequestFor(toUserPubKeyHex)
+
+          LightningAddressResolver().lnAddressInvoice(lud16, amount * 1000, message, zapRequest?.toJson(),
             onSuccess = {
               runCatching {
                 val intent = Intent(Intent.ACTION_VIEW, Uri.parse("lightning:$it"))

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

@@ -2,11 +2,19 @@ package com.vitorpamplona.amethyst.ui.components
 
 import android.util.Patterns
 import androidx.compose.animation.animateContentSize
+import androidx.compose.foundation.background
+import androidx.compose.foundation.border
 import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.*
 import androidx.compose.runtime.*
+import androidx.compose.runtime.livedata.observeAsState
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.compositeOver
 import androidx.compose.ui.text.style.TextDirection
+import androidx.compose.ui.unit.dp
 import androidx.navigation.NavController
 import com.google.accompanist.flowlayout.FlowRow
 import com.vitorpamplona.amethyst.lnurl.LnInvoiceUtil
@@ -14,7 +22,9 @@ import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.toByteArray
 import com.vitorpamplona.amethyst.model.toNote
 import com.vitorpamplona.amethyst.service.Nip19
+import com.vitorpamplona.amethyst.ui.note.NoteCompose
 import com.vitorpamplona.amethyst.ui.note.toShortenHex
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import nostr.postr.toNpub
 import java.net.MalformedURLException
 import java.net.URISyntaxException
@@ -45,13 +55,13 @@ fun isValidURL(url: String?): Boolean {
 fun RichTextViewer(
   content: String,
   canPreview: Boolean,
+  modifier: Modifier = Modifier,
   tags: List<List<String>>?,
-  navController: NavController
+  backgroundColor: Color,
+  accountViewModel: AccountViewModel,
+  navController: NavController,
 ) {
-  Column(
-    Modifier
-      .fillMaxWidth()
-      .animateContentSize()) {
+  Column(modifier = modifier.animateContentSize()) {
     // FlowRow doesn't work well with paragraphs. So we need to split them
     content.split('\n').forEach { paragraph ->
 
@@ -79,7 +89,7 @@ fun RichTextViewer(
             } else if (noProtocolUrlValidator.matcher(word).matches()) {
               UrlPreview("https://$word", word)
             } else if (tagIndex.matcher(word).matches() && tags != null) {
-              TagLink(word, tags, navController)
+              TagLink(word, tags, backgroundColor, accountViewModel, navController)
             } else if (isBechLink(word)) {
               BechLink(word, navController)
             } else {
@@ -98,7 +108,7 @@ fun RichTextViewer(
             } else if (noProtocolUrlValidator.matcher(word).matches()) {
               ClickableUrl(word, "https://$word")
             } else if (tagIndex.matcher(word).matches() && tags != null) {
-              TagLink(word, tags, navController)
+              TagLink(word, tags, backgroundColor, accountViewModel, navController)
             } else if (isBechLink(word)) {
               BechLink(word, navController)
             } else {
@@ -152,7 +162,7 @@ fun BechLink(word: String, navController: NavController) {
 
 
 @Composable
-fun TagLink(word: String, tags: List<List<String>>, navController: NavController) {
+fun TagLink(word: String, tags: List<List<String>>, backgroundColor: Color, accountViewModel: AccountViewModel, navController: NavController) {
   val matcher = tagIndex.matcher(word)
 
   val index = try {
@@ -169,22 +179,43 @@ fun TagLink(word: String, tags: List<List<String>>, navController: NavController
 
   if (index >= 0 && index < tags.size) {
     if (tags[index][0] == "p") {
-      val user = LocalCache.users[tags[index][1]]
-      if (user != null) {
-        ClickableUserTag(user, navController)
+      val baseUser = LocalCache.checkGetOrCreateUser(tags[index][1])
+      if (baseUser != null) {
+        val userState = baseUser.live().metadata.observeAsState()
+        val user = userState.value?.user
+        if (user != null) {
+          ClickableUserTag(user, navController)
+        } else {
+          Text(text = "$word ")
+        }
       } else {
-        Text(text = "${tags[index][1].toByteArray().toNpub().toShortenHex()} ")
+        // if here the tag is not a valid Nostr Hex
+        Text(text = "$word ")
       }
     } else if (tags[index][0] == "e") {
-      val note = LocalCache.notes[tags[index][1]]
+      val note = LocalCache.checkGetOrCreateNote(tags[index][1])
       if (note != null) {
-        ClickableNoteTag(note, navController)
+        //ClickableNoteTag(note, navController)
+        NoteCompose(
+          baseNote = note,
+          accountViewModel = accountViewModel,
+          modifier = Modifier
+            .padding(0.dp)
+            .fillMaxWidth()
+            .clip(shape = RoundedCornerShape(15.dp))
+            .border(
+              1.dp,
+              MaterialTheme.colors.onSurface.copy(alpha = 0.12f),
+              RoundedCornerShape(15.dp)
+            ),
+          parentBackgroundColor = MaterialTheme.colors.onSurface.copy(alpha = 0.05f).compositeOver(backgroundColor),
+          isQuotedNote = true,
+          navController = navController)
       } else {
-        Text(text = "${tags[index][1].toByteArray().toNote().toShortenHex()} ")
+        // if here the tag is not a valid Nostr Hex
+        Text(text = "$word ")
       }
     } else
       Text(text = "$word ")
   }
 }
-
-

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

@@ -3,15 +3,20 @@ package com.vitorpamplona.amethyst.ui.components
 import android.content.res.Resources
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.text.ClickableText
 import androidx.compose.material.Divider
 import androidx.compose.material.DropdownMenu
 import androidx.compose.material.DropdownMenuItem
+import androidx.compose.material.Icon
 import androidx.compose.material.LocalTextStyle
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Text
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Check
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
@@ -20,6 +25,7 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.text.SpanStyle
 import androidx.compose.ui.text.buildAnnotatedString
@@ -37,7 +43,9 @@ import java.util.Locale
 fun TranslateableRichTextViewer(
   content: String,
   canPreview: Boolean,
+  modifier: Modifier = Modifier,
   tags: List<List<String>>?,
+  backgroundColor: Color,
   accountViewModel: AccountViewModel,
   navController: NavController
 ) {
@@ -54,14 +62,21 @@ fun TranslateableRichTextViewer(
   val account = accountState?.account ?: return
 
   LaunchedEffect(accountState) {
-    LanguageTranslatorService.autoTranslate(content, account.dontTranslateFrom, account.translateTo)
-      .addOnCompleteListener { task ->
-        if (task.isSuccessful) {
-          translatedTextState.value = task.result
-        } else {
-          translatedTextState.value = ResultOrError(content, null, null, null)
+    LanguageTranslatorService.autoTranslate(
+      content,
+      account.dontTranslateFrom,
+      account.translateTo
+    ).addOnCompleteListener { task ->
+      if (task.isSuccessful) {
+        if (task.result.sourceLang != null && task.result.targetLang != null) {
+          val preference = account.preferenceBetween(task.result.sourceLang!!, task.result.targetLang!!)
+          showOriginal = preference == task.result.sourceLang
         }
+        translatedTextState.value = task.result
+      } else {
+        translatedTextState.value = ResultOrError(content, null, null, null)
       }
+    }
   }
 
   val toBeViewed = if (showOriginal) content else translatedTextState.value.result ?: content
@@ -70,8 +85,11 @@ fun TranslateableRichTextViewer(
     ExpandableRichTextViewer(
       toBeViewed,
       canPreview,
+      modifier,
       tags,
-      navController
+      backgroundColor,
+      accountViewModel,
+      navController,
     )
 
     val target = translatedTextState.value.targetLang
@@ -79,7 +97,9 @@ fun TranslateableRichTextViewer(
 
     if (source != null && target != null) {
       if (source != target) {
-        Row(modifier = Modifier.fillMaxWidth().padding(top = 5.dp)) {
+        Row(modifier = Modifier
+          .fillMaxWidth()
+          .padding(top = 5.dp)) {
           val clickableTextStyle =
             SpanStyle(color = MaterialTheme.colors.primary.copy(alpha = 0.52f))
 
@@ -128,9 +148,56 @@ fun TranslateableRichTextViewer(
               accountViewModel.dontTranslateFrom(source, context)
               langSettingsPopupExpanded = false
             }) {
+              if (source in account.dontTranslateFrom)
+                Icon(
+                  imageVector = Icons.Default.Check,
+                  contentDescription = null,
+                  modifier = Modifier.size(24.dp)
+                )
+              else
+                Spacer(modifier = Modifier.size(24.dp))
+
+              Spacer(modifier = Modifier.size(10.dp))
+
               Text("Never translate from ${Locale(source).displayName}")
             }
             Divider()
+            DropdownMenuItem(onClick = {
+              accountViewModel.prefer(source, target, source)
+              langSettingsPopupExpanded = false
+            }) {
+              if (account.preferenceBetween(source, target) == source)
+                Icon(
+                  imageVector = Icons.Default.Check,
+                  contentDescription = null,
+                  modifier = Modifier.size(24.dp)
+                )
+              else
+                Spacer(modifier = Modifier.size(24.dp))
+
+              Spacer(modifier = Modifier.size(10.dp))
+
+              Text("Show in ${Locale(source).displayName} first")
+            }
+            DropdownMenuItem(onClick = {
+              accountViewModel.prefer(source, target, target)
+              langSettingsPopupExpanded = false
+            }) {
+              if (account.preferenceBetween(source, target) == target)
+                Icon(
+                  imageVector = Icons.Default.Check,
+                  contentDescription = null,
+                  modifier = Modifier.size(24.dp)
+                )
+              else
+                Spacer(modifier = Modifier.size(24.dp))
+
+              Spacer(modifier = Modifier.size(10.dp))
+
+              Text("Show in ${Locale(target).displayName} first")
+            }
+            Divider()
+
             val languageList =
               ConfigurationCompat.getLocales(Resources.getSystem().getConfiguration())
             for (i in 0 until languageList.size()) {
@@ -139,6 +206,17 @@ fun TranslateableRichTextViewer(
                   accountViewModel.translateTo(lang, context)
                   langSettingsPopupExpanded = false
                 }) {
+                  if (lang.language in account.translateTo)
+                    Icon(
+                      imageVector = Icons.Default.Check,
+                      contentDescription = null,
+                      modifier = Modifier.size(24.dp)
+                    )
+                  else
+                    Spacer(modifier = Modifier.size(24.dp))
+
+                  Spacer(modifier = Modifier.size(10.dp))
+                  
                   Text("Always translate to ${lang.displayName}")
                 }
               }

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

@@ -0,0 +1,25 @@
+package com.vitorpamplona.amethyst.ui.dal
+
+import com.vitorpamplona.amethyst.model.Account
+import com.vitorpamplona.amethyst.model.Channel
+import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
+import com.vitorpamplona.amethyst.service.relays.FeedType
+import com.vitorpamplona.amethyst.service.relays.TypedFilter
+import nostr.postr.JsonFilter
+
+object ChannelFeedFilter: FeedFilter<Note>() {
+  lateinit var account: Account
+  lateinit var channel: Channel
+
+  fun loadMessagesBetween(accountLoggedIn: Account, channelId: String) {
+    account = accountLoggedIn
+    channel = LocalCache.getOrCreateChannel(channelId)
+  }
+
+  // returns the last Note of each user.
+  override fun feed(): List<Note> {
+    return channel.notes?.values?.filter { account.isAcceptable(it) }?.sortedBy { it.event?.createdAt }?.reversed() ?: emptyList()
+  }
+}

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

@@ -0,0 +1,28 @@
+package com.vitorpamplona.amethyst.ui.dal
+
+import com.vitorpamplona.amethyst.model.Account
+import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.model.User
+
+object ChatroomFeedFilter: FeedFilter<Note>() {
+  var account: Account? = null
+  var withUser: User? = null
+
+  fun loadMessagesBetween(accountIn: Account, userId: String) {
+    account = accountIn
+    withUser = LocalCache.checkGetOrCreateUser(userId)
+  }
+
+  // returns the last Note of each user.
+  override fun feed(): List<Note> {
+    val myAccount = account
+    val myUser = withUser
+
+    if (myAccount == null || myUser == null) return emptyList()
+
+    val messages = myAccount.userProfile().privateChatrooms[myUser] ?: return emptyList()
+
+    return messages.roomMessages.filter { myAccount.isAcceptable(it) }.sortedBy { it.event?.createdAt }.reversed()
+  }
+}

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

@@ -0,0 +1,33 @@
+package com.vitorpamplona.amethyst.ui.dal
+
+import com.vitorpamplona.amethyst.model.Account
+import com.vitorpamplona.amethyst.model.Note
+
+object ChatroomListKnownFeedFilter: FeedFilter<Note>() {
+  lateinit var account: Account
+
+  // returns the last Note of each user.
+  override fun feed(): List<Note> {
+    val me = account.userProfile()
+
+    val privateChatrooms = account.userProfile().privateChatrooms
+    val messagingWith = privateChatrooms.keys.filter {
+      me.hasSentMessagesTo(it) && account.isAcceptable(it)
+    }
+
+    val privateMessages = messagingWith.mapNotNull {
+      privateChatrooms[it]?.roomMessages?.sortedBy {
+        it.event?.createdAt
+      }?.lastOrNull {
+        it.event != null
+      }
+    }
+
+    val publicChannels = account.followingChannels().map {
+      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/ui/dal/ChatroomListNewFeedFilter.kt

@@ -0,0 +1,29 @@
+package com.vitorpamplona.amethyst.ui.dal
+
+import com.vitorpamplona.amethyst.model.Account
+import com.vitorpamplona.amethyst.model.Note
+
+object ChatroomListNewFeedFilter: FeedFilter<Note>() {
+  lateinit var account: Account
+
+  // returns the last Note of each user.
+  override fun feed(): List<Note> {
+    val me = ChatroomListKnownFeedFilter.account.userProfile()
+
+    val privateChatrooms = account.userProfile().privateChatrooms
+    val messagingWith = privateChatrooms.keys.filter {
+      !me.hasSentMessagesTo(it) && account.isAcceptable(it)
+    }
+
+    val privateMessages = messagingWith.mapNotNull {
+      privateChatrooms[it]?.roomMessages?.sortedBy {
+        it.event?.createdAt
+      }?.lastOrNull {
+        it.event != null
+      }
+    }
+
+    return privateMessages.sortedBy { it.event?.createdAt }.reversed()
+  }
+
+}

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

@@ -0,0 +1,25 @@
+package com.vitorpamplona.amethyst.ui.dal
+
+import android.util.Log
+import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.model.UrlCachedPreviewer
+import kotlin.time.ExperimentalTime
+import kotlin.time.measureTimedValue
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.launch
+
+abstract class FeedFilter<T>() {
+  @OptIn(ExperimentalTime::class)
+  fun loadTop(): List<T> {
+    val (feed, elapsed) = measureTimedValue {
+      feed().take(1000)
+    }
+
+    Log.d("Time","${this.javaClass.simpleName} Feed in ${elapsed} with ${feed.size} objects")
+    return feed
+  }
+
+  abstract fun feed(): List<T>
+}

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

@@ -0,0 +1,24 @@
+package com.vitorpamplona.amethyst.ui.dal
+
+import com.vitorpamplona.amethyst.model.Account
+import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
+import com.vitorpamplona.amethyst.service.relays.FeedType
+import com.vitorpamplona.amethyst.service.relays.TypedFilter
+import nostr.postr.JsonFilter
+import nostr.postr.events.TextNoteEvent
+
+object GlobalFeedFilter: FeedFilter<Note>() {
+  lateinit var account: Account
+
+  override fun feed() = LocalCache.notes.values
+    .filter { account.isAcceptable(it) }
+    .filter {
+      (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/ui/dal/HiddenAccountsFeedFilter.kt

@@ -0,0 +1,10 @@
+package com.vitorpamplona.amethyst.ui.dal
+
+import com.vitorpamplona.amethyst.model.Account
+import com.vitorpamplona.amethyst.model.User
+
+object HiddenAccountsFeedFilter: FeedFilter<User>() {
+  lateinit var account: Account
+
+  override fun feed() = account.hiddenUsers()
+}

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

@@ -0,0 +1,25 @@
+package com.vitorpamplona.amethyst.ui.dal
+
+import com.vitorpamplona.amethyst.model.Account
+import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.service.model.RepostEvent
+import nostr.postr.events.TextNoteEvent
+
+object HomeConversationsFeedFilter: FeedFilter<Note>() {
+  lateinit var account: Account
+
+  override fun feed(): List<Note> {
+    val user = account.userProfile()
+
+    return LocalCache.notes.values
+      .filter {
+        (it.event is TextNoteEvent || it.event is RepostEvent)
+          && it.author in user.follows
+          // && account.isAcceptable(it)  // This filter follows only. No need to check if acceptable
+          && !it.isNewThread()
+      }
+      .sortedBy { it.event?.createdAt }
+      .reversed()
+  }
+}

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

@@ -0,0 +1,35 @@
+package com.vitorpamplona.amethyst.ui.dal
+
+import com.vitorpamplona.amethyst.model.Account
+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.model.UserState
+import com.vitorpamplona.amethyst.service.model.RepostEvent
+import com.vitorpamplona.amethyst.service.relays.FeedType
+import com.vitorpamplona.amethyst.service.relays.TypedFilter
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import nostr.postr.JsonFilter
+import nostr.postr.events.TextNoteEvent
+import nostr.postr.toHex
+
+object HomeNewThreadFeedFilter: FeedFilter<Note>() {
+  lateinit var account: Account
+
+  override fun feed(): List<Note> {
+    val user = account.userProfile()
+
+    return LocalCache.notes.values
+      .filter {
+        (it.event is TextNoteEvent || it.event is RepostEvent)
+          && it.author in user.follows
+          // && account.isAcceptable(it)  // This filter follows only. No need to check if acceptable
+          && it.isNewThread()
+      }
+      .sortedBy { it.event?.createdAt }
+      .reversed()
+  }
+}

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

@@ -1,4 +1,4 @@
-package com.vitorpamplona.amethyst.service
+package com.vitorpamplona.amethyst.ui.dal
 
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.Note
@@ -10,13 +10,12 @@ import com.vitorpamplona.amethyst.service.model.LnZapRequestEvent
 import com.vitorpamplona.amethyst.service.model.RepostEvent
 import nostr.postr.JsonFilter
 
-object NostrNotificationDataSource: NostrDataSource<Note>("NotificationFeed") {
+object NotificationFeedFilter: FeedFilter<Note>() {
   lateinit var account: Account
 
   override fun feed(): List<Note> {
     return account.userProfile().taggedPosts
-      .filter { it.event != null }
-      .filter { account.isAcceptable(it) }
+      .filter { it.author == null || (!account.isHidden(it.author!!) && it.author != account.userProfile()) }
       .filter {
            it.event !is ChannelCreateEvent
         && it.event !is ChannelMetadataEvent
@@ -25,6 +24,4 @@ object NostrNotificationDataSource: NostrDataSource<Note>("NotificationFeed") {
       .sortedBy { it.event?.createdAt }
       .reversed()
   }
-
-  override fun updateChannelFilters() {}
 }

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

@@ -0,0 +1,23 @@
+package com.vitorpamplona.amethyst.ui.dal
+
+import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.model.ThreadAssembler
+import com.vitorpamplona.amethyst.service.NostrThreadDataSource
+
+object ThreadFeedFilter: FeedFilter<Note>() {
+  var noteId: String? = null
+
+  override fun feed(): List<Note> {
+    val cachedSignatures: MutableMap<Note, String> = mutableMapOf()
+    val eventsToWatch = noteId?.let { ThreadAssembler().findThreadFor(it) } ?: emptySet()
+    // Currently orders by date of each event, descending, at each level of the reply stack
+    val order = compareByDescending<Note> { it.replyLevelSignature(cachedSignatures) }
+
+    return eventsToWatch.sortedWith(order)
+  }
+
+  fun loadThread(noteId: String?) {
+    this.noteId = noteId
+  }
+}

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

@@ -0,0 +1,24 @@
+package com.vitorpamplona.amethyst.ui.dal
+
+import com.vitorpamplona.amethyst.model.Account
+import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.model.User
+
+object UserProfileConversationsFeedFilter: FeedFilter<Note>() {
+  var account: Account? = null
+  var user: User? = null
+
+  fun loadUserProfile(accountLoggedIn: Account, userId: String) {
+    account = accountLoggedIn
+    user = LocalCache.checkGetOrCreateUser(userId)
+  }
+
+  override fun feed(): List<Note> {
+    return user?.notes
+      ?.filter { account?.isAcceptable(it) == true && !it.isNewThread() }
+      ?.sortedBy { it.event?.createdAt }
+      ?.reversed()
+      ?: emptyList()
+  }
+}

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

@@ -1,23 +1,19 @@
-package com.vitorpamplona.amethyst.service
+package com.vitorpamplona.amethyst.ui.dal
 
 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") {
+object UserProfileFollowersFeedFilter: FeedFilter<User>() {
   lateinit var account: Account
   var user: User? = null
 
-  fun loadUserProfile(userId: String) {
+  fun loadUserProfile(accountLoggedIn: Account, userId: String) {
+    account = accountLoggedIn
     user = LocalCache.users[userId]
-    resetFilters()
   }
 
   override fun feed(): List<User> {
     return user?.followers?.filter { account.isAcceptable(it) } ?: emptyList()
   }
-
-  override fun updateChannelFilters() {}
 }

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

@@ -0,0 +1,19 @@
+package com.vitorpamplona.amethyst.ui.dal
+
+import com.vitorpamplona.amethyst.model.Account
+import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.model.User
+
+object UserProfileFollowsFeedFilter: FeedFilter<User>() {
+  lateinit var account: Account
+  var user: User? = null
+
+  fun loadUserProfile(accountLoggedIn: Account, userId: String) {
+    account = accountLoggedIn
+    user = LocalCache.users[userId]
+  }
+
+  override fun feed(): List<User> {
+    return user?.follows?.filter { account.isAcceptable(it) }?.reversed() ?: emptyList()
+  }
+}

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

@@ -0,0 +1,24 @@
+package com.vitorpamplona.amethyst.ui.dal
+
+import com.vitorpamplona.amethyst.model.Account
+import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.model.User
+
+object UserProfileNewThreadFeedFilter: FeedFilter<Note>() {
+  var account: Account? = null
+  var user: User? = null
+
+  fun loadUserProfile(accountLoggedIn: Account, userId: String) {
+    account = accountLoggedIn
+    user = LocalCache.checkGetOrCreateUser(userId)
+  }
+
+  override fun feed(): List<Note> {
+    return user?.notes
+      ?.filter { account?.isAcceptable(it) == true && it.isNewThread() }
+      ?.sortedBy { it.event?.createdAt }
+      ?.reversed()
+      ?: emptyList()
+  }
+}

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

@@ -0,0 +1,18 @@
+package com.vitorpamplona.amethyst.ui.dal
+
+import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.model.User
+import com.vitorpamplona.amethyst.service.model.LnZapEvent
+
+object UserProfileReportsFeedFilter: FeedFilter<Note>() {
+  var user: User? = null
+
+  fun loadUserProfile(userId: String) {
+    user = LocalCache.checkGetOrCreateUser(userId)
+  }
+
+  override fun feed(): List<Note> {
+    return user?.reports?.values?.flatten()?.sortedBy { it.event?.createdAt }?.reversed() ?: emptyList()
+  }
+}

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

@@ -1,25 +1,18 @@
-package com.vitorpamplona.amethyst.service
+package com.vitorpamplona.amethyst.ui.dal
 
-import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.model.User
 import com.vitorpamplona.amethyst.service.model.LnZapEvent
-import nostr.postr.JsonFilter
-import nostr.postr.events.ContactListEvent
 
-object NostrUserProfileZapsDataSource: NostrDataSource<Pair<Note,Note>>("UserProfileZapsFeed") {
-  lateinit var account: Account
+object UserProfileZapsFeedFilter: FeedFilter<Pair<Note,Note>>() {
   var user: User? = null
 
   fun loadUserProfile(userId: String) {
-    user = LocalCache.users[userId]
-    resetFilters()
+    user = LocalCache.checkGetOrCreateUser(userId)
   }
 
   override fun feed(): List<Pair<Note,Note>> {
     return (user?.zaps?.filter { it.value != null }?.toList()?.sortedBy { (it.second?.event as? LnZapEvent)?.amount }?.reversed() ?: emptyList()) as List<Pair<Note, Note>>
   }
-
-  override fun updateChannelFilters() {}
 }

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

@@ -1,10 +1,15 @@
 package com.vitorpamplona.amethyst.ui.navigation
 
+import android.graphics.Rect
+import android.view.ViewTreeObserver
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.animateContentSize
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.ime
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.layout.wrapContentHeight
@@ -16,12 +21,23 @@ import androidx.compose.material.Icon
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.DisposableEffect
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.State
+import androidx.compose.runtime.getValue
 import androidx.compose.runtime.livedata.observeAsState
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.rememberUpdatedState
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.platform.LocalView
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
@@ -29,7 +45,7 @@ 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 com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import kotlinx.coroutines.launch
 
 val bottomNavigationItems = listOf(
@@ -39,57 +55,91 @@ val bottomNavigationItems = listOf(
     Route.Notification
 )
 
+enum class Keyboard {
+    Opened, Closed
+}
+
 @Composable
-fun AppBottomBar(navController: NavHostController) {
+fun keyboardAsState(): State<Keyboard> {
+    val keyboardState = remember { mutableStateOf(Keyboard.Closed) }
+    val view = LocalView.current
+    DisposableEffect(view) {
+        val onGlobalListener = ViewTreeObserver.OnGlobalLayoutListener {
+            val rect = Rect()
+            view.getWindowVisibleDisplayFrame(rect)
+            val screenHeight = view.rootView.height
+            val keypadHeight = screenHeight - rect.bottom
+            keyboardState.value = if (keypadHeight > screenHeight * 0.15) {
+                Keyboard.Opened
+            } else {
+                Keyboard.Closed
+            }
+        }
+        view.viewTreeObserver.addOnGlobalLayoutListener(onGlobalListener)
+
+        onDispose {
+            view.viewTreeObserver.removeOnGlobalLayoutListener(onGlobalListener)
+        }
+    }
+
+    return keyboardState
+}
+
+@Composable
+fun AppBottomBar(navController: NavHostController, accountViewModel: AccountViewModel) {
     val currentRoute = currentRoute(navController)
     val coroutineScope = rememberCoroutineScope()
 
-    Column() {
-        Divider(
-            thickness = 0.25.dp
-        )
-        BottomNavigation(
-            modifier = Modifier,
-            elevation = 0.dp,
-            backgroundColor = MaterialTheme.colors.background
-        ) {
-            bottomNavigationItems.forEach { item ->
-                BottomNavigationItem(
-                    icon = { NotifiableIcon(item, currentRoute) },
-                    selected = currentRoute == item.route,
-                    onClick = {
-                        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
-                                    }
+    val isKeyboardOpen by keyboardAsState()
 
-                                    launchSingleTop = true
-                                    restoreState = true
+    if (isKeyboardOpen == Keyboard.Closed) {
+        Column() {
+            Divider(
+                thickness = 0.25.dp
+            )
+            BottomNavigation(
+                modifier = Modifier,
+                elevation = 0.dp,
+                backgroundColor = MaterialTheme.colors.background
+            ) {
+                bottomNavigationItems.forEach { item ->
+                    BottomNavigationItem(
+                        icon = { NotifiableIcon(item, currentRoute, accountViewModel) },
+                        selected = currentRoute == item.route,
+                        onClick = {
+                            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
+                                    }
                                 }
                             }
                         }
-                    }
-                )
+                    )
+                }
             }
         }
     }
 }
 
 @Composable
-private fun NotifiableIcon(item: Route, currentRoute: String?) {
+private fun NotifiableIcon(item: Route, currentRoute: String?, accountViewModel: AccountViewModel) {
     Box(Modifier.size(if ("Home" == item.route) 25.dp else 23.dp)) {
         Icon(
             painter = painterResource(id = item.icon),
@@ -98,39 +148,52 @@ private fun NotifiableIcon(item: Route, currentRoute: String?) {
             tint = if (currentRoute == item.route) MaterialTheme.colors.primary else Color.Unspecified
         )
 
+        val accountState by accountViewModel.accountLiveData.observeAsState()
+        val account = accountState?.account ?: return
+
         // Notification
         val dbState = LocalCache.live.observeAsState()
+        val db = dbState.value ?: return
+
         val notifState = NotificationCache.live.observeAsState()
+        val notif = notifState.value ?: return
 
-        val db = dbState.value
-        val notif = notifState.value
+        var hasNewItems by remember { mutableStateOf<Boolean>(false) }
 
-        if (db != null && notif != null) {
-            if (item.hasNewItems(db.cache, notif.cache)) {
+        val context = LocalContext.current.applicationContext
+
+        LaunchedEffect(key1 = notif) {
+            hasNewItems = item.hasNewItems(account, notif.cache, context)
+        }
+
+        LaunchedEffect(key1 = db) {
+            hasNewItems = item.hasNewItems(account, notif.cache, context)
+        }
+
+        if (hasNewItems) {
+            Box(
+                Modifier
+                    .width(10.dp)
+                    .height(10.dp)
+                    .align(Alignment.TopEnd)
+            ) {
                 Box(
-                    Modifier
+                    modifier = Modifier
                         .width(10.dp)
                         .height(10.dp)
-                        .align(Alignment.TopEnd)
+                        .clip(shape = CircleShape)
+                        .background(MaterialTheme.colors.primary),
+                    contentAlignment = Alignment.TopEnd
                 ) {
-                    Box(
+                    Text(
+                        "",
+                        color = Color.White,
+                        textAlign = TextAlign.Center,
+                        fontSize = 12.sp,
                         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)
-                        )
-                    }
+                            .wrapContentHeight()
+                            .align(Alignment.TopEnd)
+                    )
                 }
             }
         }

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

@@ -1,7 +1,6 @@
 package com.vitorpamplona.amethyst.ui.navigation
 
 import android.util.Log
-import androidx.compose.foundation.border
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
@@ -34,36 +33,33 @@ 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.BitmapPainter
 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.tooling.preview.Preview
 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
 import com.vitorpamplona.amethyst.RoboHashCache
+import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.service.NostrAccountDataSource
 import com.vitorpamplona.amethyst.service.NostrChannelDataSource
-import com.vitorpamplona.amethyst.service.NostrChatRoomDataSource
+import com.vitorpamplona.amethyst.service.NostrChatroomDataSource
 import com.vitorpamplona.amethyst.service.NostrChatroomListDataSource
 import com.vitorpamplona.amethyst.service.NostrGlobalDataSource
 import com.vitorpamplona.amethyst.service.NostrHomeDataSource
-import com.vitorpamplona.amethyst.service.NostrNotificationDataSource
+import com.vitorpamplona.amethyst.service.NostrSearchEventOrUserDataSource
+import com.vitorpamplona.amethyst.service.NostrSingleChannelDataSource
 import com.vitorpamplona.amethyst.service.NostrSingleEventDataSource
 import com.vitorpamplona.amethyst.service.NostrSingleUserDataSource
 import com.vitorpamplona.amethyst.service.NostrThreadDataSource
 import com.vitorpamplona.amethyst.service.NostrUserProfileDataSource
-import com.vitorpamplona.amethyst.service.NostrUserProfileFollowersDataSource
-import com.vitorpamplona.amethyst.service.NostrUserProfileFollowsDataSource
 import com.vitorpamplona.amethyst.service.relays.Client
 import com.vitorpamplona.amethyst.service.relays.RelayPool
+import com.vitorpamplona.amethyst.ui.components.AsyncImageProxy
+import com.vitorpamplona.amethyst.ui.components.ResizeImage
 import com.vitorpamplona.amethyst.ui.actions.NewRelayListView
-import com.vitorpamplona.amethyst.ui.actions.NewUserMetadataView
 import com.vitorpamplona.amethyst.ui.screen.RelayPoolViewModel
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import kotlinx.coroutines.launch
@@ -82,7 +78,7 @@ fun MainTopBar(scaffoldState: ScaffoldState, accountViewModel: AccountViewModel)
     val accountState by accountViewModel.accountLiveData.observeAsState()
     val account = accountState?.account ?: return
 
-    val accountUserState by account.userProfile().liveMetadata.observeAsState()
+    val accountUserState by account.userProfile().live().metadata.observeAsState()
     val accountUser = accountUserState?.user ?: return
 
     val relayViewModel: RelayPoolViewModel = viewModel { RelayPoolViewModel() }
@@ -113,7 +109,8 @@ fun MainTopBar(scaffoldState: ScaffoldState, accountViewModel: AccountViewModel)
                     Box(Modifier) {
                         Column(
                             modifier = Modifier
-                                .fillMaxWidth().fillMaxHeight()
+                                .fillMaxWidth()
+                                .fillMaxHeight()
                                 .padding(start = 0.dp, end = 20.dp),
                             horizontalAlignment = Alignment.CenterHorizontally,
                             verticalArrangement = Arrangement.Center
@@ -131,26 +128,28 @@ fun MainTopBar(scaffoldState: ScaffoldState, accountViewModel: AccountViewModel)
 
                                     NostrAccountDataSource.printCounter()
                                     NostrChannelDataSource.printCounter()
-                                    NostrChatRoomDataSource.printCounter()
+                                    NostrChatroomDataSource.printCounter()
                                     NostrChatroomListDataSource.printCounter()
 
                                     NostrGlobalDataSource.printCounter()
                                     NostrHomeDataSource.printCounter()
-                                    NostrNotificationDataSource.printCounter()
 
                                     NostrSingleEventDataSource.printCounter()
+                                    NostrSearchEventOrUserDataSource.printCounter()
+                                    NostrSingleChannelDataSource.printCounter()
                                     NostrSingleUserDataSource.printCounter()
                                     NostrThreadDataSource.printCounter()
 
                                     NostrUserProfileDataSource.printCounter()
-                                    NostrUserProfileFollowersDataSource.printCounter()
-                                    NostrUserProfileFollowsDataSource.printCounter()
 
-                                    println("AAA: " + RelayPool.connectedRelays())
+                                    println("Connected Relays: " + RelayPool.connectedRelays())
 
                                     val imageLoader = Coil.imageLoader(context)
-                                    println("${imageLoader.diskCache?.size}/${imageLoader.diskCache?.maxSize}")
-                                    println("${imageLoader.memoryCache?.size}/${imageLoader.memoryCache?.maxSize}")
+                                    println("Image Disk Cache ${(imageLoader.diskCache?.size ?: 0)/(1024*1024)}/${(imageLoader.diskCache?.maxSize ?: 0)/(1024*1024)} MB")
+                                    println("Image Memory Cache ${(imageLoader.memoryCache?.size ?: 0)/(1024*1024)}/${(imageLoader.memoryCache?.maxSize ?: 0)/(1024*1024)} MB")
+
+                                    println("Notes: " + LocalCache.notes.filter { it.value.event != null }.size +"/"+ LocalCache.notes.size)
+                                    println("Users: " + LocalCache.users.filter { it.value.info?.latestMetadata != null }.size +"/"+ LocalCache.users.size)
                                 }
                             ) {
                                 Icon(
@@ -197,11 +196,11 @@ fun MainTopBar(scaffoldState: ScaffoldState, accountViewModel: AccountViewModel)
                     },
                     modifier = Modifier
                 ) {
-                    AsyncImage(
-                        model = accountUser.profilePicture(),
-                        placeholder = rememberAsyncImagePainter(RoboHashCache.get(ctx, accountUser.pubkeyHex)),
-                        fallback = rememberAsyncImagePainter(RoboHashCache.get(ctx, accountUser.pubkeyHex)),
-                        error = rememberAsyncImagePainter(RoboHashCache.get(ctx, accountUser.pubkeyHex)),
+                    AsyncImageProxy(
+                        model = ResizeImage(accountUser.profilePicture(), 34.dp),
+                        placeholder = BitmapPainter(RoboHashCache.get(ctx, accountUser.pubkeyHex)),
+                        fallback = BitmapPainter(RoboHashCache.get(ctx, accountUser.pubkeyHex)),
+                        error = BitmapPainter(RoboHashCache.get(ctx, accountUser.pubkeyHex)),
                         contentDescription = "Profile Image",
                         modifier = Modifier
                             .width(34.dp)

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

@@ -1,5 +1,6 @@
 package com.vitorpamplona.amethyst.ui.navigation
 
+import android.os.Build
 import androidx.compose.foundation.Canvas
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
@@ -71,8 +72,12 @@ import com.google.zxing.qrcode.encoder.ByteMatrix
 
 import androidx.compose.ui.graphics.Path
 import androidx.compose.ui.graphics.PathFillType
+import androidx.compose.ui.graphics.painter.BitmapPainter
 import androidx.compose.ui.platform.LocalContext
+import com.vitorpamplona.amethyst.BuildConfig
 import com.vitorpamplona.amethyst.RoboHashCache
+import com.vitorpamplona.amethyst.ui.components.AsyncImageProxy
+import com.vitorpamplona.amethyst.ui.components.ResizeImage
 
 @Composable
 fun DrawerContent(navController: NavHostController,
@@ -120,19 +125,19 @@ fun DrawerContent(navController: NavHostController,
 fun ProfileContent(baseAccountUser: User, modifier: Modifier = Modifier, scaffoldState: ScaffoldState, navController: NavController) {
     val coroutineScope = rememberCoroutineScope()
 
-    val accountUserState by baseAccountUser.liveMetadata.observeAsState()
+    val accountUserState by baseAccountUser.live().metadata.observeAsState()
     val accountUser = accountUserState?.user ?: return
 
-    val accountUserFollowsState by baseAccountUser.liveFollows.observeAsState()
+    val accountUserFollowsState by baseAccountUser.live().follows.observeAsState()
     val accountUserFollows = accountUserFollowsState?.user ?: return
 
     val ctx = LocalContext.current.applicationContext
 
     Box {
-        val banner = accountUser.info.banner
+        val banner = accountUser.info?.banner
         if (banner != null && banner.isNotBlank()) {
-            AsyncImage(
-                model = banner,
+            AsyncImageProxy(
+                model = ResizeImage(banner, 150.dp),
                 contentDescription = "Profile Image",
                 contentScale = ContentScale.FillWidth,
                 modifier = Modifier
@@ -151,12 +156,12 @@ fun ProfileContent(baseAccountUser: User, modifier: Modifier = Modifier, scaffol
         }
 
         Column(modifier = modifier) {
-            AsyncImage(
-                model = accountUser.profilePicture(),
+            AsyncImageProxy(
+                model = ResizeImage(accountUser.profilePicture(), 100.dp),
                 contentDescription = "Profile Image",
-                placeholder = rememberAsyncImagePainter(RoboHashCache.get(ctx, accountUser.pubkeyHex)),
-                fallback = rememberAsyncImagePainter(RoboHashCache.get(ctx, accountUser.pubkeyHex)),
-                error = rememberAsyncImagePainter(RoboHashCache.get(ctx, accountUser.pubkeyHex)),
+                placeholder = BitmapPainter(RoboHashCache.get(ctx, accountUser.pubkeyHex)),
+                fallback = BitmapPainter(RoboHashCache.get(ctx, accountUser.pubkeyHex)),
+                error = BitmapPainter(RoboHashCache.get(ctx, accountUser.pubkeyHex)),
                 modifier = Modifier
                     .width(100.dp)
                     .height(100.dp)
@@ -174,18 +179,40 @@ fun ProfileContent(baseAccountUser: User, modifier: Modifier = Modifier, scaffol
             )
             Text(
                 accountUser.bestDisplayName() ?: "",
-                modifier = Modifier.padding(top = 7.dp),
+                modifier = Modifier.padding(top = 7.dp).clickable(onClick = {
+                    accountUser.let {
+                        navController.navigate("User/${it.pubkeyHex}")
+                    }
+                    coroutineScope.launch {
+                        scaffoldState.drawerState.close()
+                    }
+                }),
                 fontWeight = FontWeight.Bold,
                 fontSize = 18.sp
             )
-            Text(" @${accountUser.bestUsername()}", color = Color.LightGray)
-            Row(modifier = Modifier.padding(top = 15.dp)) {
+            Text(" @${accountUser.bestUsername()}", color = Color.LightGray,
+                modifier = Modifier.padding(top = 15.dp).clickable(onClick = {
+                accountUser.let {
+                    navController.navigate("User/${it.pubkeyHex}")
+                }
+                coroutineScope.launch {
+                    scaffoldState.drawerState.close()
+                }
+            }))
+            Row(modifier = Modifier.padding(top = 15.dp).clickable(onClick = {
+                accountUser.let {
+                    navController.navigate("User/${it.pubkeyHex}")
+                }
+                coroutineScope.launch {
+                    scaffoldState.drawerState.close()
+                }
+            })) {
                 Row() {
-                    Text("${accountUserFollows.follows?.size ?: "--"}", fontWeight = FontWeight.Bold)
+                    Text("${accountUserFollows.follows.size}", fontWeight = FontWeight.Bold)
                     Text(" Following")
                 }
                 Row(modifier = Modifier.padding(start = 10.dp)) {
-                    Text("${accountUserFollows.followers?.size ?: "--"}", fontWeight = FontWeight.Bold)
+                    Text("${accountUserFollows.followers.size}", fontWeight = FontWeight.Bold)
                     Text(" Followers")
                 }
             }
@@ -298,7 +325,14 @@ fun BottomContent(user: User, scaffoldState: ScaffoldState, navController: NavCo
             modifier = Modifier
                 .fillMaxWidth()
                 .padding(horizontal = 15.dp),
+            verticalAlignment = Alignment.CenterVertically
         ) {
+            Text(
+                modifier = Modifier.padding(start = 16.dp),
+                text = "v"+BuildConfig.VERSION_NAME,
+                fontSize = 12.sp,
+                fontWeight = FontWeight.Bold,
+            )
             /*
             IconButton(
                 onClick = {

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

@@ -1,7 +1,9 @@
 package com.vitorpamplona.amethyst.ui.navigation
 
+import android.content.Context
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.livedata.observeAsState
 import androidx.compose.ui.platform.LocalContext
 import androidx.navigation.NamedNavArgument
 import androidx.navigation.NavBackStackEntry
@@ -12,21 +14,16 @@ 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.model.Account
+import com.vitorpamplona.amethyst.ui.dal.ChatroomListKnownFeedFilter
+import com.vitorpamplona.amethyst.ui.dal.HomeNewThreadFeedFilter
+import com.vitorpamplona.amethyst.ui.dal.NotificationFeedFilter
 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
@@ -37,24 +34,24 @@ 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 hasNewItems: (Account, NotificationCache, Context) -> Boolean = { _,_,_ -> false },
     val arguments: List<NamedNavArgument> = emptyList(),
     val buildScreen: (AccountViewModel, AccountStateViewModel, NavController) -> @Composable (NavBackStackEntry) -> Unit
 ) {
     object Home : Route("Home", R.drawable.ic_home,
-        hasNewItems = { _, cache -> homeHasNewItems(cache) },
+        hasNewItems = { acc, cache, ctx -> homeHasNewItems(acc, cache, ctx) },
         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) },
+        hasNewItems = { acc, cache, ctx -> notificationHasNewItems(acc, cache, ctx) },
         buildScreen = { acc, accSt, nav -> { _ -> NotificationScreen(acc, nav) }}
     )
 
     object Message : Route("Message", R.drawable.ic_dm,
-        hasNewItems = { _, cache -> messagesHasNewItems(cache) },
+        hasNewItems = { acc, cache, ctx -> messagesHasNewItems(acc, cache, ctx) },
         buildScreen = { acc, accSt, nav -> { _ -> ChatroomListScreen(acc, nav) }}
     )
 
@@ -107,45 +104,30 @@ public fun currentRoute(navController: NavHostController): String? {
     return navBackStackEntry?.destination?.route
 }
 
-@Composable
-private fun homeHasNewItems(cache: NotificationCache): Boolean {
-    val context = LocalContext.current.applicationContext
-    val lastTimeFollows = cache.load("HomeFollows", context)
+private fun homeHasNewItems(account: Account, cache: NotificationCache, context: Context): Boolean {
+    val lastTime = cache.load("HomeFollows", context)
 
-    val homeFeed = NostrHomeDataSource.feed().take(100)
+    HomeNewThreadFeedFilter.account = account
 
-    val hasNewInFollows = homeFeed.filter {
-        it.isNewThread()
-    }.filter {
-        (it.event?.createdAt ?: 0) > lastTimeFollows
-    }.isNotEmpty()
-
-    return hasNewInFollows
+    return (HomeNewThreadFeedFilter.feed().firstOrNull { it.event?.createdAt != null }?.event?.createdAt ?: 0) > lastTime
 }
 
-@Composable
-private fun notificationHasNewItems(cache: NotificationCache): Boolean {
-    val context = LocalContext.current.applicationContext
+private fun notificationHasNewItems(account: Account, cache: NotificationCache, context: Context): Boolean {
     val lastTime = cache.load("Notification", context)
-    return NostrNotificationDataSource.loadTop()
-        .filter { it.event != null && it.event!!.createdAt > lastTime }
-        .isNotEmpty()
+
+    NotificationFeedFilter.account = account
+
+    return (NotificationFeedFilter.feed().firstOrNull { it.event?.createdAt != null }?.event?.createdAt ?: 0) > lastTime
 }
 
-@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) && it.author != me
-    }.filter {
-        val lastTime = if (it.channel != null) {
-            cache.load("Channel/${it.channel!!.idHex}", context)
-        } else {
-            cache.load("Room/${it.author?.pubkeyHex}", context)
-        }
+private fun messagesHasNewItems(account: Account, cache: NotificationCache, context: Context): Boolean {
+    ChatroomListKnownFeedFilter.account = account
 
-        NostrChatroomListDataSource.account.isAcceptable(it) && it.event != null && it.event!!.createdAt > lastTime
-    }.isNotEmpty()
+    val note = ChatroomListKnownFeedFilter.feed().firstOrNull {
+        it.event?.createdAt != null && it.channel == null && it.author != account.userProfile()
+    } ?: return false
+
+    val lastTime = cache.load("Room/${note.author?.pubkeyHex}", context)
+
+    return (note.event?.createdAt ?: 0) > lastTime
 }

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

@@ -1,39 +1,42 @@
 package com.vitorpamplona.amethyst.ui.note
 
+import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.background
-import androidx.compose.foundation.clickable
+import androidx.compose.foundation.combinedClickable
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.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.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.livedata.observeAsState
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.compositeOver
 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.service.model.ChannelMessageEvent
 import com.vitorpamplona.amethyst.ui.screen.BoostSetCard
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 
+@OptIn(ExperimentalFoundationApi::class)
 @Composable
-fun BoostSetCompose(likeSetCard: BoostSetCard, isInnerNote: Boolean = false, routeForLastRead: String, accountViewModel: AccountViewModel, navController: NavController) {
-    val noteState by likeSetCard.note.live.observeAsState()
+fun BoostSetCompose(boostSetCard: BoostSetCard, isInnerNote: Boolean = false, routeForLastRead: String, accountViewModel: AccountViewModel, navController: NavController) {
+    val noteState by boostSetCard.note.live().metadata.observeAsState()
     val note = noteState?.note
 
     val accountState by accountViewModel.accountLiveData.observeAsState()
@@ -41,15 +44,42 @@ fun BoostSetCompose(likeSetCard: BoostSetCard, isInnerNote: Boolean = false, rou
 
     val context = LocalContext.current.applicationContext
 
+    val noteEvent = note?.event
+    var popupExpanded by remember { mutableStateOf(false) }
+
     if (note?.event == null) {
         BlankNote(Modifier, isInnerNote)
     } else {
-        val isNew = likeSetCard.createdAt > NotificationCache.load(routeForLastRead, context)
-        NotificationCache.markAsRead(routeForLastRead, likeSetCard.createdAt, context)
+        var isNew by remember { mutableStateOf<Boolean>(false) }
+
+        LaunchedEffect(key1 = boostSetCard) {
+            isNew = boostSetCard.createdAt > NotificationCache.load(routeForLastRead, context)
+
+            val createdAt = note.event?.createdAt
+            if (createdAt != null)
+                NotificationCache.markAsRead(routeForLastRead, boostSetCard.createdAt, context)
+        }
+
+        var backgroundColor = if (isNew) {
+            MaterialTheme.colors.primary.copy(0.12f).compositeOver(MaterialTheme.colors.background)
+        } else {
+            MaterialTheme.colors.background
+        }
 
         Column(
-            modifier = Modifier.background(
-                if (isNew) MaterialTheme.colors.primary.copy(0.12f) else MaterialTheme.colors.background
+            modifier = Modifier.background(backgroundColor).combinedClickable(
+                onClick = {
+                    if (noteEvent !is ChannelMessageEvent) {
+                        navController.navigate("Note/${note.idHex}"){
+                            launchSingleTop = true
+                        }
+                    } else {
+                        note.channel?.let {
+                            navController.navigate("Channel/${it.idHex}")
+                        }
+                    }
+                },
+                onLongClick = { popupExpanded = true }
             )
         ) {
             Row(modifier = Modifier
@@ -75,7 +105,7 @@ fun BoostSetCompose(likeSetCard: BoostSetCard, isInnerNote: Boolean = false, rou
 
                 Column(modifier = Modifier.padding(start = if (!isInnerNote) 10.dp else 0.dp)) {
                     FlowRow() {
-                        likeSetCard.boostEvents.forEach {
+                        boostSetCard.boostEvents.forEach {
                             NoteAuthorPicture(
                                 note = it,
                                 navController = navController,
@@ -85,7 +115,17 @@ fun BoostSetCompose(likeSetCard: BoostSetCard, isInnerNote: Boolean = false, rou
                         }
                     }
 
-                    NoteCompose(note, null, Modifier.padding(top = 5.dp), true, accountViewModel, navController)
+                    NoteCompose(
+                        baseNote = note,
+                        routeForLastRead = null,
+                        modifier = Modifier.padding(top = 5.dp),
+                        isBoostedNote = true,
+                        parentBackgroundColor = backgroundColor,
+                        accountViewModel = accountViewModel,
+                        navController = navController
+                    )
+
+                    NoteDropDownMenu(note, popupExpanded, { popupExpanded = false }, accountViewModel)
                 }
             }
         }

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

@@ -1,14 +1,11 @@
 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
@@ -20,15 +17,19 @@ import androidx.compose.material.LocalTextStyle
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.livedata.observeAsState
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.painter.BitmapPainter
 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
@@ -36,19 +37,18 @@ 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.RoboHashCache
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.service.model.ChannelCreateEvent
 import com.vitorpamplona.amethyst.service.model.ChannelMetadataEvent
+import com.vitorpamplona.amethyst.ui.components.AsyncImageProxy
+import com.vitorpamplona.amethyst.ui.components.ResizeImage
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 
 @Composable
 fun ChatroomCompose(baseNote: Note, accountViewModel: AccountViewModel, navController: NavController) {
-    val noteState by baseNote.live.observeAsState()
+    val noteState by baseNote.live().metadata.observeAsState()
     val note = noteState?.note
 
     val accountState by accountViewModel.accountLiveData.observeAsState()
@@ -62,7 +62,7 @@ fun ChatroomCompose(baseNote: Note, accountViewModel: AccountViewModel, navContr
     if (note?.event == null) {
         BlankNote(Modifier)
     } else if (note.channel != null) {
-        val authorState by note.author!!.liveMetadata.observeAsState()
+        val authorState by note.author!!.live().metadata.observeAsState()
         val author = authorState?.user
 
         val channelState by note.channel!!.live.observeAsState()
@@ -78,15 +78,17 @@ fun ChatroomCompose(baseNote: Note, accountViewModel: AccountViewModel, navContr
             noteEvent?.content
         }
         channel?.let { channel ->
-            val hasNewMessages =
-                if (noteEvent != null)
-                    noteEvent.createdAt > notificationCache.cache.load("Channel/${channel.idHex}", context)
-                else
-                    false
+            var hasNewMessages by remember { mutableStateOf<Boolean>(false) }
+
+            LaunchedEffect(key1 = notificationCache) {
+                noteEvent?.let {
+                    hasNewMessages = it.createdAt > notificationCache.cache.load("Channel/${channel.idHex}", context)
+                }
+            }
 
             ChannelName(
                 channelPicture = channel.profilePicture(),
-                channelPicturePlaceholder = rememberAsyncImagePainter(RoboHashCache.get(context, channel.idHex)),
+                channelPicturePlaceholder = BitmapPainter(RoboHashCache.get(context, channel.idHex)),
                 channelTitle = {
                     Text(
                         "${channel.info.name}",
@@ -119,11 +121,13 @@ 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
+            var hasNewMessages by remember { mutableStateOf<Boolean>(false) }
+
+            LaunchedEffect(key1 = notificationCache) {
+                noteEvent?.let {
+                    hasNewMessages = it.createdAt > notificationCache.cache.load("Room/${userToComposeOn.pubkeyHex}", context)
+                }
+            }
 
             ChannelName(
                 channelPicture = { UserPicture(userToComposeOn, account.userProfile(), size = 55.dp) },
@@ -149,8 +153,8 @@ fun ChannelName(
 ) {
     ChannelName(
         channelPicture = {
-            AsyncImage(
-                model = channelPicture,
+            AsyncImageProxy(
+                model = ResizeImage(channelPicture, 55.dp),
                 placeholder = channelPicturePlaceholder,
                 fallback = channelPicturePlaceholder,
                 error = channelPicturePlaceholder,

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

@@ -1,39 +1,48 @@
 package com.vitorpamplona.amethyst.ui.note
 
+import android.content.Context
+import android.widget.Toast
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.combinedClickable
+import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.IntrinsicSize
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.requiredWidth
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.layout.widthIn
 import androidx.compose.foundation.layout.wrapContentWidth
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.Divider
 import androidx.compose.material.Icon
 import androidx.compose.material.IconButton
-import androidx.compose.material.LocalTextStyle
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Surface
 import androidx.compose.material.Text
 import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Bolt
 import androidx.compose.material.icons.filled.ChevronRight
-import androidx.compose.material.icons.filled.ExpandMore
+import androidx.compose.material.icons.outlined.Bolt
+import androidx.compose.material.ripple.rememberRipple
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.livedata.observeAsState
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -42,41 +51,58 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.ColorFilter
 import androidx.compose.ui.graphics.ColorMatrix
 import androidx.compose.ui.graphics.Shape
+import androidx.compose.ui.graphics.compositeOver
+import androidx.compose.ui.graphics.painter.BitmapPainter
+import androidx.compose.ui.layout.onSizeChanged
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.platform.LocalUriHandler
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.semantics.Role
 import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.style.TextDirection
+import androidx.compose.ui.unit.IntSize
 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.google.accompanist.flowlayout.FlowRow
 import com.vitorpamplona.amethyst.NotificationCache
+import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.RoboHashCache
+import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.service.model.ChannelCreateEvent
 import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
 import com.vitorpamplona.amethyst.service.model.ChannelMetadataEvent
-import com.vitorpamplona.amethyst.service.model.ReactionEvent
-import com.vitorpamplona.amethyst.service.model.RepostEvent
-import com.vitorpamplona.amethyst.ui.components.RichTextViewer
+import com.vitorpamplona.amethyst.ui.components.AsyncImageProxy
+import com.vitorpamplona.amethyst.ui.components.ResizeImage
 import com.vitorpamplona.amethyst.ui.components.TranslateableRichTextViewer
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
+import com.vitorpamplona.amethyst.ui.theme.BitcoinOrange
+import kotlinx.coroutines.launch
 
 val ChatBubbleShapeMe = RoundedCornerShape(15.dp, 15.dp, 3.dp, 15.dp)
 val ChatBubbleShapeThem = RoundedCornerShape(3.dp, 15.dp, 15.dp, 15.dp)
 
 @OptIn(ExperimentalFoundationApi::class)
 @Composable
-fun ChatroomMessageCompose(baseNote: Note, routeForLastRead: String?, innerQuote: Boolean = false, accountViewModel: AccountViewModel, navController: NavController) {
-    val noteState by baseNote.live.observeAsState()
+fun ChatroomMessageCompose(
+    baseNote: Note,
+    routeForLastRead: String?,
+    innerQuote: Boolean = false,
+    parentBackgroundColor: Color? = null,
+    accountViewModel: AccountViewModel,
+    navController: NavController,
+    onWantsToReply: (Note) -> Unit
+) {
+
+    val noteState by baseNote.live().metadata.observeAsState()
     val note = noteState?.note
 
     val accountState by accountViewModel.accountLiveData.observeAsState()
     val account = accountState?.account ?: return
 
-    val noteReportsState by baseNote.liveReports.observeAsState()
+    val noteReportsState by baseNote.live().reports.observeAsState()
     val noteForReports = noteReportsState?.note ?: return
 
     val accountUser = account.userProfile()
@@ -112,30 +138,46 @@ fun ChatroomMessageCompose(baseNote: Note, routeForLastRead: String?, innerQuote
             shape = ChatBubbleShapeThem
         }
 
-        // Mark read
-        val isNew = routeForLastRead?.run {
-            val isNew = NotificationCache.load(this, context)
+        if (parentBackgroundColor != null) {
+            backgroundBubbleColor = backgroundBubbleColor.compositeOver(parentBackgroundColor)
+        } else {
+            backgroundBubbleColor = backgroundBubbleColor.compositeOver(MaterialTheme.colors.background)
+        }
 
-            val createdAt = note.event?.createdAt
-            if (createdAt != null)
-                NotificationCache.markAsRead(this, createdAt, context)
+        var isNew by remember { mutableStateOf<Boolean>(false) }
 
-            isNew
+        LaunchedEffect(key1 = routeForLastRead) {
+            routeForLastRead?.let {
+                val lastTime = NotificationCache.load(it, context)
+
+                val createdAt = note.event?.createdAt
+                if (createdAt != null) {
+                    NotificationCache.markAsRead(it, createdAt, context)
+                    isNew = createdAt > lastTime
+                }
+            }
         }
 
         Column() {
+            val modif = if (innerQuote) Modifier.padding(top = 10.dp, end = 5.dp) else Modifier.fillMaxWidth(1f).padding(
+                start = 12.dp,
+                end = 12.dp,
+                top = 5.dp,
+                bottom = 5.dp
+            )
+
             Row(
-                modifier = Modifier.fillMaxWidth(1f).padding(
-                    start = 12.dp,
-                    end = 12.dp,
-                    top = 5.dp,
-                    bottom = 5.dp
-                ),
+                modifier = modif,
                 horizontalArrangement = alignment
             ) {
+                var availableBubbleSize by remember { mutableStateOf(IntSize.Zero) }
+                val modif2 = if (innerQuote) Modifier else Modifier.fillMaxWidth(0.85f)
+
                 Row(
                     horizontalArrangement = alignment,
-                    modifier = Modifier.fillMaxWidth(if (innerQuote) 1f else 0.85f)
+                    modifier = modif2.onSizeChanged {
+                        availableBubbleSize = it
+                    },
                 ) {
 
                     Surface(
@@ -147,11 +189,15 @@ fun ChatroomMessageCompose(baseNote: Note, routeForLastRead: String?, innerQuote
                                 onLongClick = { popupExpanded = true }
                             )
                     ) {
+                        var bubbleSize by remember { mutableStateOf(IntSize.Zero) }
+
                         Column(
-                            modifier = Modifier.padding(start = 10.dp, end = 10.dp, bottom = 5.dp),
+                            modifier = Modifier.padding(start = 10.dp, end = 5.dp, bottom = 5.dp).onSizeChanged {
+                                bubbleSize = it
+                            },
                         ) {
 
-                            val authorState by note.author!!.liveMetadata.observeAsState()
+                            val authorState by note.author!!.live().metadata.observeAsState()
                             val author = authorState?.user!!
 
                             if (innerQuote || author != accountUser && note.event is ChannelMessageEvent) {
@@ -160,11 +206,11 @@ fun ChatroomMessageCompose(baseNote: Note, routeForLastRead: String?, innerQuote
                                     horizontalArrangement = alignment,
                                     modifier = Modifier.padding(top = 5.dp)
                                 ) {
-                                    AsyncImage(
-                                        model = author.profilePicture(),
-                                        placeholder = rememberAsyncImagePainter(RoboHashCache.get(context, author.pubkeyHex)),
-                                        fallback = rememberAsyncImagePainter(RoboHashCache.get(context, author.pubkeyHex)),
-                                        error = rememberAsyncImagePainter(RoboHashCache.get(context, author.pubkeyHex)),
+                                    AsyncImageProxy(
+                                        model = ResizeImage(author.profilePicture(), 25.dp),
+                                        placeholder = BitmapPainter(RoboHashCache.get(context, author.pubkeyHex)),
+                                        fallback = BitmapPainter(RoboHashCache.get(context, author.pubkeyHex)),
+                                        error = BitmapPainter(RoboHashCache.get(context, author.pubkeyHex)),
                                         contentDescription = "Profile Image",
                                         modifier = Modifier
                                             .width(25.dp)
@@ -198,8 +244,10 @@ fun ChatroomMessageCompose(baseNote: Note, routeForLastRead: String?, innerQuote
                                                 note,
                                                 null,
                                                 innerQuote = true,
+                                                parentBackgroundColor = backgroundBubbleColor,
                                                 accountViewModel = accountViewModel,
-                                                navController = navController
+                                                navController = navController,
+                                                onWantsToReply = onWantsToReply
                                             )
                                     }
                                 }
@@ -228,7 +276,9 @@ fun ChatroomMessageCompose(baseNote: Note, routeForLastRead: String?, innerQuote
                                         TranslateableRichTextViewer(
                                             eventContent,
                                             canPreview,
+                                            Modifier,
                                             note.event?.tags,
+                                            backgroundBubbleColor,
                                             accountViewModel,
                                             navController
                                         )
@@ -236,7 +286,9 @@ fun ChatroomMessageCompose(baseNote: Note, routeForLastRead: String?, innerQuote
                                         TranslateableRichTextViewer(
                                             "Could Not decrypt the message",
                                             true,
+                                            Modifier,
                                             note.event?.tags,
+                                            backgroundBubbleColor,
                                             accountViewModel,
                                             navController
                                         )
@@ -246,20 +298,37 @@ fun ChatroomMessageCompose(baseNote: Note, routeForLastRead: String?, innerQuote
 
                             Row(
                                 verticalAlignment = Alignment.CenterVertically,
-                                horizontalArrangement = Arrangement.End,
-                                modifier = Modifier.padding(top = 2.dp)
-                            ) {
-                                Text(
-                                    timeAgoLong(note.event?.createdAt),
-                                    color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f),
-                                    fontSize = 12.sp
+                                horizontalArrangement = Arrangement.SpaceBetween,
+                                modifier = Modifier.padding(top = 5.dp).then(
+                                    with(LocalDensity.current) {
+                                        Modifier.widthIn(bubbleSize.width.toDp(), availableBubbleSize.width.toDp())
+                                    }
                                 )
+                            ) {
+                                Row() {
+                                    Text(
+                                        timeAgoShort(note.event?.createdAt),
+                                        color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f),
+                                        fontSize = 12.sp
+                                    )
 
-                                RelayBadges(note)
+                                    RelayBadges(note)
+
+                                    Spacer(modifier = Modifier.width(10.dp))
+                                }
+
+                                Row() {
+                                    LikeReaction(baseNote, accountViewModel)
+                                    Spacer(modifier = Modifier.width(5.dp))
+                                    ZapReaction(baseNote, accountViewModel)
+                                    Spacer(modifier = Modifier.width(5.dp))
+                                    ReplyReaction(baseNote, accountViewModel, showCounter = false) {
+                                        onWantsToReply(baseNote)
+                                    }
+                                }
                             }
                         }
                     }
-
                 }
 
                 NoteDropDownMenu(note, popupExpanded, { popupExpanded = false }, accountViewModel)
@@ -268,11 +337,9 @@ fun ChatroomMessageCompose(baseNote: Note, routeForLastRead: String?, innerQuote
     }
 }
 
-
-
 @Composable
 private fun RelayBadges(baseNote: Note) {
-    val noteRelaysState by baseNote.liveRelays.observeAsState()
+    val noteRelaysState by baseNote.live().relays.observeAsState()
     val noteRelays = noteRelaysState?.note?.relays ?: emptySet()
 
     var expanded by remember { mutableStateOf(false) }
@@ -285,19 +352,22 @@ private fun RelayBadges(baseNote: Note) {
     FlowRow(Modifier.padding(start = 10.dp)) {
         relaysToDisplay.forEach {
             val url = it.removePrefix("wss://")
-            Box(Modifier.size(15.dp).padding(1.dp)) {
+            Box(
+                Modifier
+                    .size(15.dp)
+                    .padding(1.dp)) {
                 AsyncImage(
                     model = "https://${url}/favicon.ico",
-                    placeholder = rememberAsyncImagePainter(RoboHashCache.get(ctx, url)),
-                    fallback = rememberAsyncImagePainter(RoboHashCache.get(ctx, url)),
-                    error = rememberAsyncImagePainter(RoboHashCache.get(ctx, url)),
+                    placeholder = BitmapPainter(RoboHashCache.get(ctx, url)),
+                    fallback = BitmapPainter(RoboHashCache.get(ctx, url)),
+                    error = BitmapPainter(RoboHashCache.get(ctx, url)),
                     contentDescription = "Relay Icon",
                     colorFilter = ColorFilter.colorMatrix(ColorMatrix().apply { setToSaturation(0f) }),
                     modifier = Modifier
                         .fillMaxSize(1f)
                         .clip(shape = CircleShape)
                         .background(MaterialTheme.colors.background)
-                        .clickable(onClick = { uri.openUri("https://" + url) } )
+                        .clickable(onClick = { uri.openUri("https://" + url) })
                 )
             }
         }

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

@@ -1,39 +1,42 @@
 package com.vitorpamplona.amethyst.ui.note
 
+import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.background
-import androidx.compose.foundation.clickable
+import androidx.compose.foundation.combinedClickable
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.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.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.livedata.observeAsState
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.compositeOver
 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.service.model.ChannelMessageEvent
 import com.vitorpamplona.amethyst.ui.screen.LikeSetCard
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 
+@OptIn(ExperimentalFoundationApi::class)
 @Composable
 fun LikeSetCompose(likeSetCard: LikeSetCard, modifier: Modifier = Modifier, isInnerNote: Boolean = false, routeForLastRead: String, accountViewModel: AccountViewModel, navController: NavController) {
-    val noteState by likeSetCard.note.live.observeAsState()
+    val noteState by likeSetCard.note.live().metadata.observeAsState()
     val note = noteState?.note
 
     val accountState by accountViewModel.accountLiveData.observeAsState()
@@ -41,15 +44,42 @@ fun LikeSetCompose(likeSetCard: LikeSetCard, modifier: Modifier = Modifier, isIn
 
     val context = LocalContext.current.applicationContext
 
+    val noteEvent = note?.event
+    var popupExpanded by remember { mutableStateOf(false) }
+
     if (note == null) {
         BlankNote(Modifier, isInnerNote)
     } else {
-        val isNew = likeSetCard.createdAt > NotificationCache.load(routeForLastRead, context)
-        NotificationCache.markAsRead(routeForLastRead, likeSetCard.createdAt, context)
+        var isNew by remember { mutableStateOf<Boolean>(false) }
+
+        LaunchedEffect(key1 = likeSetCard) {
+            isNew = likeSetCard.createdAt > NotificationCache.load(routeForLastRead, context)
+
+            val createdAt = note.event?.createdAt
+            if (createdAt != null)
+                NotificationCache.markAsRead(routeForLastRead, likeSetCard.createdAt, context)
+        }
+
+        var backgroundColor = if (isNew) {
+            MaterialTheme.colors.primary.copy(0.12f).compositeOver(MaterialTheme.colors.background)
+        } else {
+            MaterialTheme.colors.background
+        }
 
         Column(
-            modifier = Modifier.background(
-                if (isNew) MaterialTheme.colors.primary.copy(0.12f) else MaterialTheme.colors.background
+            modifier = Modifier.background(backgroundColor).combinedClickable(
+                onClick = {
+                    if (noteEvent !is ChannelMessageEvent) {
+                        navController.navigate("Note/${note.idHex}"){
+                            launchSingleTop = true
+                        }
+                    } else {
+                        note.channel?.let {
+                            navController.navigate("Channel/${it.idHex}")
+                        }
+                    }
+                },
+                onLongClick = { popupExpanded = true }
             )
         ) {
             Row(modifier = Modifier
@@ -85,7 +115,17 @@ fun LikeSetCompose(likeSetCard: LikeSetCard, modifier: Modifier = Modifier, isIn
                         }
                     }
 
-                    NoteCompose(note, null, Modifier.padding(top = 5.dp), true, accountViewModel, navController)
+                    NoteCompose(
+                        baseNote = note,
+                        routeForLastRead = null,
+                        modifier = Modifier.padding(top = 5.dp),
+                        isBoostedNote = true,
+                        parentBackgroundColor = backgroundColor,
+                        accountViewModel = accountViewModel,
+                        navController = navController
+                    )
+
+                    NoteDropDownMenu(note, popupExpanded, { popupExpanded = false }, accountViewModel)
                 }
             }
         }

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

@@ -1,79 +1,50 @@
 package com.vitorpamplona.amethyst.ui.note
 
-import androidx.compose.foundation.ExperimentalFoundationApi
-import androidx.compose.foundation.Image
-import androidx.compose.foundation.background
-import androidx.compose.foundation.border
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.combinedClickable
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.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
-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.*
+import androidx.compose.foundation.layout.*
 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.IconButton
-import androidx.compose.material.LocalContentColor
-import androidx.compose.material.LocalTextStyle
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Text
+import androidx.compose.material.*
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.ExpandMore
 import androidx.compose.material.icons.filled.MoreVert
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
+import androidx.compose.runtime.*
 import androidx.compose.runtime.livedata.observeAsState
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.ColorFilter
 import androidx.compose.ui.graphics.ColorMatrix
-import androidx.compose.ui.graphics.Shape
+import androidx.compose.ui.graphics.compositeOver
+import androidx.compose.ui.graphics.painter.BitmapPainter
 import androidx.compose.ui.platform.LocalClipboardManager
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalUriHandler
 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.TextDirection
 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.google.accompanist.flowlayout.FlowRow
 import com.vitorpamplona.amethyst.NotificationCache
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.RoboHashCache
-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.LnZapEvent
 import com.vitorpamplona.amethyst.service.model.ReactionEvent
 import com.vitorpamplona.amethyst.service.model.ReportEvent
 import com.vitorpamplona.amethyst.service.model.RepostEvent
-import com.vitorpamplona.amethyst.ui.components.RichTextViewer
+import com.vitorpamplona.amethyst.ui.components.AsyncImageProxy
+import com.vitorpamplona.amethyst.ui.components.ResizeImage
 import com.vitorpamplona.amethyst.ui.components.TranslateableRichTextViewer
+import com.vitorpamplona.amethyst.ui.screen.DisplayNip05Status
+import com.vitorpamplona.amethyst.ui.screen.ObserveDisplayNip05Status
 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
@@ -81,17 +52,19 @@ fun NoteCompose(
     baseNote: Note,
     routeForLastRead: String? = null,
     modifier: Modifier = Modifier,
-    isInnerNote: Boolean = false,
+    isBoostedNote: Boolean = false,
+    isQuotedNote: Boolean = false,
+    parentBackgroundColor: Color? = null,
     accountViewModel: AccountViewModel,
     navController: NavController
 ) {
     val accountState by accountViewModel.accountLiveData.observeAsState()
     val account = accountState?.account ?: return
 
-    val noteState by baseNote.live.observeAsState()
+    val noteState by baseNote.live().metadata.observeAsState()
     val note = noteState?.note
 
-    val noteReportsState by baseNote.liveReports.observeAsState()
+    val noteReportsState by baseNote.live().reports.observeAsState()
     val noteForReports = noteReportsState?.note ?: return
 
     var popupExpanded by remember { mutableStateOf(false) }
@@ -101,39 +74,53 @@ fun NoteCompose(
 
     var moreActionsExpanded by remember { mutableStateOf(false) }
 
+    val noteEvent = note?.event
 
-    if (note?.event == null) {
+    if (noteEvent == null) {
         BlankNote(modifier.combinedClickable(
             onClick = {  },
             onLongClick = { popupExpanded = true },
-        ), isInnerNote)
+        ), isBoostedNote)
     } else if (!account.isAcceptable(noteForReports) && !showHiddenNote) {
         HiddenNote(
             account.getRelevantReports(noteForReports),
             account.userProfile(),
             modifier,
-            isInnerNote,
+            isBoostedNote,
             navController,
             onClick = { showHiddenNote = true }
         )
     } else {
-        val isNew = routeForLastRead?.run {
-            val lastTime = NotificationCache.load(this, context)
+        var isNew by remember { mutableStateOf<Boolean>(false) }
 
-            val createdAt = note.event?.createdAt
-            if (createdAt != null) {
-                NotificationCache.markAsRead(this, createdAt, context)
-                createdAt > lastTime
-            } else {
-                false
+        LaunchedEffect(key1 = routeForLastRead) {
+            routeForLastRead?.let {
+                val lastTime = NotificationCache.load(it, context)
+
+                val createdAt = noteEvent.createdAt
+                if (createdAt != null) {
+                    NotificationCache.markAsRead(it, createdAt, context)
+                    isNew = createdAt > lastTime
+                }
             }
-        } ?: false
+        }
 
-        Column(modifier =
-            modifier.combinedClickable(
+        var backgroundColor = if (isNew) {
+            val newColor = MaterialTheme.colors.primary.copy(0.12f)
+            if (parentBackgroundColor != null) {
+                newColor.compositeOver(parentBackgroundColor)
+            } else {
+                newColor.compositeOver(MaterialTheme.colors.background)
+            }
+          } else {
+            parentBackgroundColor ?: MaterialTheme.colors.background
+          }
+
+        Column(modifier = modifier
+            .combinedClickable(
                 onClick = {
-                    if (note.event !is ChannelMessageEvent) {
-                        navController.navigate("Note/${note.idHex}"){
+                    if (noteEvent !is ChannelMessageEvent) {
+                        navController.navigate("Note/${note.idHex}") {
                             launchSingleTop = true
                         }
                     } else {
@@ -143,23 +130,18 @@ fun NoteCompose(
                     }
                 },
                 onLongClick = { popupExpanded = true }
-            ).run {
-                if (isNew) {
-                    this.background(MaterialTheme.colors.primary.copy(0.12f))
-                } else {
-                    this
-                }
-            }
+            )
+            .background(backgroundColor)
         ) {
             Row(
                 modifier = Modifier
                     .padding(
-                        start = if (!isInnerNote) 12.dp else 0.dp,
-                        end = if (!isInnerNote) 12.dp else 0.dp,
+                        start = if (!isBoostedNote) 12.dp else 0.dp,
+                        end = if (!isBoostedNote) 12.dp else 0.dp,
                         top = 10.dp)
             ) {
 
-                if (!isInnerNote) {
+                if (!isBoostedNote && !isQuotedNote) {
                     Column(Modifier.width(55.dp)) {
                     // Draws the boosted picture outside the boosted card.
                         Box(modifier = Modifier
@@ -168,7 +150,7 @@ fun NoteCompose(
 
                             NoteAuthorPicture(note, navController, account.userProfile(), 55.dp)
 
-                            if (note.event is RepostEvent) {
+                            if (noteEvent is RepostEvent) {
                                 note.replyTo?.lastOrNull()?.let {
                                     Box(
                                         Modifier
@@ -184,7 +166,7 @@ fun NoteCompose(
 
                             // boosted picture
                             val baseChannel = note.channel
-                            if (note.event is ChannelMessageEvent && baseChannel != null) {
+                            if (noteEvent is ChannelMessageEvent && baseChannel != null) {
                                 val channelState by baseChannel.live.observeAsState()
                                 val channel = channelState?.channel
 
@@ -194,11 +176,11 @@ fun NoteCompose(
                                             .width(30.dp)
                                             .height(30.dp)
                                             .align(Alignment.BottomEnd)) {
-                                        AsyncImage(
-                                            model = channel.profilePicture(),
-                                            placeholder = rememberAsyncImagePainter(RoboHashCache.get(context, channel.idHex)),
-                                            fallback = rememberAsyncImagePainter(RoboHashCache.get(context, channel.idHex)),
-                                            error = rememberAsyncImagePainter(RoboHashCache.get(context, channel.idHex)),
+                                        AsyncImageProxy(
+                                            model = ResizeImage(channel.profilePicture(), 30.dp),
+                                            placeholder = BitmapPainter(RoboHashCache.get(context, channel.idHex)),
+                                            fallback = BitmapPainter(RoboHashCache.get(context, channel.idHex)),
+                                            error = BitmapPainter(RoboHashCache.get(context, channel.idHex)),
                                             contentDescription = "Group Picture",
                                             modifier = Modifier
                                                 .width(30.dp)
@@ -216,7 +198,7 @@ fun NoteCompose(
                             }
                         }
 
-                        if (note.event is RepostEvent) {
+                        if (noteEvent is RepostEvent) {
                             note.replyTo?.lastOrNull()?.let {
                                 RelayBadges(it)
                             }
@@ -226,13 +208,22 @@ fun NoteCompose(
                     }
                 }
 
-                Column(modifier = Modifier.padding(start = if (!isInnerNote) 10.dp else 0.dp)) {
+                Column(
+                    modifier = Modifier.padding(start = if (!isBoostedNote && !isQuotedNote) 10.dp else 0.dp)
+                ) {
                     Row(verticalAlignment = Alignment.CenterVertically) {
-                        NoteUsernameDisplay(note, Modifier.weight(1f))
+                        if (isQuotedNote) {
+                            NoteAuthorPicture(note, navController, account.userProfile(), 25.dp)
+                            Spacer(Modifier.padding(horizontal = 5.dp))
+                            NoteUsernameDisplay(note, Modifier.weight(1f))
+                        } else {
+                            NoteUsernameDisplay(note, Modifier.weight(1f))
+                        }
 
-                        if (note.event !is RepostEvent) {
+
+                        if (noteEvent !is RepostEvent) {
                             Text(
-                                timeAgo(note.event?.createdAt),
+                                timeAgo(noteEvent.createdAt),
                                 color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f),
                                 maxLines = 1
                             )
@@ -259,36 +250,61 @@ fun NoteCompose(
                         }
                     }
 
-                    if (note.event is TextNoteEvent && (note.replyTo != null || note.mentions != null)) {
-                        ReplyInformation(note.replyTo, note.mentions, navController)
-                    } else if (note.event is ChannelMessageEvent && (note.replyTo != null || note.mentions != null)) {
+                    if (note.author != null)
+                        ObserveDisplayNip05Status(note.author!!)
+
+                    if (noteEvent is TextNoteEvent && (note.replyTo != null || note.mentions != null)) {
+                        ReplyInformation(note.replyTo, note.mentions, account, navController)
+                    } else if (noteEvent is ChannelMessageEvent && (note.replyTo != null || note.mentions != null)) {
+                        val sortedMentions = note.mentions?.toSet()?.sortedBy { account.userProfile().isFollowing(it) }
+
                         note.channel?.let {
-                            ReplyInformationChannel(note.replyTo, note.mentions, it, navController)
+                            ReplyInformationChannel(note.replyTo, sortedMentions, it, navController)
                         }
                     }
 
-                    if (note.event is ReactionEvent || note.event is RepostEvent) {
+                    if (noteEvent is ReactionEvent || noteEvent is RepostEvent) {
                         note.replyTo?.lastOrNull()?.let {
                             NoteCompose(
                                 it,
                                 modifier = Modifier,
-                                isInnerNote = true,
+                                isBoostedNote = true,
+                                parentBackgroundColor = backgroundColor,
                                 accountViewModel = accountViewModel,
                                 navController = navController
                             )
                         }
 
                         // Reposts have trash in their contents.
-                        if (note.event is ReactionEvent) {
+                        if (noteEvent is ReactionEvent) {
                             val refactorReactionText =
-                                if (note.event?.content == "+") "❤" else note.event?.content ?: " "
+                                if (noteEvent.content == "+") "❤" else noteEvent.content ?: " "
 
                             Text(
                                 text = refactorReactionText
                             )
                         }
+                    } else if (noteEvent is ReportEvent) {
+                        val reportType = noteEvent.reportType.map {
+                            when (it) {
+                                ReportEvent.ReportType.EXPLICIT -> "Explicit Content"
+                                ReportEvent.ReportType.SPAM -> "Spam"
+                                ReportEvent.ReportType.IMPERSONATION -> "Impersonation"
+                                ReportEvent.ReportType.ILLEGAL -> "Illegal Behavior"
+                                else -> "Unknown"
+                            }
+                        }.joinToString(", ")
+
+                        Text(
+                            text = reportType
+                        )
+
+                        Divider(
+                            modifier = Modifier.padding(top = 10.dp),
+                            thickness = 0.25.dp
+                        )
                     } else {
-                        val eventContent = note.event?.content
+                        val eventContent = noteEvent.content
                         val canPreview = note.author == account.userProfile()
                           || (note.author?.let { account.userProfile().isFollowing(it) } ?: true )
                           || !noteForReports.hasAnyReports()
@@ -297,7 +313,9 @@ fun NoteCompose(
                             TranslateableRichTextViewer(
                                 eventContent,
                                 canPreview,
-                                note.event?.tags,
+                                Modifier.fillMaxWidth(),
+                                noteEvent.tags,
+                                backgroundColor,
                                 accountViewModel,
                                 navController
                             )
@@ -320,7 +338,7 @@ fun NoteCompose(
 
 @Composable
 private fun RelayBadges(baseNote: Note) {
-    val noteRelaysState by baseNote.liveRelays.observeAsState()
+    val noteRelaysState by baseNote.live().relays.observeAsState()
     val noteRelays = noteRelaysState?.note?.relays ?: emptySet()
 
     var expanded by remember { mutableStateOf(false) }
@@ -332,16 +350,16 @@ private fun RelayBadges(baseNote: Note) {
 
     FlowRow(Modifier.padding(top = 10.dp, start = 5.dp, end = 4.dp)) {
         relaysToDisplay.forEach {
-            val url = it.removePrefix("wss://")
+            val url = it.removePrefix("wss://").removePrefix("ws://")
             Box(
                 Modifier
                     .size(15.dp)
                     .padding(1.dp)) {
                 AsyncImage(
                     model = "https://${url}/favicon.ico",
-                    placeholder = rememberAsyncImagePainter(RoboHashCache.get(ctx, url)),
-                    fallback = rememberAsyncImagePainter(RoboHashCache.get(ctx, url)),
-                    error = rememberAsyncImagePainter(RoboHashCache.get(ctx, url)),
+                    placeholder = BitmapPainter(RoboHashCache.get(ctx, url)),
+                    fallback = BitmapPainter(RoboHashCache.get(ctx, url)),
+                    error = BitmapPainter(RoboHashCache.get(ctx, url)),
                     contentDescription = "Relay Icon",
                     colorFilter = ColorFilter.colorMatrix(ColorMatrix().apply { setToSaturation(0f) }),
                     modifier = Modifier
@@ -397,7 +415,7 @@ fun NoteAuthorPicture(
     pictureModifier: Modifier = Modifier,
     onClick: ((User) -> Unit)? = null
 ) {
-    val noteState by baseNote.live.observeAsState()
+    val noteState by baseNote.live().metadata.observeAsState()
     val note = noteState?.note ?: return
 
     val author = note.author
@@ -410,7 +428,7 @@ fun NoteAuthorPicture(
             .height(size)) {
         if (author == null) {
             Image(
-                painter = rememberAsyncImagePainter(RoboHashCache.get(ctx, "ohnothisauthorisnotfound")),
+                painter = BitmapPainter(RoboHashCache.get(ctx, "ohnothisauthorisnotfound")),
                 contentDescription = "Unknown Author",
                 modifier = pictureModifier
                     .fillMaxSize(1f)
@@ -444,7 +462,7 @@ fun UserPicture(
     pictureModifier: Modifier = Modifier,
     onClick: ((User) -> Unit)? = null
 ) {
-    val userState by baseUser.liveMetadata.observeAsState()
+    val userState by baseUser.live().metadata.observeAsState()
     val user = userState?.user ?: return
 
     val ctx = LocalContext.current.applicationContext
@@ -454,12 +472,12 @@ fun UserPicture(
             .width(size)
             .height(size)) {
 
-        AsyncImage(
-            model = user.profilePicture(),
+        AsyncImageProxy(
+            model = ResizeImage(user.profilePicture(), size),
             contentDescription = "Profile Image",
-            placeholder = rememberAsyncImagePainter(RoboHashCache.get(ctx, user.pubkeyHex)),
-            fallback = rememberAsyncImagePainter(RoboHashCache.get(ctx, user.pubkeyHex)),
-            error = rememberAsyncImagePainter(RoboHashCache.get(ctx, user.pubkeyHex)),
+            placeholder = BitmapPainter(RoboHashCache.get(ctx, user.pubkeyHex)),
+            fallback = BitmapPainter(RoboHashCache.get(ctx, user.pubkeyHex)),
+            error = BitmapPainter(RoboHashCache.get(ctx, user.pubkeyHex)),
             modifier = pictureModifier
                 .fillMaxSize(1f)
                 .clip(shape = CircleShape)
@@ -473,7 +491,7 @@ fun UserPicture(
 
         )
 
-        val accountState by baseUserAccount.liveFollows.observeAsState()
+        val accountState by baseUserAccount.live().follows.observeAsState()
         val accountUser = accountState?.user ?: return
 
         if (accountUser.isFollowing(user) || user == accountUser) {
@@ -485,14 +503,12 @@ fun UserPicture(
                 contentAlignment = Alignment.Center
             ) {
                 // Background for the transparent checkmark
-                Text(
-                    "x",
+                Box(
                     Modifier
-                        .padding(4.dp)
-                        .fillMaxSize()
+                        .clip(CircleShape)
+                        .fillMaxSize(0.6f)
                         .align(Alignment.Center)
                         .background(MaterialTheme.colors.background)
-                        .clip(shape = CircleShape)
                 )
 
                 Icon(
@@ -519,48 +535,63 @@ fun NoteDropDownMenu(note: Note, popupExpanded: Boolean, onDismiss: () -> Unit,
         DropdownMenuItem(onClick = { clipboardManager.setText(AnnotatedString(accountViewModel.decrypt(note) ?: "")); onDismiss() }) {
             Text("Copy Text")
         }
-        DropdownMenuItem(onClick = { clipboardManager.setText(AnnotatedString(note.author?.pubkey?.toNpub() ?: "")); onDismiss() }) {
+        DropdownMenuItem(onClick = { clipboardManager.setText(AnnotatedString(note.author?.pubkeyNpub() ?: "")); onDismiss() }) {
             Text("Copy User PubKey")
         }
-        DropdownMenuItem(onClick = { clipboardManager.setText(AnnotatedString(note.id.toNote())); onDismiss() }) {
+        DropdownMenuItem(onClick = { clipboardManager.setText(AnnotatedString(note.idNote())); onDismiss() }) {
             Text("Copy Note ID")
         }
         Divider()
         DropdownMenuItem(onClick = { accountViewModel.broadcast(note); onDismiss() }) {
             Text("Broadcast")
         }
-        Divider()
-        DropdownMenuItem(onClick = { note.author?.let { accountViewModel.hide(it, context) }; onDismiss() }) {
-            Text("Hide User")
+        if (note.author == accountViewModel.accountLiveData.value?.account?.userProfile()) {
+            Divider()
+            DropdownMenuItem(onClick = { accountViewModel.delete(note); onDismiss() }) {
+                Text("Request Deletion")
+            }
         }
-        Divider()
-        DropdownMenuItem(onClick = {
-            accountViewModel.report(note, ReportEvent.ReportType.SPAM);
-            note.author?.let { accountViewModel.hide(it, context) }
-            onDismiss()
-        }) {
-            Text("Report Spam / Scam")
-        }
-        DropdownMenuItem(onClick = {
-            accountViewModel.report(note, ReportEvent.ReportType.IMPERSONATION);
-            note.author?.let { accountViewModel.hide(it, context) }
-            onDismiss()
-        }) {
-            Text("Report Impersonation")
-        }
-        DropdownMenuItem(onClick = {
-            accountViewModel.report(note, ReportEvent.ReportType.EXPLICIT);
-            note.author?.let { accountViewModel.hide(it, context) }
-            onDismiss()
-        }) {
-            Text("Report Explicit Content")
-        }
-        DropdownMenuItem(onClick = {
-            accountViewModel.report(note, ReportEvent.ReportType.ILLEGAL);
-            note.author?.let { accountViewModel.hide(it, context) }
-            onDismiss()
-        }) {
-            Text("Report Illegal Behaviour")
+        if (note.author != accountViewModel.accountLiveData.value?.account?.userProfile()) {
+            Divider()
+            DropdownMenuItem(onClick = {
+                note.author?.let {
+                    accountViewModel.hide(
+                        it,
+                        context
+                    )
+                }; onDismiss()
+            }) {
+                Text("Block & Hide Author")
+            }
+            Divider()
+            DropdownMenuItem(onClick = {
+                accountViewModel.report(note, ReportEvent.ReportType.SPAM);
+                note.author?.let { accountViewModel.hide(it, context) }
+                onDismiss()
+            }) {
+                Text("Report Spam / Scam")
+            }
+            DropdownMenuItem(onClick = {
+                accountViewModel.report(note, ReportEvent.ReportType.IMPERSONATION);
+                note.author?.let { accountViewModel.hide(it, context) }
+                onDismiss()
+            }) {
+                Text("Report Impersonation")
+            }
+            DropdownMenuItem(onClick = {
+                accountViewModel.report(note, ReportEvent.ReportType.EXPLICIT);
+                note.author?.let { accountViewModel.hide(it, context) }
+                onDismiss()
+            }) {
+                Text("Report Explicit Content")
+            }
+            DropdownMenuItem(onClick = {
+                accountViewModel.report(note, ReportEvent.ReportType.ILLEGAL);
+                note.author?.let { accountViewModel.hide(it, context) }
+                onDismiss()
+            }) {
+                Text("Report Illegal Behaviour")
+            }
         }
     }
 }

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

@@ -1,24 +1,38 @@
 package com.vitorpamplona.amethyst.ui.note
 
-import android.content.Intent
-import android.net.Uri
+import android.content.Context
 import android.widget.Toast
+import androidx.compose.animation.animateContentSize
+import androidx.compose.foundation.ExperimentalFoundationApi
+import androidx.compose.foundation.combinedClickable
+import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.ExperimentalLayoutApi
+import androidx.compose.foundation.layout.FlowRow
 import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.material.Button
+import androidx.compose.material.ButtonDefaults
 import androidx.compose.material.Icon
 import androidx.compose.material.IconButton
 import androidx.compose.material.MaterialTheme
+import androidx.compose.material.OutlinedTextField
+import androidx.compose.material.Surface
 import androidx.compose.material.Text
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Bolt
-import androidx.compose.material.icons.filled.MoreVert
 import androidx.compose.material.icons.outlined.BarChart
 import androidx.compose.material.icons.outlined.Bolt
+import androidx.compose.material.ripple.rememberRipple
 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
@@ -26,248 +40,653 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
+import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.focus.focusRequester
+import androidx.compose.ui.focus.onFocusChanged
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.ColorFilter
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalSoftwareKeyboardController
 import androidx.compose.ui.platform.LocalUriHandler
+import androidx.compose.ui.platform.UriHandler
 import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.semantics.Role
+import androidx.compose.ui.text.input.KeyboardCapitalization
+import androidx.compose.ui.text.input.KeyboardType
+import androidx.compose.ui.text.input.TextFieldValue
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.unit.IntOffset
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import androidx.core.content.ContextCompat
+import androidx.compose.ui.window.Dialog
+import androidx.compose.ui.window.DialogProperties
+import androidx.compose.ui.window.Popup
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewmodel.compose.viewModel
 import coil.compose.AsyncImage
 import coil.request.CachePolicy
 import coil.request.ImageRequest
 import com.vitorpamplona.amethyst.R
-import com.vitorpamplona.amethyst.lnurl.LightningAddressResolver
+import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.model.RelaySetupInfo
+import com.vitorpamplona.amethyst.service.relays.FeedType
+import com.vitorpamplona.amethyst.ui.actions.CloseButton
 import com.vitorpamplona.amethyst.ui.actions.NewPostView
+import com.vitorpamplona.amethyst.ui.actions.SaveButton
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.theme.BitcoinOrange
 import java.math.BigDecimal
 import java.math.RoundingMode
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 
+@OptIn(ExperimentalFoundationApi::class)
 @Composable
 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 zapsState by baseNote.liveZaps.observeAsState()
-  val zappedNote = zapsState?.note
-
-  val repliesState by baseNote.liveReplies.observeAsState()
-  val replies = repliesState?.note?.replies ?: emptySet()
-
-  val grayTint = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
-  val uri = LocalUriHandler.current
-  val context = LocalContext.current
-  val scope = rememberCoroutineScope()
-
   var wantsToReplyTo by remember {
     mutableStateOf<Note?>(null)
   }
 
+  var wantsToQuote by remember {
+    mutableStateOf<Note?>(null)
+  }
+
   if (wantsToReplyTo != null)
-    NewPostView({ wantsToReplyTo = null }, wantsToReplyTo, account)
+    NewPostView({ wantsToReplyTo = null }, wantsToReplyTo, null, account)
+
+  if (wantsToQuote != null)
+    NewPostView({ wantsToQuote = null }, null, wantsToQuote, account)
 
   Row(
-    modifier = Modifier
-      .padding(top = 8.dp)
-      .fillMaxWidth(),
+    modifier = Modifier.padding(top = 8.dp).fillMaxWidth(),
     verticalAlignment = Alignment.CenterVertically,
     horizontalArrangement = Arrangement.SpaceBetween
   ) {
-    IconButton(
-      modifier = Modifier.then(Modifier.size(20.dp)),
-      onClick = {
-        if (account.isWriteable())
-          wantsToReplyTo = baseNote
-        else
-          scope.launch {
-            Toast.makeText(
-              context,
-              "Login with a Private key to be able to reply",
-              Toast.LENGTH_SHORT
-            ).show()
-          }
-      }
-    ) {
-      Icon(
-        painter = painterResource(R.drawable.ic_comment),
-        null,
-        modifier = Modifier.size(15.dp),
-        tint = grayTint,
+    ReplyReaction(baseNote, accountViewModel, Modifier.weight(1f)) {
+      wantsToReplyTo = baseNote
+    }
+
+    BoostReaction(baseNote, accountViewModel, Modifier.weight(1f)) {
+      wantsToQuote = baseNote
+    }
+
+    LikeReaction(baseNote, accountViewModel, Modifier.weight(1f))
+
+    ZapReaction(baseNote, accountViewModel, Modifier.weight(1f))
+
+    ViewCountReaction(baseNote, Modifier.weight(1f))
+  }
+}
+
+
+@Composable
+fun ReplyReaction(
+  baseNote: Note,
+  accountViewModel: AccountViewModel,
+  textModifier: Modifier = Modifier,
+  showCounter: Boolean = true,
+  onPress: () -> Unit,
+) {
+  val repliesState by baseNote.live().replies.observeAsState()
+  val replies = repliesState?.note?.replies ?: emptySet()
+
+  val grayTint = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+  val context = LocalContext.current
+  val scope = rememberCoroutineScope()
+
+  IconButton(
+    modifier = Modifier.then(Modifier.size(20.dp)),
+    onClick = {
+      if (accountViewModel.isWriteable())
+        onPress()
+      else
+        scope.launch {
+          Toast.makeText(
+            context,
+            "Login with a Private key to be able to reply",
+            Toast.LENGTH_SHORT
+          ).show()
+        }
+    }
+  ) {
+    Icon(
+      painter = painterResource(R.drawable.ic_comment),
+      null,
+      modifier = Modifier.size(15.dp),
+      tint = grayTint,
+    )
+  }
+
+  if (showCounter)
+    Text(
+      " ${showCount(replies.size)}",
+      fontSize = 14.sp,
+      color = grayTint,
+      modifier = textModifier
+    )
+}
+
+@Composable
+private fun BoostReaction(
+  baseNote: Note,
+  accountViewModel: AccountViewModel,
+  textModifier: Modifier = Modifier,
+  onQuotePress: () -> Unit,
+) {
+  val boostsState by baseNote.live().boosts.observeAsState()
+  val boostedNote = boostsState?.note
+
+  val grayTint = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+  val context = LocalContext.current
+  val scope = rememberCoroutineScope()
+
+  var wantsToBoost by remember { mutableStateOf(false) }
+
+  IconButton(
+    modifier = Modifier.then(Modifier.size(20.dp)),
+    onClick = {
+      if (accountViewModel.isWriteable()) {
+        if (accountViewModel.hasBoosted(baseNote)) {
+          accountViewModel.deleteBoostsTo(baseNote)
+        } else {
+          wantsToBoost = true
+        }
+      } else
+        scope.launch {
+          Toast.makeText(
+            context,
+            "Login with a Private key to be able to boost posts",
+            Toast.LENGTH_SHORT
+          ).show()
+        }
+    }
+  ) {
+    if (wantsToBoost) {
+      BoostTypeChoicePopup(
+        baseNote,
+        accountViewModel,
+        onDismiss = {
+          wantsToBoost = false
+        },
+        onQuote = {
+          wantsToBoost = false
+          onQuotePress()
+        }
       )
     }
 
-    Text(
-      "  ${showCount(replies.size)}",
-      fontSize = 14.sp,
-      color = grayTint,
-      modifier = Modifier.weight(1f)
-    )
-
-    IconButton(
-      modifier = Modifier.then(Modifier.size(20.dp)),
-      onClick = {
-        if (account.isWriteable())
-          accountViewModel.boost(baseNote)
-        else
-          scope.launch {
-            Toast.makeText(
-              context,
-              "Login with a Private key to be able to boost posts",
-              Toast.LENGTH_SHORT
-            ).show()
-          }
-      }
-    ) {
-      if (boostedNote?.isBoostedBy(account.userProfile()) == true) {
-        Icon(
-          painter = painterResource(R.drawable.ic_retweeted),
-          null,
-          modifier = Modifier.size(20.dp),
-          tint = Color.Unspecified
-        )
-      } else {
-        Icon(
-          painter = painterResource(R.drawable.ic_retweet),
-          null,
-          modifier = Modifier.size(20.dp),
-          tint = grayTint
-        )
-      }
-    }
-
-    Text(
-      "  ${showCount(boostedNote?.boosts?.size)}",
-      fontSize = 14.sp,
-      color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f),
-      modifier = Modifier.weight(1f)
-    )
-
-    IconButton(
-      modifier = Modifier.then(Modifier.size(20.dp)),
-      onClick = {
-        if (account.isWriteable())
-          accountViewModel.reactTo(baseNote)
-        else
-          scope.launch {
-            Toast.makeText(
-              context,
-              "Login with a Private key to like Posts",
-              Toast.LENGTH_SHORT
-            ).show()
-          }
-      }
-    ) {
-      if (reactedNote?.isReactedBy(account.userProfile()) == true) {
-        Icon(
-          painter = painterResource(R.drawable.ic_liked),
-          null,
-          modifier = Modifier.size(16.dp),
-          tint = Color.Unspecified
-        )
-      } else {
-        Icon(
-          painter = painterResource(R.drawable.ic_like),
-          null,
-          modifier = Modifier.size(16.dp),
-          tint = grayTint
-        )
-      }
-    }
-
-    Text(
-      "  ${showCount(reactedNote?.reactions?.size)}",
-      fontSize = 14.sp,
-      color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f),
-      modifier = Modifier.weight(1f)
-    )
-
-    IconButton(
-      modifier = Modifier.then(Modifier.size(20.dp)),
-      onClick = {
-        if (account.isWriteable()) {
-          accountViewModel.zap(baseNote, 1000 * 1000, "", context) {
-            scope.launch {
-              Toast.makeText(context, it, Toast.LENGTH_SHORT).show()
-            }
-          }
-        } else {
-          scope.launch {
-            Toast.makeText(
-              context,
-              "Login with a Private key to be able to send Zaps",
-              Toast.LENGTH_SHORT
-            ).show()
-          }
-        }
-      }
-    ) {
-      if (zappedNote?.isZappedBy(account.userProfile()) == true) {
-        Icon(
-          imageVector = Icons.Default.Bolt,
-          contentDescription = "Zaps",
-          modifier = Modifier.size(20.dp),
-          tint = BitcoinOrange
-        )
-      } else {
-        Icon(
-          imageVector = Icons.Outlined.Bolt,
-          contentDescription = "Zaps",
-          modifier = Modifier.size(20.dp),
-          tint = grayTint
-        )
-      }
-    }
-
-    Text(
-      showAmount(zappedNote?.zappedAmount()),
-      fontSize = 14.sp,
-      color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f),
-      modifier = Modifier.weight(1f)
-    )
-
-
-    IconButton(
-      modifier = Modifier.then(Modifier.size(20.dp)),
-      onClick = { uri.openUri("https://counter.amethyst.social/${baseNote.idHex}/") }
-    ) {
+    if (boostedNote?.isBoostedBy(accountViewModel.userProfile()) == true) {
       Icon(
-        imageVector = Icons.Outlined.BarChart,
+        painter = painterResource(R.drawable.ic_retweeted),
         null,
-        modifier = Modifier.size(19.dp),
+        modifier = Modifier.size(20.dp),
+        tint = Color.Unspecified
+      )
+    } else {
+      Icon(
+        painter = painterResource(R.drawable.ic_retweet),
+        null,
+        modifier = Modifier.size(20.dp),
         tint = grayTint
       )
     }
+  }
 
-    Row(modifier = Modifier.weight(1f)) {
-      AsyncImage(
-        model = ImageRequest.Builder(LocalContext.current)
-          .data("https://counter.amethyst.social/${baseNote.idHex}.svg?label=+&color=00000000")
-          .crossfade(true)
-          .diskCachePolicy(CachePolicy.DISABLED)
-          .memoryCachePolicy(CachePolicy.ENABLED)
-          .build(),
-        contentDescription = "View count",
-        modifier = Modifier.height(24.dp),
-        colorFilter = ColorFilter.tint(grayTint)
+  Text(
+    " ${showCount(boostedNote?.boosts?.size)}",
+    fontSize = 14.sp,
+    color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f),
+    modifier = textModifier
+  )
+}
+
+@Composable
+fun LikeReaction(
+  baseNote: Note,
+  accountViewModel: AccountViewModel,
+  textModifier: Modifier = Modifier
+) {
+  val reactionsState by baseNote.live().reactions.observeAsState()
+  val reactedNote = reactionsState?.note ?: return
+
+  val grayTint = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+  val context = LocalContext.current
+  val scope = rememberCoroutineScope()
+
+  IconButton(
+    modifier = Modifier.then(Modifier.size(20.dp)),
+    onClick = {
+      if (accountViewModel.isWriteable()) {
+        if (accountViewModel.hasReactedTo(baseNote)) {
+          accountViewModel.deleteReactionTo(baseNote)
+        } else {
+          accountViewModel.reactTo(baseNote)
+        }
+      } else
+        scope.launch {
+          Toast.makeText(
+            context,
+            "Login with a Private key to like Posts",
+            Toast.LENGTH_SHORT
+          ).show()
+        }
+    }
+  ) {
+    if (reactedNote?.isReactedBy(accountViewModel.userProfile()) == true) {
+      Icon(
+        painter = painterResource(R.drawable.ic_liked),
+        null,
+        modifier = Modifier.size(16.dp),
+        tint = Color.Unspecified
       )
+    } else {
+      Icon(
+        painter = painterResource(R.drawable.ic_like),
+        null,
+        modifier = Modifier.size(16.dp),
+        tint = grayTint
+      )
+    }
+  }
+
+  Text(
+    " ${showCount(reactedNote?.reactions?.size)}",
+    fontSize = 14.sp,
+    color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f),
+    modifier = textModifier
+  )
+}
+
+
+@Composable
+@OptIn(ExperimentalFoundationApi::class)
+fun ZapReaction(
+  baseNote: Note,
+  accountViewModel: AccountViewModel,
+  textModifier: Modifier = Modifier,
+) {
+  val accountState by accountViewModel.accountLiveData.observeAsState()
+  val account = accountState?.account ?: return
+
+  val zapsState by baseNote.live().zaps.observeAsState()
+  val zappedNote = zapsState?.note
+
+  var wantsToZap by remember { mutableStateOf(false) }
+  var wantsToChangeZapAmount by remember { mutableStateOf(false) }
+
+  val grayTint = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+  val context = LocalContext.current
+  val scope = rememberCoroutineScope()
+
+  Row(
+    modifier = Modifier
+      .then(Modifier.size(20.dp))
+      .combinedClickable(
+        role = Role.Button,
+        interactionSource = remember { MutableInteractionSource() },
+        indication = rememberRipple(bounded = false, radius = 24.dp),
+        onClick = {
+          if (account.zapAmountChoices.isEmpty()) {
+            scope.launch {
+              Toast
+                .makeText(
+                  context,
+                  "No Zap Amount Setup. Long Press to change",
+                  Toast.LENGTH_SHORT
+                )
+                .show()
+            }
+          } else if (!accountViewModel.isWriteable()) {
+            scope.launch {
+              Toast
+                .makeText(
+                  context,
+                  "Login with a Private key to be able to send Zaps",
+                  Toast.LENGTH_SHORT
+                )
+                .show()
+            }
+          } else if (account.zapAmountChoices.size == 1) {
+            accountViewModel.zap(baseNote, account.zapAmountChoices.first() * 1000, "", context) {
+              scope.launch {
+                Toast
+                  .makeText(context, it, Toast.LENGTH_SHORT)
+                  .show()
+              }
+            }
+          } else if (account.zapAmountChoices.size > 1) {
+            wantsToZap = true
+          }
+        },
+        onLongClick = {
+          wantsToChangeZapAmount = true
+        }
+      )
+  ) {
+    if (wantsToZap) {
+      ZapAmountChoicePopup(
+        baseNote,
+        accountViewModel,
+        onDismiss = {
+          wantsToZap = false
+        },
+        onChangeAmount = {
+          wantsToZap = false
+          wantsToChangeZapAmount = true
+        },
+        onError = {
+          scope.launch {
+            Toast.makeText(context, it, Toast.LENGTH_SHORT).show()
+          }
+        }
+      )
+    }
+    if (wantsToChangeZapAmount) {
+      UpdateZapAmountDialog({ wantsToChangeZapAmount = false }, account = account)
+    }
+
+    if (zappedNote?.isZappedBy(account.userProfile()) == true) {
+      Icon(
+        imageVector = Icons.Default.Bolt,
+        contentDescription = "Zaps",
+        modifier = Modifier.size(20.dp),
+        tint = BitcoinOrange
+      )
+    } else {
+      Icon(
+        imageVector = Icons.Outlined.Bolt,
+        contentDescription = "Zaps",
+        modifier = Modifier.size(20.dp),
+        tint = grayTint
+      )
+    }
+  }
+
+  Text(
+    showAmount(zappedNote?.zappedAmount()),
+    fontSize = 14.sp,
+    color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f),
+    modifier = textModifier
+  )
+}
+
+@Composable
+private fun ViewCountReaction(baseNote: Note, textModifier: Modifier = Modifier) {
+  val uri = LocalUriHandler.current
+  val grayTint = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+
+  IconButton(
+    modifier = Modifier.then(Modifier.size(20.dp)),
+    onClick = { uri.openUri("https://counter.amethyst.social/${baseNote.idHex}/") }
+  ) {
+    Icon(
+      imageVector = Icons.Outlined.BarChart,
+      null,
+      modifier = Modifier.size(19.dp),
+      tint = grayTint
+    )
+  }
+
+  Row(modifier = textModifier) {
+    AsyncImage(
+      model = ImageRequest.Builder(LocalContext.current)
+        .data("https://counter.amethyst.social/${baseNote.idHex}.svg?label=+&color=00000000")
+        .crossfade(true)
+        .diskCachePolicy(CachePolicy.DISABLED)
+        .memoryCachePolicy(CachePolicy.ENABLED)
+        .build(),
+      contentDescription = "View count",
+      modifier = Modifier.height(24.dp),
+      colorFilter = ColorFilter.tint(grayTint)
+    )
+  }
+}
+
+@OptIn(ExperimentalLayoutApi::class)
+@Composable
+private fun BoostTypeChoicePopup(baseNote: Note, accountViewModel: AccountViewModel, onDismiss: () -> Unit, onQuote: () -> Unit) {
+  Popup(
+    alignment = Alignment.BottomCenter,
+    offset = IntOffset(0, -50),
+    onDismissRequest = { onDismiss() }
+  ) {
+    FlowRow() {
+      Button(
+        modifier = Modifier.padding(horizontal = 3.dp),
+        onClick = {
+          accountViewModel.boost(baseNote)
+          onDismiss()
+        },
+        shape = RoundedCornerShape(20.dp),
+        colors = ButtonDefaults
+          .buttonColors(
+            backgroundColor = MaterialTheme.colors.primary
+          )
+      ) {
+        Text("Boost", color = Color.White, textAlign = TextAlign.Center)
+      }
+
+      Button(
+        modifier = Modifier.padding(horizontal = 3.dp),
+        onClick = onQuote,
+        shape = RoundedCornerShape(20.dp),
+        colors = ButtonDefaults
+          .buttonColors(
+            backgroundColor = MaterialTheme.colors.primary
+          )
+      ) {
+        Text("Quote", color = Color.White, textAlign = TextAlign.Center)
+      }
+    }
+  }
+}
+
+@OptIn(ExperimentalFoundationApi::class, ExperimentalLayoutApi::class)
+@Composable
+fun ZapAmountChoicePopup(baseNote: Note, accountViewModel: AccountViewModel, onDismiss: () -> Unit, onChangeAmount: () -> Unit, onError: (text: String) -> Unit) {
+  val context = LocalContext.current
+
+  val accountState by accountViewModel.accountLiveData.observeAsState()
+  val account = accountState?.account ?: return
+
+  Popup(
+    alignment = Alignment.BottomCenter,
+    offset = IntOffset(0, -50),
+    onDismissRequest = { onDismiss() }
+  ) {
+
+    FlowRow(horizontalArrangement = Arrangement.Center) {
+
+      account.zapAmountChoices.forEach { amountInSats ->
+        Button(
+          modifier = Modifier.padding(horizontal = 3.dp),
+          onClick = {
+            accountViewModel.zap(baseNote, amountInSats * 1000, "", context, onError)
+            onDismiss()
+          },
+          shape = RoundedCornerShape(20.dp),
+          colors = ButtonDefaults
+            .buttonColors(
+              backgroundColor = MaterialTheme.colors.primary
+            )
+        ) {
+          Text("⚡ ${showAmount(amountInSats.toBigDecimal().setScale(1))}",
+            color = Color.White,
+            textAlign = TextAlign.Center,
+            modifier = Modifier.combinedClickable(
+              onClick = {
+                accountViewModel.zap(baseNote, amountInSats * 1000, "", context, onError)
+                onDismiss()
+              },
+              onLongClick = {
+                onChangeAmount()
+              },
+            )
+          )
+        }
+      }
+
+    }
+  }
+}
+
+class UpdateZapAmountViewModel: ViewModel() {
+  private var account: Account? = null
+
+  var nextAmount by mutableStateOf(TextFieldValue(""))
+  var amountSet by mutableStateOf(listOf<Long>())
+
+  fun load(account: Account) {
+    this.account = account
+    this.amountSet = account.zapAmountChoices
+  }
+
+  fun toListOfAmounts(commaSeparatedAmounts: String): List<Long> {
+    return commaSeparatedAmounts.split(",").map { it.trim().toLongOrNull() ?: 0 }
+  }
+
+  fun addAmount() {
+    val newValue = nextAmount.text.trim().toLongOrNull()
+    if (newValue != null)
+      amountSet = amountSet + newValue
+
+    nextAmount = TextFieldValue("")
+  }
+
+  fun removeAmount(amount: Long) {
+    amountSet = amountSet - amount
+  }
+
+  fun sendPost() {
+    account?.changeZapAmounts(amountSet)
+    nextAmount = TextFieldValue("")
+  }
+
+  fun cancel() {
+    nextAmount = TextFieldValue("")
+  }
+
+  fun hasChanged(): Boolean {
+    return amountSet != account?.zapAmountChoices
+  }
+}
+
+
+@OptIn(ExperimentalComposeUiApi::class, ExperimentalLayoutApi::class)
+@Composable
+fun UpdateZapAmountDialog(onClose: () -> Unit, account: Account) {
+  val postViewModel: UpdateZapAmountViewModel = viewModel()
+
+  val ctx = LocalContext.current.applicationContext
+
+  // initialize focus reference to be able to request focus programmatically
+  val keyboardController = LocalSoftwareKeyboardController.current
+
+  LaunchedEffect(account) {
+    postViewModel.load(account)
+  }
+
+  Dialog(
+    onDismissRequest = { onClose() },
+    properties = DialogProperties(
+      dismissOnClickOutside = false,
+      usePlatformDefaultWidth = false,
+    )
+  ) {
+    Surface() {
+      Column(modifier = Modifier.padding(10.dp)) {
+        Row(
+          modifier = Modifier.fillMaxWidth(),
+          horizontalArrangement = Arrangement.SpaceBetween,
+          verticalAlignment = Alignment.CenterVertically
+        ) {
+          CloseButton(onCancel = {
+            postViewModel.cancel()
+            onClose()
+          })
+
+          SaveButton(
+            onPost = {
+              postViewModel.sendPost()
+              onClose()
+            },
+            isActive = postViewModel.hasChanged()
+          )
+        }
+
+        Spacer(modifier = Modifier.height(10.dp))
+
+        Row(modifier = Modifier.fillMaxWidth()) {
+          Column(modifier = Modifier.animateContentSize()) {
+            FlowRow(modifier = Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.Center) {
+              postViewModel.amountSet.forEach { amountInSats ->
+                Button(
+                  modifier = Modifier.padding(horizontal = 3.dp),
+                  shape = RoundedCornerShape(20.dp),
+                  colors = ButtonDefaults
+                    .buttonColors(
+                      backgroundColor = MaterialTheme.colors.primary
+                    ),
+                  onClick = {
+                    postViewModel.removeAmount(amountInSats)
+                  }
+                ) {
+                  Text("⚡ ${showAmount(amountInSats.toBigDecimal().setScale(1))} ✖", color = Color.White, textAlign = TextAlign.Center)
+                }
+              }
+            }
+          }
+        }
+
+        Spacer(modifier = Modifier.height(10.dp))
+
+        Row(modifier = Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically) {
+          OutlinedTextField(
+            label = { Text(text = "New Amount in Sats") },
+            value = postViewModel.nextAmount,
+            onValueChange = {
+              postViewModel.nextAmount = it
+            },
+            keyboardOptions = KeyboardOptions.Default.copy(
+              capitalization = KeyboardCapitalization.None,
+              keyboardType = KeyboardType.Number
+            ),
+            placeholder = {
+              Text(
+                text = "100, 1000, 5000",
+                color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+              )
+            },
+            singleLine = true,
+            modifier = Modifier.padding(end = 10.dp).weight(1f)
+          )
+
+          Button(
+            onClick = { postViewModel.addAmount() },
+            shape = RoundedCornerShape(20.dp),
+            colors = ButtonDefaults
+              .buttonColors(
+                backgroundColor = MaterialTheme.colors.primary
+              )
+          ) {
+            Text(text = "Add", color = Color.White)
+          }
+        }
+      }
     }
   }
 }
 
 fun showCount(count: Int?): String {
-  if (count == null) return " "
-  if (count == 0) return " "
+  if (count == null) return ""
+  if (count == 0) return ""
 
   return when {
     count >= 1000000000 -> "${Math.round(count / 1000000000f)}G"
@@ -282,8 +701,8 @@ val OneMega = BigDecimal(1000000)
 val OneKilo = BigDecimal(1000)
 
 fun showAmount(amount: BigDecimal?): String {
-  if (amount == null) return " "
-  if (amount.abs() < BigDecimal(0.01)) return " "
+  if (amount == null) return ""
+  if (amount.abs() < BigDecimal(0.01)) return ""
 
   return when {
     amount >= OneGiga -> "%.1fG".format(amount.div(OneGiga).setScale(1, RoundingMode.HALF_UP))

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

@@ -22,6 +22,7 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import androidx.navigation.NavController
+import com.vitorpamplona.amethyst.model.RelayInfo
 import com.vitorpamplona.amethyst.model.User
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import java.time.Instant
@@ -30,7 +31,7 @@ import java.time.format.DateTimeFormatter
 
 @Composable
 fun RelayCompose(
-    relay: User.RelayInfo,
+    relay: RelayInfo,
     accountViewModel: AccountViewModel,
     navController: NavController,
     onAddRelay: () -> Unit,

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

@@ -1,16 +1,28 @@
 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
 import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.text.ClickableText
+import androidx.compose.material.Icon
+import androidx.compose.material.IconButton
 import androidx.compose.material.LocalTextStyle
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Text
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.ExpandMore
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.livedata.observeAsState
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.text.AnnotatedString
@@ -19,32 +31,36 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.navigation.NavController
 import com.google.accompanist.flowlayout.FlowRow
+import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.Channel
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.model.User
 
 @Composable
-fun ReplyInformation(replyTo: List<Note>?, mentions: List<User>?, navController: NavController) {
-  ReplyInformation(replyTo, mentions) {
+fun ReplyInformation(replyTo: List<Note>?, mentions: List<User>?, account: Account, navController: NavController) {
+  ReplyInformation(replyTo, mentions, account) {
     navController.navigate("User/${it.pubkeyHex}")
   }
 }
 
 @Composable
-fun ReplyInformation(replyTo: List<Note>?, mentions: List<User>?, prefix: String = "", onUserTagClick: (User) -> Unit) {
+fun ReplyInformation(replyTo: List<Note>?, dupMentions: List<User>?, account: Account, prefix: String = "", onUserTagClick: (User) -> Unit) {
+  val mentions = dupMentions?.toSet()?.sortedBy { !account.userProfile().isFollowing(it) }
+  var expanded by remember { mutableStateOf((mentions?.size ?: 0) <= 2) }
+
   FlowRow() {
     if (mentions != null && mentions.isNotEmpty()) {
       if (replyTo != null && replyTo.isNotEmpty()) {
+        val repliesToDisplay = if (expanded) mentions else mentions.take(2)
+
         Text(
           "replying to ",
           fontSize = 13.sp,
           color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
         )
 
-        val mentionSet = mentions.toSet()
-
-        mentionSet.toSet().forEachIndexed { idx, user ->
-          val innerUserState by user.liveMetadata.observeAsState()
+        repliesToDisplay.forEachIndexed { idx, user ->
+          val innerUserState by user.live().metadata.observeAsState()
           val innerUser = innerUserState?.user
 
           innerUser?.let { myUser ->
@@ -54,18 +70,46 @@ fun ReplyInformation(replyTo: List<Note>?, mentions: List<User>?, prefix: String
               onClick = { onUserTagClick(myUser) }
             )
 
-            if (idx < mentionSet.size - 2) {
-              Text(
-                ", ",
-                fontSize = 13.sp,
-                color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
-              )
-            } else if (idx < mentionSet.size - 1) {
-              Text(
-                " and ",
-                fontSize = 13.sp,
-                color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
-              )
+            if (expanded) {
+              if (idx < repliesToDisplay.size - 2) {
+                Text(
+                  ", ",
+                  fontSize = 13.sp,
+                  color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                )
+              } else if (idx < repliesToDisplay.size - 1) {
+                Text(
+                  " and ",
+                  fontSize = 13.sp,
+                  color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                )
+              }
+            } else {
+              if (idx < repliesToDisplay.size - 1) {
+                Text(
+                  ", ",
+                  fontSize = 13.sp,
+                  color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                )
+              } else if (idx < repliesToDisplay.size) {
+                Text(
+                  " and ",
+                  fontSize = 13.sp,
+                  color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                )
+
+                ClickableText(
+                  AnnotatedString("${mentions.size-2}"),
+                  style = LocalTextStyle.current.copy(color = MaterialTheme.colors.primary.copy(alpha = 0.52f), fontSize = 13.sp),
+                  onClick = { expanded = true }
+                )
+
+                Text(
+                  " others",
+                  fontSize = 13.sp,
+                  color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                )
+              }
             }
           }
         }
@@ -123,7 +167,7 @@ fun ReplyInformationChannel(replyTo: List<Note>?,
         val mentionSet = mentions.toSet()
 
         mentionSet.forEachIndexed { idx, user ->
-          val innerUserState by user.liveMetadata.observeAsState()
+          val innerUserState by user.live().metadata.observeAsState()
           val innerUser = innerUserState?.user
 
           innerUser?.let { myUser ->

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

@@ -22,6 +22,22 @@ fun timeAgo(mills: Long?): String {
     .replace(" days ago", "d")
 }
 
+fun timeAgoShort(mills: Long?): String {
+  if (mills == null) return " "
+
+  var humanReadable = DateUtils.getRelativeTimeSpanString(
+    mills * 1000,
+    System.currentTimeMillis(),
+    DateUtils.MINUTE_IN_MILLIS,
+    DateUtils.FORMAT_ABBREV_ALL
+  ).toString()
+  if (humanReadable.startsWith("In") || humanReadable.startsWith("0")) {
+    humanReadable = "now";
+  }
+
+  return humanReadable
+}
+
 fun timeAgoLong(mills: Long?): String {
   if (mills == null) return " "
 

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

@@ -13,6 +13,7 @@ import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.livedata.observeAsState
+import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
@@ -28,16 +29,19 @@ 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
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
 
 @Composable
 fun UserCompose(baseUser: User, accountViewModel: AccountViewModel, navController: NavController) {
     val accountState by accountViewModel.accountLiveData.observeAsState()
     val account = accountState?.account ?: return
 
-    val userState by account.userProfile().liveFollows.observeAsState()
+    val userState by account.userProfile().live().follows.observeAsState()
     val userFollows = userState?.user ?: return
 
     val ctx = LocalContext.current.applicationContext
+    val coroutineScope = rememberCoroutineScope()
 
     Column(modifier =
         Modifier.clickable(
@@ -60,11 +64,11 @@ fun UserCompose(baseUser: User, accountViewModel: AccountViewModel, navControlle
                     UsernameDisplay(baseUser)
                 }
 
-                val userState by baseUser.liveMetadata.observeAsState()
+                val userState by baseUser.live().metadata.observeAsState()
                 val user = userState?.user ?: return
 
                 Text(
-                    user.info.about ?: "",
+                    user.info?.about ?: "",
                     color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f),
                     maxLines = 1,
                     overflow = TextOverflow.Ellipsis
@@ -75,12 +79,11 @@ fun UserCompose(baseUser: User, accountViewModel: AccountViewModel, navControlle
                 if (account.isHidden(baseUser)) {
                     ShowUserButton {
                         account.showUser(baseUser.pubkeyHex)
-                        LocalPreferences(ctx).saveToEncryptedStorage(account)
                     }
                 } else if (userFollows.isFollowing(baseUser)) {
-                    UnfollowButton { account.unfollow(baseUser) }
+                    UnfollowButton { coroutineScope.launch(Dispatchers.IO) { account.unfollow(baseUser) } }
                 } else {
-                    FollowButton { account.follow(baseUser) }
+                    FollowButton { coroutineScope.launch(Dispatchers.IO) { account.follow(baseUser) } }
                 }
             }
         }

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

@@ -14,7 +14,7 @@ import com.vitorpamplona.amethyst.model.User
 
 @Composable
 fun NoteUsernameDisplay(baseNote: Note, weight: Modifier = Modifier) {
-  val noteState by baseNote.live.observeAsState()
+  val noteState by baseNote.live().metadata.observeAsState()
   val note = noteState?.note ?: return
 
   val author = note.author
@@ -26,7 +26,7 @@ fun NoteUsernameDisplay(baseNote: Note, weight: Modifier = Modifier) {
 
 @Composable
 fun UsernameDisplay(baseUser: User, weight: Modifier = Modifier) {
-  val userState by baseUser.liveMetadata.observeAsState()
+  val userState by baseUser.live().metadata.observeAsState()
   val user = userState?.user ?: return
 
   if (user.bestUsername() != null || user.bestDisplayName() != null) {
@@ -53,7 +53,7 @@ fun UsernameDisplay(baseUser: User, weight: Modifier = Modifier) {
     }
   } else {
     Text(
-      user.pubkeyDisplayHex,
+      user.pubkeyDisplayHex(),
       fontWeight = FontWeight.Bold,
       maxLines = 1,
       overflow = TextOverflow.Ellipsis,

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

@@ -4,7 +4,6 @@ import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material.Divider
 import androidx.compose.material.MaterialTheme
@@ -12,6 +11,7 @@ import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.livedata.observeAsState
+import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
@@ -21,7 +21,6 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.navigation.NavController
 import com.vitorpamplona.amethyst.LocalPreferences
-import com.vitorpamplona.amethyst.lnurl.LnInvoiceUtil
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.service.model.LnZapEvent
 import com.vitorpamplona.amethyst.ui.screen.FollowButton
@@ -29,24 +28,27 @@ import com.vitorpamplona.amethyst.ui.screen.ShowUserButton
 import com.vitorpamplona.amethyst.ui.screen.UnfollowButton
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.theme.BitcoinOrange
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
 
 @Composable
 fun ZapNoteCompose(baseNote: Pair<Note, Note>, accountViewModel: AccountViewModel, navController: NavController) {
     val accountState by accountViewModel.accountLiveData.observeAsState()
     val account = accountState?.account ?: return
 
-    val userState by account.userProfile().liveFollows.observeAsState()
+    val userState by account.userProfile().live().follows.observeAsState()
     val userFollows = userState?.user ?: return
 
-    val noteState by baseNote.second.live.observeAsState()
+    val noteState by baseNote.second.live().metadata.observeAsState()
     val noteZap = noteState?.note ?: return
 
-    val baseNoteRequest by baseNote.first.live.observeAsState()
+    val baseNoteRequest by baseNote.first.live().metadata.observeAsState()
     val noteZapRequest = baseNoteRequest?.note ?: return
 
     val baseAuthor = noteZapRequest.author
 
     val ctx = LocalContext.current.applicationContext
+    val coroutineScope = rememberCoroutineScope()
 
     if (baseAuthor == null) {
         BlankNote()
@@ -74,11 +76,11 @@ fun ZapNoteCompose(baseNote: Pair<Note, Note>, accountViewModel: AccountViewMode
                         UsernameDisplay(baseAuthor)
                     }
 
-                    val userState by baseAuthor.liveMetadata.observeAsState()
+                    val userState by baseAuthor.live().metadata.observeAsState()
                     val user = userState?.user ?: return
 
                     Text(
-                        user.info.about ?: "",
+                        user.info?.about ?: "",
                         color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f),
                         maxLines = 1,
                         overflow = TextOverflow.Ellipsis
@@ -104,12 +106,11 @@ fun ZapNoteCompose(baseNote: Pair<Note, Note>, accountViewModel: AccountViewMode
                     if (account.isHidden(baseAuthor)) {
                         ShowUserButton {
                             account.showUser(baseAuthor.pubkeyHex)
-                            LocalPreferences(ctx).saveToEncryptedStorage(account)
                         }
                     } else if (userFollows.isFollowing(baseAuthor)) {
-                        UnfollowButton { account.unfollow(baseAuthor) }
+                        UnfollowButton { coroutineScope.launch(Dispatchers.IO) { account.unfollow(baseAuthor) } }
                     } else {
-                        FollowButton { account.follow(baseAuthor) }
+                        FollowButton { coroutineScope.launch(Dispatchers.IO) { account.follow(baseAuthor) } }
                     }
                 }
             }

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

@@ -1,6 +1,8 @@
 package com.vitorpamplona.amethyst.ui.note
 
+import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.background
+import androidx.compose.foundation.combinedClickable
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
@@ -12,26 +14,29 @@ import androidx.compose.material.MaterialTheme
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Bolt
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.livedata.observeAsState
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.compositeOver
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.unit.dp
 import androidx.navigation.NavController
 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.service.model.ChannelMessageEvent
 import com.vitorpamplona.amethyst.ui.screen.ZapSetCard
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.theme.BitcoinOrange
 
+@OptIn(ExperimentalFoundationApi::class)
 @Composable
 fun ZapSetCompose(zapSetCard: ZapSetCard, modifier: Modifier = Modifier, isInnerNote: Boolean = false, routeForLastRead: String, accountViewModel: AccountViewModel, navController: NavController) {
-    val noteState by zapSetCard.note.live.observeAsState()
+    val noteState by zapSetCard.note.live().metadata.observeAsState()
     val note = noteState?.note
 
     val accountState by accountViewModel.accountLiveData.observeAsState()
@@ -39,15 +44,42 @@ fun ZapSetCompose(zapSetCard: ZapSetCard, modifier: Modifier = Modifier, isInner
 
     val context = LocalContext.current.applicationContext
 
+    val noteEvent = note?.event
+    var popupExpanded by remember { mutableStateOf(false) }
+
     if (note == null) {
         BlankNote(Modifier, isInnerNote)
     } else {
-        val isNew = zapSetCard.createdAt > NotificationCache.load(routeForLastRead, context)
-        NotificationCache.markAsRead(routeForLastRead, zapSetCard.createdAt, context)
+        var isNew by remember { mutableStateOf<Boolean>(false) }
+
+        LaunchedEffect(key1 = zapSetCard) {
+            isNew = zapSetCard.createdAt > NotificationCache.load(routeForLastRead, context)
+
+            val createdAt = note.event?.createdAt
+            if (createdAt != null)
+                NotificationCache.markAsRead(routeForLastRead, zapSetCard.createdAt, context)
+        }
+
+        var backgroundColor = if (isNew) {
+            MaterialTheme.colors.primary.copy(0.12f).compositeOver(MaterialTheme.colors.background)
+        } else {
+            MaterialTheme.colors.background
+        }
 
         Column(
-            modifier = Modifier.background(
-                if (isNew) MaterialTheme.colors.primary.copy(0.12f) else MaterialTheme.colors.background
+            modifier = Modifier.background(backgroundColor).combinedClickable(
+                onClick = {
+                  if (noteEvent !is ChannelMessageEvent) {
+                      navController.navigate("Note/${note.idHex}"){
+                          launchSingleTop = true
+                      }
+                  } else {
+                      note.channel?.let {
+                          navController.navigate("Channel/${it.idHex}")
+                      }
+                  }
+                },
+                onLongClick = { popupExpanded = true }
             )
         ) {
             Row(modifier = Modifier
@@ -75,7 +107,7 @@ fun ZapSetCompose(zapSetCard: ZapSetCard, modifier: Modifier = Modifier, isInner
                     FlowRow() {
                         zapSetCard.zapEvents.forEach {
                             NoteAuthorPicture(
-                                note = it,
+                                note = it.key,
                                 navController = navController,
                                 userAccount = account.userProfile(),
                                 size = 35.dp
@@ -83,7 +115,17 @@ fun ZapSetCompose(zapSetCard: ZapSetCard, modifier: Modifier = Modifier, isInner
                         }
                     }
 
-                    NoteCompose(note, null, Modifier.padding(top = 5.dp), true, accountViewModel, navController)
+                    NoteCompose(
+                        baseNote = note,
+                        routeForLastRead = null,
+                        modifier = Modifier.padding(top = 5.dp),
+                        isBoostedNote = true,
+                        parentBackgroundColor = backgroundColor,
+                        accountViewModel = accountViewModel,
+                        navController = navController
+                    )
+
+                    NoteDropDownMenu(note, popupExpanded, { popupExpanded = false }, accountViewModel)
                 }
             }
         }

app/src/main/java/com/vitorpamplona/amethyst/ui/qrcode/ShowQRDialog.kt

@@ -27,6 +27,7 @@ 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.BitmapPainter
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
@@ -37,6 +38,8 @@ import coil.compose.AsyncImage
 import coil.compose.rememberAsyncImagePainter
 import com.vitorpamplona.amethyst.RoboHashCache
 import com.vitorpamplona.amethyst.model.User
+import com.vitorpamplona.amethyst.ui.components.AsyncImageProxy
+import com.vitorpamplona.amethyst.ui.components.ResizeImage
 import com.vitorpamplona.amethyst.ui.actions.CloseButton
 import com.vitorpamplona.amethyst.ui.qrcode.QrCodeScanner
 import nostr.postr.toNpub
@@ -79,11 +82,11 @@ fun ShowQRDialog(user: User, onScan: (String) -> Unit, onClose: () -> Unit) {
 
             Column(modifier = Modifier.fillMaxWidth()) {
               Row(horizontalArrangement = Arrangement.Center, modifier = Modifier.fillMaxWidth()) {
-                AsyncImage(
-                  model = user.profilePicture(),
-                  placeholder = rememberAsyncImagePainter(RoboHashCache.get(ctx, user.pubkeyHex)),
-                  fallback = rememberAsyncImagePainter(RoboHashCache.get(ctx, user.pubkeyHex)),
-                  error = rememberAsyncImagePainter(RoboHashCache.get(ctx, user.pubkeyHex)),
+                AsyncImageProxy(
+                  model = ResizeImage(user.profilePicture(), 100.dp),
+                  placeholder = BitmapPainter(RoboHashCache.get(ctx, user.pubkeyHex)),
+                  fallback = BitmapPainter(RoboHashCache.get(ctx, user.pubkeyHex)),
+                  error = BitmapPainter(RoboHashCache.get(ctx, user.pubkeyHex)),
                   contentDescription = "Profile Image",
                   modifier = Modifier
                     .width(100.dp)
@@ -109,7 +112,7 @@ fun ShowQRDialog(user: User, onScan: (String) -> Unit, onClose: () -> Unit) {
                 horizontalArrangement = Arrangement.Center,
                 modifier = Modifier.fillMaxWidth().padding(horizontal = 35.dp, vertical = 10.dp)
               ) {
-                QrCodeDrawer("nostr:${user.pubkey.toNpub()}")
+                QrCodeDrawer("nostr:${user.pubkeyNpub()}")
               }
 
             }

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

@@ -1,13 +1,16 @@
 package com.vitorpamplona.amethyst.ui.screen
 
 import androidx.lifecycle.ViewModel
-import androidx.lifecycle.viewModelScope
 import com.vitorpamplona.amethyst.LocalPreferences
 import com.vitorpamplona.amethyst.ServiceManager
 import com.vitorpamplona.amethyst.model.Account
+import com.vitorpamplona.amethyst.model.LocalCache
 import fr.acinq.secp256k1.Hex
 import java.util.regex.Pattern
+import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.Job
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.update
@@ -21,9 +24,13 @@ class AccountStateViewModel(private val localPreferences: LocalPreferences): Vie
 
   init {
     // pulls account from storage.
+
+    // Keeps it in the the UI thread to void blinking the login page.
+    //viewModelScope.launch(Dispatchers.IO) {
     localPreferences.loadFromEncryptedStorage()?.let {
       login(it)
     }
+    //}
   }
 
   fun login(key: String) {
@@ -58,12 +65,39 @@ class AccountStateViewModel(private val localPreferences: LocalPreferences): Vie
     else
       _accountContent.update { AccountState.LoggedInViewOnly ( account ) }
 
-    viewModelScope.launch(Dispatchers.IO) {
+    val scope = CoroutineScope(Job() + Dispatchers.IO)
+    scope.launch {
       ServiceManager.start(account)
     }
+
+    GlobalScope.launch(Dispatchers.Main) {
+      account.saveable.observeForever(saveListener)
+    }
+  }
+
+  private val saveListener: (com.vitorpamplona.amethyst.model.AccountState) -> Unit = {
+    GlobalScope.launch(Dispatchers.IO) {
+      localPreferences.saveToEncryptedStorage(it.account)
+    }
   }
 
   fun logOff() {
+    val state = accountContent.value
+
+    when (state) {
+      is AccountState.LoggedIn -> {
+        GlobalScope.launch(Dispatchers.Main) {
+          state.account.saveable.removeObserver(saveListener)
+        }
+      }
+      is AccountState.LoggedInViewOnly -> {
+        GlobalScope.launch(Dispatchers.Main) {
+          state.account.saveable.removeObserver(saveListener)
+        }
+      }
+      else -> {}
+    }
+
     _accountContent.update { AccountState.LoggedOff }
 
     localPreferences.clearEncryptedStorage()

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

@@ -24,8 +24,8 @@ class LikeSetCard(val note: Note, val likeEvents: List<Note>): Card() {
     override fun id() = note.idHex + "L" + createdAt
 }
 
-class ZapSetCard(val note: Note, val zapEvents: List<Note>): Card() {
-    val createdAt = zapEvents.maxOf { it.event?.createdAt ?: 0 }
+class ZapSetCard(val note: Note, val zapEvents: Map<Note, Note>): Card() {
+    val createdAt = zapEvents.maxOf { it.value.event?.createdAt ?: 0 }
     override fun createdAt(): Long {
         return createdAt
     }

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

@@ -5,7 +5,6 @@ import androidx.compose.animation.core.tween
 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
@@ -16,7 +15,6 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.unit.dp
-import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.navigation.NavController
 import com.google.accompanist.swiperefresh.SwipeRefresh
 import com.google.accompanist.swiperefresh.rememberSwipeRefreshState
@@ -96,7 +94,7 @@ private fun FeedLoaded(
             when (item) {
                 is NoteCard -> NoteCompose(
                     item.note,
-                    isInnerNote = false,
+                    isBoostedNote = false,
                     accountViewModel = accountViewModel,
                     navController = navController,
                     routeForLastRead = routeForLastRead

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

@@ -1,24 +1,22 @@
 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.service.NostrDataSource
 import com.vitorpamplona.amethyst.service.model.ChannelCreateEvent
 import com.vitorpamplona.amethyst.service.model.ChannelMetadataEvent
 import com.vitorpamplona.amethyst.service.model.LnZapEvent
 import com.vitorpamplona.amethyst.service.model.ReactionEvent
 import com.vitorpamplona.amethyst.service.model.RepostEvent
+import com.vitorpamplona.amethyst.ui.dal.FeedFilter
+import com.vitorpamplona.amethyst.ui.dal.NotificationFeedFilter
 import java.util.concurrent.atomic.AtomicBoolean
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
-import kotlinx.coroutines.cancel
+import kotlinx.coroutines.NonCancellable
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
@@ -26,7 +24,9 @@ import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 
-class CardFeedViewModel(val dataSource: NostrDataSource<Note>): ViewModel() {
+class NotificationViewModel: CardFeedViewModel(NotificationFeedFilter)
+
+open class CardFeedViewModel(val dataSource: FeedFilter<Note>): ViewModel() {
     private val _feedContent = MutableStateFlow<CardFeedState>(CardFeedState.Loading)
     val feedContent = _feedContent.asStateFlow()
 
@@ -38,6 +38,8 @@ class CardFeedViewModel(val dataSource: NostrDataSource<Note>): ViewModel() {
             refreshSuspended()
         }
     }
+
+    @Synchronized
     private fun refreshSuspended() {
         val notes = dataSource.loadTop()
 
@@ -48,7 +50,7 @@ class CardFeedViewModel(val dataSource: NostrDataSource<Note>): ViewModel() {
             val newCards = convertToCard(notes.minus(lastNotesCopy))
             if (newCards.isNotEmpty()) {
                 lastNotes = notes
-                updateFeed((oldNotesState.feed.value + newCards).sortedBy { it.createdAt() }.reversed())
+                updateFeed((oldNotesState.feed.value + newCards).distinctBy { it.id() }.sortedBy { it.createdAt() }.reversed())
             }
         } else {
             val cards = convertToCard(notes)
@@ -69,15 +71,15 @@ class CardFeedViewModel(val dataSource: NostrDataSource<Note>): ViewModel() {
 
         val reactionCards = reactionsPerEvent.map { LikeSetCard(it.key, it.value) }
 
-        val zapsPerEvent = mutableMapOf<Note, MutableList<Note>>()
+        val zapsPerEvent = mutableMapOf<Note, MutableMap<Note, Note>>()
         notes
             .filter { it.event is LnZapEvent}
             .forEach { zapEvent ->
                 val zappedPost = zapEvent.replyTo?.lastOrNull() { it.event !is ChannelMetadataEvent && it.event !is ChannelCreateEvent }
                 if (zappedPost != null) {
-                    val key = zappedPost.zaps.filter { it.value == zapEvent }.keys.firstOrNull()
-                    if (key != null) {
-                        zapsPerEvent.getOrPut(zappedPost, { mutableListOf() }).add(key)
+                    val zapRequest = zappedPost.zaps.filter { it.value == zapEvent }.keys.firstOrNull()
+                    if (zapRequest != null) {
+                        zapsPerEvent.getOrPut(zappedPost, { mutableMapOf() }).put(zapRequest, zapEvent)
                     }
                 }
             }
@@ -125,9 +127,14 @@ class CardFeedViewModel(val dataSource: NostrDataSource<Note>): ViewModel() {
         handlerWaiting.set(true)
         val scope = CoroutineScope(Job() + Dispatchers.Default)
         scope.launch {
-            delay(100)
-            refresh()
-            handlerWaiting.set(false)
+            try {
+                delay(150)
+                refresh()
+            } finally {
+                withContext(NonCancellable) {
+                    handlerWaiting.set(false)
+                }
+            }
         }
     }
 

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

@@ -18,11 +18,12 @@ import androidx.compose.runtime.collectAsState
 import androidx.navigation.NavController
 import com.google.accompanist.swiperefresh.SwipeRefresh
 import com.google.accompanist.swiperefresh.rememberSwipeRefreshState
+import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.ui.note.ChatroomMessageCompose
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 
 @Composable
-fun ChatroomFeedView(viewModel: FeedViewModel, accountViewModel: AccountViewModel, navController: NavController, routeForLastRead: String?) {
+fun ChatroomFeedView(viewModel: FeedViewModel, accountViewModel: AccountViewModel, navController: NavController, routeForLastRead: String?, onWantsToReply: (Note) -> Unit ) {
     val feedState by viewModel.feedContent.collectAsState()
 
     var isRefreshing by remember { mutableStateOf(false) }
@@ -65,7 +66,7 @@ fun ChatroomFeedView(viewModel: FeedViewModel, accountViewModel: AccountViewMode
                     ) {
                         var previousDate: String = ""
                         itemsIndexed(state.feed.value, key = { index, item -> item.idHex }) { index, item ->
-                            ChatroomMessageCompose(item, routeForLastRead, accountViewModel = accountViewModel, navController = navController)
+                            ChatroomMessageCompose(item, routeForLastRead, accountViewModel = accountViewModel, navController = navController, onWantsToReply = onWantsToReply)
                         }
                     }
                 }

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

@@ -8,7 +8,6 @@ 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
@@ -23,20 +22,20 @@ 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, routeForLastRead: String?) {
+fun FeedView(
+    viewModel: FeedViewModel,
+    accountViewModel: AccountViewModel,
+    navController: NavController,
+    routeForLastRead: String?
+) {
     val feedState by viewModel.feedContent.collectAsState()
 
     var isRefreshing by remember { mutableStateOf(false) }
@@ -44,7 +43,7 @@ fun FeedView(viewModel: FeedViewModel, accountViewModel: AccountViewModel, navCo
 
     LaunchedEffect(isRefreshing) {
         if (isRefreshing) {
-            viewModel.hardRefresh()
+            viewModel.refresh()
             isRefreshing = false
         }
     }
@@ -105,7 +104,7 @@ private fun FeedLoaded(
         itemsIndexed(state.feed.value, key = { _, item -> item.idHex }) { index, item ->
             NoteCompose(
                 item,
-                isInnerNote = false,
+                isBoostedNote = false,
                 routeForLastRead = routeForLastRead,
                 accountViewModel = accountViewModel,
                 navController = navController

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

@@ -2,22 +2,26 @@ package com.vitorpamplona.amethyst.ui.screen
 
 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.service.NostrChannelDataSource
-import com.vitorpamplona.amethyst.service.NostrChatRoomDataSource
-import com.vitorpamplona.amethyst.service.NostrChatroomListDataSource
-import com.vitorpamplona.amethyst.service.NostrDataSource
-import com.vitorpamplona.amethyst.service.NostrGlobalDataSource
-import com.vitorpamplona.amethyst.service.NostrHomeDataSource
-import com.vitorpamplona.amethyst.service.NostrThreadDataSource
-import com.vitorpamplona.amethyst.service.NostrUserProfileDataSource
+import com.vitorpamplona.amethyst.ui.dal.ChannelFeedFilter
+import com.vitorpamplona.amethyst.ui.dal.ChatroomFeedFilter
+import com.vitorpamplona.amethyst.ui.dal.ChatroomListKnownFeedFilter
+import com.vitorpamplona.amethyst.ui.dal.ChatroomListNewFeedFilter
+import com.vitorpamplona.amethyst.ui.dal.FeedFilter
+import com.vitorpamplona.amethyst.ui.dal.GlobalFeedFilter
+import com.vitorpamplona.amethyst.ui.dal.HomeConversationsFeedFilter
+import com.vitorpamplona.amethyst.ui.dal.HomeNewThreadFeedFilter
+import com.vitorpamplona.amethyst.ui.dal.ThreadFeedFilter
+import com.vitorpamplona.amethyst.ui.dal.UserProfileConversationsFeedFilter
+import com.vitorpamplona.amethyst.ui.dal.UserProfileNewThreadFeedFilter
+import com.vitorpamplona.amethyst.ui.dal.UserProfileReportsFeedFilter
 import java.util.concurrent.atomic.AtomicBoolean
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
+import kotlinx.coroutines.NonCancellable
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
@@ -25,101 +29,83 @@ import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 
-class NostrChannelFeedViewModel: FeedViewModel(NostrChannelDataSource)
-class NostrChatRoomFeedViewModel: FeedViewModel(NostrChatRoomDataSource)
-class NostrGlobalFeedViewModel: FeedViewModel(NostrGlobalDataSource)
-class NostrThreadFeedViewModel: FeedViewModel(NostrThreadDataSource)
-class NostrUserProfileFeedViewModel: FeedViewModel(NostrUserProfileDataSource)
-
-class NostrChatroomListKnownFeedViewModel: FeedViewModel(NostrChatroomListDataSource) {
-    override fun newListFromDataSource(): List<Note> {
-        // Filter: all channels + PMs the account has replied to
-        return super.newListFromDataSource().filter {
-            val me = NostrChatroomListDataSource.account.userProfile()
-            it.channel != null || me.hasSentMessagesTo(it.author)
-        }
-    }
-}
-class NostrChatroomListNewFeedViewModel: FeedViewModel(NostrChatroomListDataSource) {
-    override fun newListFromDataSource(): List<Note> {
-        // Filter: no channels + PMs the account has never replied to
-        return super.newListFromDataSource().filter {
-            val me = NostrChatroomListDataSource.account.userProfile()
-            it.channel == null && !me.hasSentMessagesTo(it.author)
-        }
-    }
-}
-
-class NostrHomeFeedViewModel: FeedViewModel(NostrHomeDataSource) {
-    override fun newListFromDataSource(): List<Note> {
-        // Filter: no replies
-        return dataSource.feed().filter { it.isNewThread() }.take(100)
-    }
-}
-
-class NostrHomeRepliesFeedViewModel: FeedViewModel(NostrHomeDataSource) {
-    override fun newListFromDataSource(): List<Note> {
-        // Filter: only replies
-        return dataSource.feed().filter {! it.isNewThread() }.take(100)
-    }
-}
+class NostrChannelFeedViewModel: FeedViewModel(ChannelFeedFilter)
+class NostrChatRoomFeedViewModel: FeedViewModel(ChatroomFeedFilter)
+class NostrGlobalFeedViewModel: FeedViewModel(GlobalFeedFilter)
+class NostrThreadFeedViewModel: FeedViewModel(ThreadFeedFilter)
+class NostrUserProfileNewThreadsFeedViewModel: FeedViewModel(UserProfileNewThreadFeedFilter)
+class NostrUserProfileConversationsFeedViewModel: FeedViewModel(UserProfileConversationsFeedFilter)
+class NostrUserProfileReportFeedViewModel: FeedViewModel(UserProfileReportsFeedFilter)
+class NostrChatroomListKnownFeedViewModel: FeedViewModel(ChatroomListKnownFeedFilter)
+class NostrChatroomListNewFeedViewModel: FeedViewModel(ChatroomListNewFeedFilter)
+class NostrHomeFeedViewModel: FeedViewModel(HomeNewThreadFeedFilter)
+class NostrHomeRepliesFeedViewModel: FeedViewModel(HomeConversationsFeedFilter)
 
 
-abstract class FeedViewModel(val dataSource: NostrDataSource<Note>): ViewModel() {
+abstract class FeedViewModel(val localFilter: FeedFilter<Note>): ViewModel() {
     private val _feedContent = MutableStateFlow<FeedState>(FeedState.Loading)
     val feedContent = _feedContent.asStateFlow()
 
-    open fun newListFromDataSource(): List<Note> {
-        return dataSource.loadTop()
+    fun newListFromDataSource(): List<Note> {
+        return localFilter.loadTop()
     }
 
-    fun hardRefresh() {
-        dataSource.resetFilters()
+    fun clearFeed() {
+        _feedContent.update { FeedState.Loading }
     }
 
     fun refresh() {
-        viewModelScope.launch(Dispatchers.Default) {
-            val notes = newListFromDataSource()
+        val scope = CoroutineScope(Job() + Dispatchers.Default)
+        scope.launch {
+            refreshSuspended()
+        }
+    }
 
-            val oldNotesState = feedContent.value
-            if (oldNotesState is FeedState.Loaded) {
-                if (notes != oldNotesState.feed) {
-                    withContext(Dispatchers.Main) {
-                        updateFeed(notes)
-                    }
-                }
-            } else {
-                withContext(Dispatchers.Main) {
-                    updateFeed(notes)
-                }
-            }
+    fun refreshSuspended() {
+        val notes = newListFromDataSource()
+
+        val oldNotesState = feedContent.value
+        if (oldNotesState is FeedState.Loaded) {
+            // Using size as a proxy for has changed.
+            //if (notes != oldNotesState.feed.value) {
+                updateFeed(notes)
+            //}
+        } else {
+            updateFeed(notes)
         }
     }
 
     private 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(mutableStateOf(notes)) }
+        val scope = CoroutineScope(Job() + Dispatchers.Main)
+        scope.launch {
+            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(mutableStateOf(notes)) }
+            }
         }
     }
 
     private var handlerWaiting = AtomicBoolean()
     @Synchronized
-    private fun invalidateData() {
+    fun invalidateData() {
         if (handlerWaiting.getAndSet(true)) return
 
         handlerWaiting.set(true)
         val scope = CoroutineScope(Job() + Dispatchers.Default)
         scope.launch {
-            delay(100)
-            refresh()
-            handlerWaiting.set(false)
+            try {
+                delay(50)
+                refresh()
+            } finally {
+                withContext(NonCancellable) {
+                    handlerWaiting.set(false)
+                }
+            }
         }
     }
 

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

@@ -2,16 +2,14 @@ package com.vitorpamplona.amethyst.ui.screen
 
 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.service.NostrDataSource
-import com.vitorpamplona.amethyst.service.NostrUserProfileZapsDataSource
+import com.vitorpamplona.amethyst.ui.dal.FeedFilter
+import com.vitorpamplona.amethyst.ui.dal.UserProfileZapsFeedFilter
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
-import kotlinx.coroutines.cancel
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
@@ -19,10 +17,11 @@ import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import java.util.concurrent.atomic.AtomicBoolean
+import kotlinx.coroutines.NonCancellable
 
-class NostrUserProfileZapsFeedViewModel: LnZapFeedViewModel(NostrUserProfileZapsDataSource)
+class NostrUserProfileZapsFeedViewModel: LnZapFeedViewModel(UserProfileZapsFeedFilter)
 
-open class LnZapFeedViewModel(val dataSource: NostrDataSource<Pair<Note, Note>>): ViewModel() {
+open class LnZapFeedViewModel(val dataSource: FeedFilter<Pair<Note, Note>>): ViewModel() {
     private val _feedContent = MutableStateFlow<LnZapFeedState>(LnZapFeedState.Loading)
     val feedContent = _feedContent.asStateFlow()
 
@@ -33,15 +32,13 @@ open class LnZapFeedViewModel(val dataSource: NostrDataSource<Pair<Note, Note>>)
         }
     }
 
-
     private fun refreshSuspended() {
         val notes = dataSource.loadTop()
 
         val oldNotesState = feedContent.value
         if (oldNotesState is LnZapFeedState.Loaded) {
-            if (notes != oldNotesState.feed) {
-                updateFeed(notes)
-            }
+            // Using size as a proxy for has changed.
+            updateFeed(notes)
         } else {
             updateFeed(notes)
         }
@@ -71,8 +68,14 @@ open class LnZapFeedViewModel(val dataSource: NostrDataSource<Pair<Note, Note>>)
         handlerWaiting.set(true)
         val scope = CoroutineScope(Job() + Dispatchers.Default)
         scope.launch {
-            delay(100)
-            refresh()
+            try {
+                delay(50)
+                refresh()
+            } finally {
+                withContext(NonCancellable) {
+                    handlerWaiting.set(false)
+                }
+            }
             handlerWaiting.set(false)
         }
     }

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

@@ -19,23 +19,29 @@ import androidx.lifecycle.viewModelScope
 import androidx.navigation.NavController
 import com.google.accompanist.swiperefresh.SwipeRefresh
 import com.google.accompanist.swiperefresh.rememberSwipeRefreshState
+import com.vitorpamplona.amethyst.model.RelayInfo
 import com.vitorpamplona.amethyst.model.User
+import com.vitorpamplona.amethyst.model.UserState
+import com.vitorpamplona.amethyst.service.NostrHomeDataSource
 import com.vitorpamplona.amethyst.ui.actions.NewRelayListView
 import com.vitorpamplona.amethyst.ui.note.RelayCompose
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
+import java.util.concurrent.atomic.AtomicBoolean
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
+import kotlinx.coroutines.NonCancellable
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 
 class RelayFeedViewModel: ViewModel() {
-    val order = compareByDescending<User.RelayInfo> { it.lastEvent }.thenByDescending { it.counter }.thenBy { it.url }
+    val order = compareByDescending<RelayInfo> { it.lastEvent }.thenByDescending { it.counter }.thenBy { it.url }
 
-    private val _feedContent = MutableStateFlow<List<User.RelayInfo>>(emptyList())
+    private val _feedContent = MutableStateFlow<List<RelayInfo>>(emptyList())
     val feedContent = _feedContent.asStateFlow()
 
     var currentUser: User? = null
@@ -47,7 +53,7 @@ class RelayFeedViewModel: ViewModel() {
 
             val newRelaysFromRecord = currentUser?.relays?.entries?.mapNotNull {
                 if (it.key !in beingUsedSet) {
-                    User.RelayInfo(it.key, 0, 0)
+                    RelayInfo(it.key, 0, 0)
                 } else {
                     null
                 }
@@ -59,39 +65,41 @@ class RelayFeedViewModel: ViewModel() {
         }
     }
 
-    inner class CacheListener: User.Listener() {
-        override fun onNewRelayInfo() { invalidateData() }
-        override fun onRelayChange() { invalidateData() }
+    val listener: (UserState) -> Unit = {
+        invalidateData()
     }
 
-    val listener = CacheListener()
-
     fun subscribeTo(user: User) {
         currentUser = user
-        user.subscribe(listener)
+        user.live().relays.observeForever(listener)
+        user.live().relayInfo.observeForever(listener)
         invalidateData()
     }
 
     fun unsubscribeTo(user: User) {
-        user.unsubscribe(listener)
+        user.live().relays.removeObserver(listener)
+        user.live().relayInfo.removeObserver(listener)
         currentUser = null
     }
 
-    override fun onCleared() {
-        currentUser?.let { unsubscribeTo(it) }
-    }
+    var handlerWaiting = AtomicBoolean()
 
-    var handlerWaiting = false
     @Synchronized
-    fun invalidateData() {
-        if (handlerWaiting) return
+    private fun invalidateData() {
+        if (handlerWaiting.getAndSet(true)) return
 
-        handlerWaiting = true
+        handlerWaiting.set(true)
         val scope = CoroutineScope(Job() + Dispatchers.Default)
         scope.launch {
-            delay(100)
-            refresh()
-            handlerWaiting = false
+            try {
+                delay(50)
+                refresh()
+            } finally {
+                withContext(NonCancellable) {
+                    handlerWaiting.set(false)
+                }
+            }
+            handlerWaiting.set(false)
         }
     }
 }