0.22.0

Use KeyboardType.Password for login text field

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,32 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: "[BUG]"
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Video and Screenshots**
+If applicable, add a video and/or screenshots to help explain your problem.
+
+**Device (please complete the following information):**
+ - Phone Brand/Model [e.g. Pixel 7 Pro]: 
+ - Android Version [e.g. 33]: 
+ - App Version [e.g. v0.20.3]: 
+
+**Bounty (in Bitcoin sats) offered for a solution**
+Incentivize developers to work on your issue. Describe clear milestones to claim payment.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: "[FEATURE]"
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Bounty (in Bitcoin sats) offered for the implementation**
+Incentivize developers to work on your feature. Describe clear milestones to claim payment. 
+
+**Additional context**
+Add any other context, video, or screenshots about the feature request here.

.idea/.name

@@ -0,0 +1 @@
+Amethyst

.idea/inspectionProfiles/Project_Default.xml

@@ -5,6 +5,9 @@
       <option name="composableFile" value="true" />
       <option name="previewFile" value="true" />
     </inspection_tool>
+    <inspection_tool class="PreviewApiLevelMustBeValid" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
     <inspection_tool class="PreviewDimensionRespectsLimit" enabled="true" level="WARNING" enabled_by_default="true">
       <option name="composableFile" value="true" />
       <option name="previewFile" value="true" />

.idea/kotlinc.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="KotlinJpsPluginSettings">
+    <option name="version" value="1.8.10" />
+  </component>
+</project>

.idea/misc.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="Android Studio default JDK" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

README.md

@@ -6,29 +6,48 @@ Amethyst brings the best social network to your Android phone. Just insert your
 
 # Current Features
 
-- [x] Account Management
+- [x] Event Builders / WebSocket Subscriptions (NIP-01, NIP-15)
 - [x] Home Feed
 - [x] Notifications Feed
 - [x] Global Feed
-- [x] Reactions (like, boost, reply)
-- [x] Image Preview (gifs, svgs)
-- [x] Url Preview
+- [x] Reactions (likes NIP-25, boost, reply)
+- [x] Image/Video/Url/LnInvoice Previews
 - [x] View Threads
 - [x] Private Messages (NIP-04)
-- [x] User Profiles (follow/unfollow)
+- [x] User Profiles (edit/follow/unfollow - NIP-02)
 - [x] Public Chats (NIP-28)
-- [x] Notification Bubbles
-- [x] Reporting and Hide User capability
-- [x] Profile Edit
-- [x] Relay Edit (separate relay sets for home, dms, public chats, global)
-- [x] Dropdown to Link Users when writing
+- [x] Bech Encoding support (NIP-19)
+- [x] Notification Dots
+- [x] Reporting and Hide User capability (NIP-56)
+- [x] Automatic Translations
+- [x] Relay Sets (home, dms, public chats, global)
+- [x] User/Note Tagging (NIP-08, NIP-10)
 - [x] Lightning Tips
-- [ ] Zaps 
-- [ ] Infinity Scroll 
-- [ ] Identity Verification (NIP-05)
-- [ ] Event Deletion (NIP-09)
-- [ ] Account Creation / Backup Guidance
-- [ ] Message Sent feedback
+- [x] Zaps (NIP-57)
+- [x] URI Support (NIP-21)
+- [x] Event Deletion (NIP-09: like, boost, text notes and reports)
+- [x] Identity Verification (NIP-05)
+- [ ] Local Database 
+- [ ] View Individual Reactions (Like, Boost, Zaps, Reports) per Post
+- [ ] Bookmarks, Pinned Posts, Muted Events (NIP-51)
+- [ ] Sensitive Content (NIP-36) 
+- [ ] Relay Pages (NIP-11)
+- [ ] Relay Authentication (NIP-42)
+- [ ] Generic Tags (NIP-12)
+- [ ] Proof of Work in the Phone (NIP-13, NIP-20)
+- [ ] Events with a Subject (NIP-14)
+- [ ] Long-form Content (NIP-23) 
+- [ ] Online Relay Search (NIP-50)
+- [ ] Workspaces
+- [ ] Expiration Support (NIP-40)
+- [ ] Internationalization
+- [ ] Infinity Scroll
+- [ ] Badges (NIP-58)
+- [ ] Relay List Metadata (NIP-65)
+- [ ] Signing Requests (NIP-46)
+- [ ] Delegated Event Signing (NIP-26)
+- [ ] Account Creation / Backup Guidance (NIP-06)
+- [ ] Message Sent feedback (NIP-20)
 
 # Development Overview
 

app/build.gradle

@@ -11,8 +11,8 @@ android {
         applicationId "com.vitorpamplona.amethyst"
         minSdk 26
         targetSdk 33
-        versionCode 55
-        versionName "0.16.2"
+        versionCode 83
+        versionName "0.22.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,22 +121,36 @@ 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"
     implementation 'androidx.camera:camera-lifecycle:1.2.1'
     implementation 'androidx.camera:camera-view:1.2.1'
 
+    // Markdown
+    implementation "com.halilibo.compose-richtext:richtext-ui:0.16.0"
+    implementation "com.halilibo.compose-richtext:richtext-ui-material:0.16.0"
+    implementation "com.halilibo.compose-richtext:richtext-commonmark:0.16.0"
+
     // For QR Scanning
     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

@@ -4,10 +4,13 @@ import android.content.Context
 import com.google.gson.GsonBuilder
 import com.google.gson.reflect.TypeToken
 import com.vitorpamplona.amethyst.model.Account
-import com.vitorpamplona.amethyst.model.toByteArray
 import com.vitorpamplona.amethyst.model.RelaySetupInfo
+import com.vitorpamplona.amethyst.model.toByteArray
 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

@@ -2,12 +2,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 +22,7 @@ object NotificationCache {
       val scope = CoroutineScope(Job() + Dispatchers.IO)
       scope.launch {
         LocalPreferences(context).saveLastRead(route, timestampInSecs)
-        invalidateData()
+        live.invalidateData()
       }
     }
   }
@@ -36,24 +38,29 @@ 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()
+
+  fun invalidateData() {
+    if (!hasActiveObservers()) return
+    if (handlerWaiting.getAndSet(true)) return
+
+    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

@@ -2,23 +2,28 @@ package com.vitorpamplona.amethyst
 
 import android.content.Context
 import android.graphics.Bitmap
+import android.graphics.Canvas
+import android.graphics.Paint
 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
+import name.neuhalfen.projects.android.robohash.buckets.VariableSizeHashing
+import name.neuhalfen.projects.android.robohash.handle.Handle
+import name.neuhalfen.projects.android.robohash.handle.HandleFactory
+import name.neuhalfen.projects.android.robohash.paths.Configuration
+import name.neuhalfen.projects.android.robohash.repository.ImageRepository
 
 object RoboHashCache {
 
-  lateinit var robots: RoboHash
+  lateinit var robots: MyRoboHash
 
   lateinit var defaultAvatar: ImageBitmap
 
   @Synchronized
   fun get(context: Context, hash: String): ImageBitmap {
     if (!this::robots.isInitialized) {
-      robots = RoboHash(context)
-      //robots.useCache(LruCache(100));
+      robots = MyRoboHash(context)
 
       defaultAvatar = robots.imageForHandle(robots.calculateHandleFromUUID(UUID.nameUUIDFromBytes("aaaa".toByteArray()))).asImageBitmap()
     }
@@ -26,4 +31,139 @@ object RoboHashCache {
     return defaultAvatar
   }
 
-}
+}
+
+
+/**
+ * Recreates RoboHash to use a custom configuration
+ */
+class MyRoboHash(context: Context) {
+  private val configuration: Configuration = ModifiedSet1Configuration()
+  private val repository: ImageRepository
+  private val hashing = VariableSizeHashing(configuration.bucketSizes)
+
+  // Optional
+  private var memoryCache: LruCache<String, Bitmap>? = null
+
+  init {
+    repository = ImageRepository(context.assets)
+  }
+
+  fun useCache(memoryCache: LruCache<String, Bitmap>?) {
+    this.memoryCache = memoryCache
+  }
+
+  fun calculateHandleFromUUID(uuid: UUID?): Handle {
+    val data = hashing.createBuckets(uuid)
+    return handleFactory.calculateHandle(data)
+  }
+
+  fun imageForHandle(handle: Handle): Bitmap {
+    if (null != memoryCache) {
+      val cached = memoryCache!![handle.toString()]
+      if (null != cached) return cached
+    }
+    val bucketValues = handle.bucketValues()
+    val paths = configuration.convertToFacetParts(bucketValues)
+    val sampleSize = 1
+    val buffer = repository.createBuffer(configuration.width(), configuration.height())
+    val target = buffer.copy(Bitmap.Config.ARGB_8888, true)
+    val merged = Canvas(target)
+    val paint = Paint(0)
+
+    // The first image is not added as copy form the buffer
+    for (i in paths.indices) {
+      merged.drawBitmap(repository.getInto(buffer, paths[i], sampleSize), 0f, 0f, paint)
+    }
+    repository.returnBuffer(buffer)
+    if (null != memoryCache) {
+      memoryCache!!.put(handle.toString(), target)
+    }
+    return target
+  }
+
+  companion object {
+    private val handleFactory = HandleFactory()
+  }
+}
+
+/**
+ * Custom configuration to avoid the use of String.format in the GeneratePath
+ * This uses the default location and ends up encoding number in the local language
+ */
+class ModifiedSet1Configuration : Configuration {
+  override fun convertToFacetParts(bucketValues: ByteArray): Array<String> {
+    require(bucketValues.size == BUCKET_COUNT)
+    val color = INT_TO_COLOR[bucketValues[BUCKET_COLOR].toInt()]
+    val paths = mutableListOf<String>()
+
+    // e.g.
+    //   blue face  #2
+    //   blue nose  #7
+    //   blue
+    val firstFacetBucket = BUCKET_COLOR + 1
+    for (facet in 0 until FACET_COUNT) {
+      val bucketValue = bucketValues[firstFacetBucket + facet].toInt()
+      paths.add(generatePath(FACET_PATH_TEMPLATES[facet], color, bucketValue))
+    }
+    return paths.toTypedArray()
+  }
+
+  private fun generatePath(facetPathTemplate: String, color: String, bucketValue: Int): String {
+    // TODO: Make more efficient
+    return facetPathTemplate.replace("#ROOT#", ROOT).replace("#COLOR#".toRegex(), color)
+      .replace("#ITEM#".toRegex(), (bucketValue + 1).toString().padStart(2, '0'))
+  }
+
+  override fun getBucketSizes(): ByteArray {
+    return BUCKET_SIZES
+  }
+
+  override fun width(): Int {
+    return 300
+  }
+
+  override fun height(): Int {
+    return 300
+  }
+
+  companion object {
+    private const val ROOT = "sets/set1"
+    private const val BUCKET_COLOR = 0
+    private const val COLOR_COUNT = 10
+    private const val BODY_COUNT = 10
+    private const val FACE_COUNT = 10
+    private const val MOUTH_COUNT = 10
+    private const val EYES_COUNT = 10
+    private const val ACCESSORY_COUNT = 10
+    private const val BUCKET_COUNT = 6
+    private const val FACET_COUNT = 5
+    private val BUCKET_SIZES = byteArrayOf(
+      COLOR_COUNT.toByte(),
+      BODY_COUNT.toByte(),
+      FACE_COUNT.toByte(),
+      MOUTH_COUNT.toByte(),
+      EYES_COUNT.toByte(),
+      ACCESSORY_COUNT.toByte()
+    )
+    private val INT_TO_COLOR = arrayOf(
+      "blue",
+      "brown",
+      "green",
+      "grey",
+      "orange",
+      "pink",
+      "purple",
+      "red",
+      "white",
+      "yellow"
+    )
+    private val FACET_PATH_TEMPLATES = arrayOf(
+      "#ROOT#/#COLOR#/01Body/#COLOR#_body-#ITEM#.png",
+      "#ROOT#/#COLOR#/02Face/#COLOR#_face-#ITEM#.png",
+      "#ROOT#/#COLOR#/Mouth/#COLOR#_mouth-#ITEM#.png",
+      "#ROOT#/#COLOR#/Eyes/#COLOR#_eyes-#ITEM#.png",
+      "#ROOT#/#COLOR#/Accessory/#COLOR#_accessory-#ITEM#.png"
+    )
+  }
+}

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

@@ -1,21 +1,19 @@
 package com.vitorpamplona.amethyst
 
 import com.vitorpamplona.amethyst.model.Account
-import com.vitorpamplona.amethyst.service.relays.Constants
+import com.vitorpamplona.amethyst.model.LocalCache
 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
+import com.vitorpamplona.amethyst.service.relays.Constants
 
 object ServiceManager {
   private var account: Account? = null
@@ -34,25 +32,17 @@ object ServiceManager {
       // 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 +55,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/model/Account.kt

@@ -3,7 +3,6 @@ package com.vitorpamplona.amethyst.model
 import android.content.res.Resources
 import androidx.core.os.ConfigurationCompat
 import androidx.lifecycle.LiveData
-import com.vitorpamplona.amethyst.service.relays.Constants
 import com.vitorpamplona.amethyst.service.model.ChannelCreateEvent
 import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
 import com.vitorpamplona.amethyst.service.model.ChannelMetadataEvent
@@ -12,6 +11,7 @@ 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.Client
+import com.vitorpamplona.amethyst.service.relays.Constants
 import com.vitorpamplona.amethyst.service.relays.FeedType
 import com.vitorpamplona.amethyst.service.relays.Relay
 import com.vitorpamplona.amethyst.service.relays.RelayPool
@@ -22,12 +22,15 @@ 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
@@ -54,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())
   }
@@ -65,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 {
@@ -75,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) {
@@ -106,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
     }
@@ -124,13 +158,8 @@ 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
@@ -139,10 +168,11 @@ class Account(
   fun createZapRequestFor(user: User): LnZapRequestEvent? {
     return createZapRequestFor(user.pubkeyHex)
   }
+
   fun createZapRequestFor(userPubKeyHex: String): LnZapRequestEvent? {
     if (!isWriteable()) return null
 
-    return LnZapRequestEvent.create(userPubKeyHex, 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) {
@@ -162,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)
     }
   }
 
@@ -176,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
     }
@@ -203,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 {
@@ -225,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)
     }
@@ -269,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
     )
@@ -304,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) {
@@ -373,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>? {
@@ -394,39 +515,19 @@ class Account(
     }.toTypedArray()
   }
 
-  init {
-    userProfile().liveRelays.observeForever {
-      GlobalScope.launch(Dispatchers.IO) {
-        Client.disconnect()
-        Client.connect(activeRelays() ?: convertLocalRelays())
-        RelayPool.requestAndWatch()
-      }
+  fun reconnectIfRelaysHaveChanged() {
+    val newRelaySet = activeRelays() ?: convertLocalRelays()
+    if (!Client.isSameRelaySetConfig(newRelaySet)) {
+      Client.disconnect()
+      Client.connect(newRelaySet)
+      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 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
   }
@@ -461,10 +562,65 @@ 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()
+
+  fun invalidateData() {
+    if (handlerWaiting.getAndSet(true)) return
+
+    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,94 @@
+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()
+
+  fun invalidateData() {
+    if (!hasActiveObservers()) return
+    if (handlerWaiting.getAndSet(true)) return
+
+    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,13 @@
 package com.vitorpamplona.amethyst.model
 
 import androidx.lifecycle.LiveData
-import com.vitorpamplona.amethyst.service.NostrSingleEventDataSource
+import com.vitorpamplona.amethyst.service.NostrSingleChannelDataSource
 import com.vitorpamplona.amethyst.service.model.ChannelCreateEvent
 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,11 +15,14 @@ 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
     fun addNote(note: Note) {
         notes[note.idHex] = note
     }
@@ -47,8 +48,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 +74,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

@@ -2,7 +2,6 @@ package com.vitorpamplona.amethyst.model
 
 import com.vitorpamplona.amethyst.ui.note.toShortenHex
 import fr.acinq.secp256k1.Hex
-import java.util.regex.Pattern
 import nostr.postr.Bech32
 import nostr.postr.Persona
 import nostr.postr.bechToBytes
@@ -41,8 +40,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

@@ -12,22 +12,25 @@ import com.vitorpamplona.amethyst.service.model.ChannelMetadataEvent
 import com.vitorpamplona.amethyst.service.model.ChannelMuteUserEvent
 import com.vitorpamplona.amethyst.service.model.LnZapEvent
 import com.vitorpamplona.amethyst.service.model.LnZapRequestEvent
+import com.vitorpamplona.amethyst.service.model.LongTextNoteEvent
 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
@@ -44,10 +47,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 {
@@ -57,6 +72,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 {
@@ -66,10 +91,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
     }
@@ -79,18 +115,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)}")
@@ -102,21 +139,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)
 
@@ -141,6 +185,80 @@ object LocalCache {
     refreshObservers()
   }
 
+  fun consume(event: LongTextNoteEvent, relay: Relay?) {
+    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.addRelayBeingUsed(relay, event.createdAt)
+      note.addRelay(relay)
+    }
+
+    // Already processed this event.
+    if (note.event != null) return
+
+    val mentions = event.mentions.mapNotNull { checkGetOrCreateUser(it) }
+    val replyTo = replyToWithoutCitations(event).mapNotNull { checkGetOrCreateNote(it) }
+
+    note.loadEvent(event, author, mentions, replyTo)
+
+    //Log.d("TN", "New Note (${notes.size},${users.size}) ${note.author?.toBestDisplayName()} ${note.event?.content?.take(100)} ${formattedDateTime(event.createdAt)}")
+
+    // Prepares user's profile view.
+    author.addNote(note)
+
+    // Adds notifications to users.
+    mentions.forEach {
+      it.addTaggedPost(note)
+    }
+    replyTo.forEach {
+      it.author?.addTaggedPost(note)
+    }
+
+    // Counts the replies
+    replyTo.forEach {
+      it.addReply(note)
+    }
+
+    refreshObservers()
+  }
+
+  private fun findCitations(event: Event): Set<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 citations
+  }
+
+  private fun replyToWithoutCitations(event: TextNoteEvent): List<String> {
+    val citations = findCitations(event)
+
+    return event.replyTos.filter { it !in citations }
+  }
+
+  private fun replyToWithoutCitations(event: LongTextNoteEvent): List<String> {
+    val citations = findCitations(event)
+
+    return event.replyTos.filter { it !in citations }
+  }
+
   fun consume(event: RecommendRelayEvent) {
     //Log.d("RR", event.toJson())
   }
@@ -148,8 +266,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 {
@@ -165,6 +285,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> =
@@ -176,10 +297,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}"
+      )
     }
   }
 
@@ -188,7 +313,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)
     }
 
@@ -199,8 +324,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)
 
@@ -213,7 +338,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) {
@@ -225,8 +384,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)
 
@@ -256,8 +415,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)
 
@@ -294,15 +453,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.key) }
+    val repliesTo = event.reportedPost.mapNotNull { checkGetOrCreateNote(it.key) }
 
     note.loadEvent(event, author, mentions, repliesTo)
 
@@ -343,7 +507,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) {
@@ -363,8 +527,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)
@@ -372,16 +542,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
@@ -420,8 +590,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)
 
@@ -456,8 +626,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)
 
@@ -481,9 +651,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)
     }
   }
 
@@ -492,18 +662,123 @@ 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)
 
@@ -517,17 +792,20 @@ class LocalCacheLiveData(val cache: LocalCache): LiveData<LocalCacheState>(Local
   // 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 {
-      delay(100)
-      refresh()
-      handlerWaiting.set(false)
+      try {
+        delay(500)
+        refresh()
+      } finally {
+        withContext(NonCancellable) {
+          handlerWaiting.set(false)
+        }
+      }
     }
   }
 

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

@@ -1,38 +1,32 @@
 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
 import com.vitorpamplona.amethyst.service.model.RepostEvent
+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.time.Instant
 import java.time.ZoneId
 import java.time.format.DateTimeFormatter
-import java.util.Collections
+import java.util.Date
+import java.util.concurrent.atomic.AtomicBoolean
+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 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 kotlinx.coroutines.withContext
 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 +53,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 +71,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 +170,17 @@ class Note(val idHex: String) {
 
         if (author !in reports.keys) {
             reports = reports + Pair(author, setOf(note))
-            liveReports.invalidateData()
+            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 +223,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 +234,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,40 +261,79 @@ 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)) {
     // 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 {
-            delay(100)
-            refresh()
-            handlerWaiting.set(false)
+            try {
+                delay(100)
+                refresh()
+            } finally {
+                withContext(NonCancellable) {
+                    handlerWaiting.set(false)
+                }
+            }
         }
     }
 

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

@@ -7,7 +7,6 @@ import com.vitorpamplona.amethyst.ui.components.imageExtension
 import com.vitorpamplona.amethyst.ui.components.isValidURL
 import com.vitorpamplona.amethyst.ui.components.noProtocolUrlValidator
 import com.vitorpamplona.amethyst.ui.components.videoExtension
-import java.util.concurrent.ConcurrentHashMap
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job

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

@@ -9,26 +9,26 @@ import com.vitorpamplona.amethyst.ui.note.toShortenHex
 import fr.acinq.secp256k1.Hex
 import java.math.BigDecimal
 import java.util.concurrent.atomic.AtomicBoolean
+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.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
@@ -42,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
@@ -52,67 +53,71 @@ class User(val pubkeyHex: String) {
     var relaysBeingUsed = mapOf<String, RelayInfo>()
         private set
 
-    data class Chatroom(var roomMessages: Set<Note>)
-
     var privateChatrooms = mapOf<User, Chatroom>()
         private set
 
-    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()
+        liveSet?.follows?.invalidateData()
+        user.liveSet?.follows?.invalidateData()
     }
 
     fun unfollow(user: User) {
         follows = follows - user
         user.followers = user.followers - this
 
-        liveFollows.invalidateData()
-        user.liveFollows.invalidateData()
+        liveSet?.follows?.invalidateData()
+        user.liveSet?.follows?.invalidateData()
     }
 
     fun follow(users: Set<User>, followedAt: Long) {
         follows = follows + users
         users.forEach {
-            if (this !in it.followers) {
+            if (this !in it.followers && it.liveSet?.isInUse() == true) {
                 it.followers = it.followers + this
-                it.liveFollows.invalidateData()
+                it.liveSet?.follows?.invalidateData()
             }
         }
 
-        liveFollows.invalidateData()
+        liveSet?.follows?.invalidateData()
     }
 
     fun unfollow(users: Set<User>) {
         follows = follows - users
         users.forEach {
-            if (this in it.followers) {
+            if (this in it.followers && it.liveSet?.isInUse() == true) {
                 it.followers = it.followers - this
-                it.liveFollows.invalidateData()
+                it.liveSet?.follows?.invalidateData()
             }
         }
-        liveFollows.invalidateData()
+        liveSet?.follows?.invalidateData()
     }
 
     fun addTaggedPost(note: Note) {
@@ -122,6 +127,10 @@ class User(val pubkeyHex: String) {
         }
     }
 
+    fun removeTaggedPost(note: Note) {
+        taggedPosts = taggedPosts - note
+    }
+
     fun addNote(note: Note) {
         if (note !in notes) {
             notes = notes + note
@@ -129,25 +138,49 @@ class User(val pubkeyHex: String) {
         }
     }
 
+    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()
+            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()
         }
     }
 
@@ -186,17 +219,11 @@ class User(val pubkeyHex: String) {
         val privateChatroom = getOrCreatePrivateChatroom(user)
         if (msg !in privateChatroom.roomMessages) {
             privateChatroom.roomMessages = privateChatroom.roomMessages + msg
-            liveMessages.invalidateData()
+            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))
@@ -207,7 +234,7 @@ class User(val pubkeyHex: String) {
             here.counter++
         }
 
-        liveRelayInfo.invalidateData()
+        liveSet?.relayInfo?.invalidateData()
     }
     
     fun updateFollows(newFollows: Set<User>, updateAt: Long) {
@@ -221,17 +248,33 @@ class User(val pubkeyHex: String) {
     }
 
     fun updateRelays(relayUse: Map<String, ContactListEvent.ReadWrite>) {
-        if (relays != relayUse) {
-            relays = relayUse
-            liveRelays.invalidateData()
-        }
+        // no need to test if relays are different. The Account will check for us.
+        relays = relayUse
+        liveSet?.relays?.invalidateData()
     }
 
-    fun updateUserInfo(newUserInfo: UserMetadata, updateAt: Long) {
+    fun updateUserInfo(newUserInfo: UserMetadata, latestMetadata: MetadataEvent) {
         info = newUserInfo
-        updatedMetadataAt = updateAt
+        info?.latestMetadata = latestMetadata
+        info?.updatedMetadataAt = latestMetadata.createdAt
 
-        liveMetadata.invalidateData()
+        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.
+            }
+        }
+
+        liveSet?.metadata?.invalidateData()
     }
 
     fun isFollowing(user: User): Boolean {
@@ -246,20 +289,59 @@ class User(val pubkeyHex: String) {
 
     fun hasReport(loggedIn: User, type: ReportEvent.ReportType): Boolean {
         return reports[loggedIn]?.firstOrNull() {
-              it.event is ReportEvent && (it.event as ReportEvent).reportType.contains(type)
+              it.event is ReportEvent && (it.event as ReportEvent).reportedAuthor.any { it.reportType == type }
         } != 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)
+    fun anyNameStartsWith(username: String): Boolean {
+        return info?.anyNameStartsWith(username) ?: false
+    }
+
+    var liveSet: UserLiveSet? = null
+
+    fun live(): UserLiveSet {
+        if (liveSet == null) {
+            liveSet = UserLiveSet(this)
+        }
+        return liveSet!!
+    }
+
+    fun clearLive() {
+        if (liveSet != null && liveSet?.isInUse() == false) {
+            liveSet = null
+        }
+    }
 }
 
+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
@@ -269,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
@@ -279,9 +365,12 @@ 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()
+              .any { it.startsWith(prefix, true) }
     }
 }
 
@@ -290,17 +379,19 @@ class UserLiveData(val user: User): LiveData<UserState>(UserState(user)) {
     // 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 {
-            delay(100)
-            refresh()
-            handlerWaiting.set(false)
+            try {
+                delay(100)
+                refresh()
+            } finally {
+                withContext(NonCancellable) {
+                    handlerWaiting.set(false)
+                }
+            }
         }
     }
 
@@ -310,13 +401,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/Nip05Verifier.kt

@@ -0,0 +1,93 @@
+package com.vitorpamplona.amethyst.service
+
+import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+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.trim().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) {
+      try {
+        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()
+          }
+        })
+      } catch (e: java.lang.Exception) {
+        onError("Could not resolve '${url}': ${e.message}")
+      }
+    }
+  }
+
+  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/service/NostrAccountDataSource.kt

@@ -1,8 +1,6 @@
 package com.vitorpamplona.amethyst.service
 
 import com.vitorpamplona.amethyst.model.Account
-import com.vitorpamplona.amethyst.model.LocalCache
-import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
 import com.vitorpamplona.amethyst.service.model.LnZapEvent
 import com.vitorpamplona.amethyst.service.model.ReactionEvent
@@ -15,7 +13,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 +61,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,16 +1,14 @@
 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
 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 +31,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

@@ -2,20 +2,20 @@ package com.vitorpamplona.amethyst.service
 
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.LocalCache
-import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.model.User
 import com.vitorpamplona.amethyst.service.relays.FeedType
 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 +40,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 +54,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().privateChatrooms[withUser] ?: return emptyList()
-
-    return messages.roomMessages.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

@@ -1,7 +1,6 @@
 package com.vitorpamplona.amethyst.service
 
 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
@@ -10,7 +9,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 +37,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 +47,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 +64,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 +72,6 @@ object NostrChatroomListDataSource: NostrDataSource<Note>("MailBoxFeed") {
 
   val chatroomListChannel = requestNewChannel()
 
-  // returns the last Note of each user.
-  override fun feed(): List<Note> {
-    val privateChatrooms = account.userProfile().privateChatrooms
-    val messagingWith = privateChatrooms.keys.filter { 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()
-  }
-
   override fun updateChannelFilters() {
     val list = listOf(
       createMessagesToMeFilter(),

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

@@ -1,9 +1,6 @@
 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
@@ -11,6 +8,7 @@ import com.vitorpamplona.amethyst.service.model.ChannelMetadataEvent
 import com.vitorpamplona.amethyst.service.model.ChannelMuteUserEvent
 import com.vitorpamplona.amethyst.service.model.LnZapEvent
 import com.vitorpamplona.amethyst.service.model.LnZapRequestEvent
+import com.vitorpamplona.amethyst.service.model.LongTextNoteEvent
 import com.vitorpamplona.amethyst.service.model.ReactionEvent
 import com.vitorpamplona.amethyst.service.model.ReportEvent
 import com.vitorpamplona.amethyst.service.model.RepostEvent
@@ -20,11 +18,14 @@ import com.vitorpamplona.amethyst.service.relays.Subscription
 import com.vitorpamplona.amethyst.service.relays.hasValidSignature
 import java.util.Date
 import java.util.UUID
+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
@@ -33,9 +34,8 @@ 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>()
-
   data class Counter(var counter:Int)
 
   private var eventCounter = mapOf<String, Counter>()
@@ -46,6 +46,7 @@ abstract class NostrDataSource<T>(val debugName: String) {
     }
   }
 
+
   private val clientListener = object : Client.Listener() {
     override fun onEvent(event: Event, subscriptionId: String, relay: Relay) {
       if (subscriptionId in subscriptions.keys) {
@@ -75,7 +76,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)
@@ -90,12 +91,13 @@ abstract class NostrDataSource<T>(val debugName: String) {
               ChannelMessageEvent.kind -> LocalCache.consume(ChannelMessageEvent(event.id, event.pubKey, event.createdAt, event.tags, event.content, event.sig), relay)
               ChannelHideMessageEvent.kind -> LocalCache.consume(ChannelHideMessageEvent(event.id, event.pubKey, event.createdAt, event.tags, event.content, event.sig))
               ChannelMuteUserEvent.kind -> LocalCache.consume(ChannelMuteUserEvent(event.id, event.pubKey, event.createdAt, event.tags, event.content, event.sig))
+
+              LongTextNoteEvent.kind -> LocalCache.consume(LongTextNoteEvent(event.id, event.pubKey, event.createdAt, event.tags, event.content, event.sig), relay)
             }
           }
         } catch (e: Exception) {
           e.printStackTrace()
         }
-
       }
     }
 
@@ -127,35 +129,15 @@ abstract class NostrDataSource<T>(val debugName: String) {
   }
 
   open fun start() {
+    println("DataSource: ${this.javaClass.simpleName} Start")
     resetFilters()
   }
 
   open fun stop() {
+    println("DataSource: ${this.javaClass.simpleName} 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(1000)
-
-    // 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
     }
   }
 
@@ -170,17 +152,24 @@ abstract class NostrDataSource<T>(val debugName: String) {
     subscriptions = subscriptions.minus(subscription.id)
   }
 
-  var handlerWaiting = false
-  @Synchronized
-  fun invalidateFilters() {
-    if (handlerWaiting) return
+  // Refreshes observers in batches.
+  var handlerWaiting = AtomicBoolean()
+
+  fun invalidateFilters() {
+    if (handlerWaiting.getAndSet(true)) return
+
+    println("DataSource: ${this.javaClass.simpleName} InvalidateFilters")
 
-    handlerWaiting = true
     val scope = CoroutineScope(Job() + Dispatchers.IO)
     scope.launch {
-      delay(200)
-      resetFiltersSuspend()
-      handlerWaiting = false
+      try {
+        delay(200)
+        resetFiltersSuspend()
+      } finally {
+        withContext(NonCancellable) {
+          handlerWaiting.set(false)
+        }
+      }
     }
   }
 
@@ -231,5 +220,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

@@ -1,16 +1,12 @@
 package com.vitorpamplona.amethyst.service
 
-import com.vitorpamplona.amethyst.model.Account
-import com.vitorpamplona.amethyst.model.LocalCache
-import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
 import com.vitorpamplona.amethyst.service.relays.FeedType
 import com.vitorpamplona.amethyst.service.relays.TypedFilter
 import nostr.postr.JsonFilter
 import nostr.postr.events.TextNoteEvent
 
-object NostrGlobalDataSource: NostrDataSource<Note>("GlobalFeed") {
-  lateinit var account: Account
+object NostrGlobalDataSource: NostrDataSource("GlobalFeed") {
   fun createGlobalFilter() = TypedFilter(
     types = setOf(FeedType.GLOBAL),
     filter = JsonFilter(
@@ -21,15 +17,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

@@ -1,12 +1,8 @@
 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.model.LongTextNoteEvent
 import com.vitorpamplona.amethyst.service.relays.FeedType
 import com.vitorpamplona.amethyst.service.relays.TypedFilter
 import kotlinx.coroutines.Dispatchers
@@ -14,9 +10,8 @@ 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
 
   private val cacheListener: (UserState) -> Unit = {
@@ -26,7 +21,7 @@ object NostrHomeDataSource: NostrDataSource<Note>("HomeFeed") {
   override fun start() {
     if (this::account.isInitialized) {
       GlobalScope.launch(Dispatchers.Main) {
-        account.userProfile().liveFollows.observeForever(cacheListener)
+        account.userProfile().live().follows.observeForever(cacheListener)
       }
     }
     super.start()
@@ -36,7 +31,7 @@ object NostrHomeDataSource: NostrDataSource<Note>("HomeFeed") {
     super.stop()
     if (this::account.isInitialized) {
       GlobalScope.launch(Dispatchers.Main) {
-        account.userProfile().liveFollows.removeObserver(cacheListener)
+        account.userProfile().live().follows.removeObserver(cacheListener)
       }
     }
   }
@@ -45,7 +40,7 @@ object NostrHomeDataSource: NostrDataSource<Note>("HomeFeed") {
     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))
@@ -53,7 +48,7 @@ object NostrHomeDataSource: NostrDataSource<Note>("HomeFeed") {
     return TypedFilter(
       types = setOf(FeedType.FOLLOWS),
       filter = JsonFilter(
-        kinds = listOf(TextNoteEvent.kind),
+        kinds = listOf(TextNoteEvent.kind, LongTextNoteEvent.kind),
         authors = followSet,
         limit = 400
       )
@@ -62,16 +57,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/NostrNotificationDataSource.kt

@@ -1,30 +0,0 @@
-package com.vitorpamplona.amethyst.service
-
-import com.vitorpamplona.amethyst.model.Account
-import com.vitorpamplona.amethyst.model.Note
-import com.vitorpamplona.amethyst.model.User
-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.LnZapRequestEvent
-import com.vitorpamplona.amethyst.service.model.RepostEvent
-import nostr.postr.JsonFilter
-
-object NostrNotificationDataSource: NostrDataSource<Note>("NotificationFeed") {
-  lateinit var account: Account
-
-  override fun feed(): List<Note> {
-    return account.userProfile().taggedPosts
-      .filter { it.event != null }
-      .filter { account.isAcceptable(it) }
-      .filter {
-           it.event !is ChannelCreateEvent
-        && it.event !is ChannelMetadataEvent
-        && it.event !is LnZapRequestEvent
-      }
-      .sortedBy { it.event?.createdAt }
-      .reversed()
-  }
-
-  override fun updateChannelFilters() {}
-}

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

@@ -1,17 +1,14 @@
 package com.vitorpamplona.amethyst.service
 
-import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.model.decodePublicKey
-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.bechToBytes
 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 +36,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

@@ -1,14 +1,13 @@
 package com.vitorpamplona.amethyst.service
 
 import com.vitorpamplona.amethyst.model.LocalCache
-import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.service.model.ChannelCreateEvent
 import com.vitorpamplona.amethyst.service.model.ChannelMetadataEvent
 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 +50,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

@@ -1,11 +1,11 @@
 package com.vitorpamplona.amethyst.service
 
 import com.vitorpamplona.amethyst.model.LocalCache
-import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.service.model.ChannelCreateEvent
 import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
 import com.vitorpamplona.amethyst.service.model.ChannelMetadataEvent
 import com.vitorpamplona.amethyst.service.model.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 +15,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>? {
@@ -35,7 +35,7 @@ object NostrSingleEventDataSource: NostrDataSource<Note>("SingleEventFeed") {
         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 +69,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()
@@ -87,14 +87,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

@@ -1,6 +1,5 @@
 package com.vitorpamplona.amethyst.service
 
-import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.User
 import com.vitorpamplona.amethyst.service.model.ReportEvent
 import com.vitorpamplona.amethyst.service.relays.FeedType
@@ -8,18 +7,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 +33,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 +46,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

@@ -1,118 +1,43 @@
 package com.vitorpamplona.amethyst.service
 
-import com.vitorpamplona.amethyst.model.LocalCache
-import com.vitorpamplona.amethyst.model.Note
-import com.vitorpamplona.amethyst.service.model.ReactionEvent
-import com.vitorpamplona.amethyst.service.model.RepostEvent
+import com.vitorpamplona.amethyst.model.ThreadAssembler
 import com.vitorpamplona.amethyst.service.relays.FeedType
 import com.vitorpamplona.amethyst.service.relays.TypedFilter
 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,8 +1,6 @@
 package com.vitorpamplona.amethyst.service
 
-import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.LocalCache
-import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.model.User
 import com.vitorpamplona.amethyst.service.model.LnZapEvent
 import com.vitorpamplona.amethyst.service.relays.FeedType
@@ -12,77 +10,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("p" to listOf(user!!.pubkeyHex))
+        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/lnurl/LightningAddressResolver.kt

@@ -1,4 +1,4 @@
-package com.vitorpamplona.amethyst.lnurl
+package com.vitorpamplona.amethyst.service.lnurl
 
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import java.net.URLEncoder
@@ -20,11 +20,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 +56,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 +95,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 +130,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 +151,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/service/lnurl/LnInvoiceUtil.kt

@@ -1,6 +1,5 @@
-package com.vitorpamplona.amethyst.lnurl
+package com.vitorpamplona.amethyst.service.lnurl
 
-import androidx.compose.ui.text.toLowerCase
 import java.math.BigDecimal
 import java.util.Locale
 import java.util.regex.Pattern

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

@@ -3,7 +3,6 @@ package com.vitorpamplona.amethyst.service.model
 import java.util.Date
 import nostr.postr.Utils
 import nostr.postr.events.Event
-import nostr.postr.toHex
 
 class ChannelHideMessageEvent (
   id: ByteArray,

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

@@ -3,7 +3,6 @@ package com.vitorpamplona.amethyst.service.model
 import java.util.Date
 import nostr.postr.Utils
 import nostr.postr.events.Event
-import nostr.postr.toHex
 
 class ChannelMessageEvent (
   id: ByteArray,

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

@@ -2,11 +2,9 @@ package com.vitorpamplona.amethyst.service.model
 
 import android.util.Log
 import java.util.Date
-import nostr.postr.ContactMetaData
 import nostr.postr.Utils
 import nostr.postr.events.Event
 import nostr.postr.events.MetadataEvent
-import nostr.postr.toHex
 
 class ChannelMetadataEvent (
   id: ByteArray,

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

@@ -3,8 +3,6 @@ package com.vitorpamplona.amethyst.service.model
 import java.util.Date
 import nostr.postr.Utils
 import nostr.postr.events.Event
-import nostr.postr.events.MetadataEvent
-import nostr.postr.toHex
 
 class ChannelMuteUserEvent (
   id: ByteArray,

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

@@ -1,12 +1,9 @@
 package com.vitorpamplona.amethyst.service.model
 
-import com.vitorpamplona.amethyst.lnurl.LnInvoiceUtil
+import com.vitorpamplona.amethyst.service.lnurl.LnInvoiceUtil
 import com.vitorpamplona.amethyst.service.relays.Client
 import java.math.BigDecimal
-import java.util.Date
-import nostr.postr.Utils
 import nostr.postr.events.Event
-import nostr.postr.toHex
 
 class LnZapEvent (
   id: ByteArray,

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

@@ -1,9 +1,7 @@
 package com.vitorpamplona.amethyst.service.model
 
-import com.vitorpamplona.amethyst.service.relays.Client
 import java.util.Date
 import nostr.postr.Utils
-import nostr.postr.events.ContactListEvent
 import nostr.postr.events.Event
 import nostr.postr.toHex
 

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

@@ -0,0 +1,56 @@
+package com.vitorpamplona.amethyst.service.model
+
+import java.util.Date
+import nostr.postr.Utils
+import nostr.postr.events.Event
+
+class LongTextNoteEvent(
+    id: ByteArray,
+    pubKey: ByteArray,
+    createdAt: Long,
+    tags: List<List<String>>,
+    content: String,
+    sig: ByteArray
+): Event(id, pubKey, createdAt, kind, tags, content, sig) {
+    @Transient val replyTos: List<String>
+    @Transient val mentions: List<String>
+
+    @Transient val title: String?
+    @Transient val image: String?
+    @Transient val summary: String?
+    @Transient val publishedAt: Long?
+    @Transient val topics: List<String>
+
+    init {
+        replyTos = tags.filter { it.firstOrNull() == "e" }.mapNotNull { it.getOrNull(1) }
+        mentions = tags.filter { it.firstOrNull() == "p" }.mapNotNull { it.getOrNull(1) }
+
+        topics = tags.filter { it.firstOrNull() == "t" }.mapNotNull { it.getOrNull(1) }
+        title = tags.filter { it.firstOrNull() == "title" }.mapNotNull { it.getOrNull(1) }.firstOrNull()
+        image = tags.filter { it.firstOrNull() == "image" }.mapNotNull { it.getOrNull(1) }.firstOrNull()
+        summary = tags.filter { it.firstOrNull() == "summary" }.mapNotNull { it.getOrNull(1) }.firstOrNull()
+        publishedAt = try {
+            tags.filter { it.firstOrNull() == "published_at" }.mapNotNull { it.getOrNull(1) }.firstOrNull()?.toLong()
+        } catch (_: Exception) {
+            null
+        }
+    }
+
+    companion object {
+        const val kind = 30023
+
+        fun create(msg: String, replyTos: List<String>?, mentions: List<String>?, privateKey: ByteArray, createdAt: Long = Date().time / 1000): LongTextNoteEvent {
+            val pubKey = Utils.pubkeyCreate(privateKey)
+            val tags = mutableListOf<List<String>>()
+            replyTos?.forEach {
+                tags.add(listOf("e", it))
+            }
+            mentions?.forEach {
+                tags.add(listOf("p", it))
+            }
+            val id = generateId(pubKey, createdAt, kind, tags, msg)
+            val sig = Utils.sign(id, privateKey)
+            return LongTextNoteEvent(id, pubKey, createdAt, tags, msg, sig)
+        }
+    }
+}

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

@@ -1,11 +1,12 @@
 package com.vitorpamplona.amethyst.service.model
 
-import androidx.compose.ui.text.toUpperCase
 import java.util.Date
 import nostr.postr.Utils
 import nostr.postr.events.Event
 import nostr.postr.toHex
 
+data class ReportedKey(val key: String, val reportType: ReportEvent.ReportType)
+
 // NIP 56 event.
 class ReportEvent (
   id: ByteArray,
@@ -16,14 +17,37 @@ class ReportEvent (
   sig: ByteArray
 ): Event(id, pubKey, createdAt, kind, tags, content, sig) {
 
-  @Transient val reportType: List<ReportType>
-  @Transient val reportedPost: List<String>
-  @Transient val reportedAuthor: List<String>
+  @Transient val reportedPost: List<ReportedKey>
+  @Transient val reportedAuthor: List<ReportedKey>
 
   init {
-    reportType = tags.filter { it.firstOrNull() == "report" }.mapNotNull { it.getOrNull(1) }.map { ReportType.valueOf(it.toUpperCase()) }
-    reportedPost = tags.filter { it.firstOrNull() == "e" }.mapNotNull { it.getOrNull(1) }
-    reportedAuthor = tags.filter { it.firstOrNull() == "p" }.mapNotNull { it.getOrNull(1) }
+    // Works with old and new structures for report.
+
+    var reportType = tags.filter { it.firstOrNull() == "report" }.mapNotNull { it.getOrNull(1) }.map { ReportType.valueOf(it.toUpperCase()) }.firstOrNull()
+    if (reportType == null) {
+      reportType = tags.mapNotNull { it.getOrNull(2) }.map { ReportType.valueOf(it.toUpperCase()) }.firstOrNull()
+    }
+    if (reportType == null) {
+      reportType = ReportType.SPAM
+    }
+
+    reportedPost = tags
+      .filter { it.firstOrNull() == "e" && it.getOrNull(1) != null }
+      .map {
+        ReportedKey(
+          it[1],
+          it.getOrNull(2)?.toUpperCase()?.let { it1 -> ReportType.valueOf(it1) }?: reportType
+        )
+      }
+
+    reportedAuthor = tags
+      .filter { it.firstOrNull() == "p" && it.getOrNull(1) != null }
+      .map {
+        ReportedKey(
+          it[1],
+        it.getOrNull(2)?.toUpperCase()?.let { it1 -> ReportType.valueOf(it1) }?: reportType
+        )
+      }
   }
 
   companion object {
@@ -32,12 +56,11 @@ class ReportEvent (
     fun create(reportedPost: Event, type: ReportType, privateKey: ByteArray, createdAt: Long = Date().time / 1000): ReportEvent {
       val content = ""
 
-      val reportTypeTag = listOf("report", type.name.toLowerCase())
-      val reportPostTag = listOf("e", reportedPost.id.toHex())
-      val reportAuthorTag = listOf("p", reportedPost.pubKey.toHex())
+      val reportPostTag = listOf("e", reportedPost.id.toHex(), type.name.toLowerCase())
+      val reportAuthorTag = listOf("p", reportedPost.pubKey.toHex(), type.name.toLowerCase())
 
       val pubKey = Utils.pubkeyCreate(privateKey)
-      val tags:List<List<String>> = listOf(reportTypeTag, reportPostTag, reportAuthorTag)
+      val tags:List<List<String>> = listOf(reportPostTag, reportAuthorTag)
       val id = generateId(pubKey, createdAt, kind, tags, content)
       val sig = Utils.sign(id, privateKey)
       return ReportEvent(id, pubKey, createdAt, tags, content, sig)
@@ -46,11 +69,10 @@ class ReportEvent (
     fun create(reportedUser: String, type: ReportType, privateKey: ByteArray, createdAt: Long = Date().time / 1000): ReportEvent {
       val content = ""
 
-      val reportTypeTag = listOf("report", type.name.toLowerCase())
-      val reportAuthorTag = listOf("p", reportedUser)
+      val reportAuthorTag = listOf("p", reportedUser, type.name.toLowerCase())
 
       val pubKey = Utils.pubkeyCreate(privateKey)
-      val tags:List<List<String>> = listOf(reportTypeTag, reportAuthorTag)
+      val tags:List<List<String>> = listOf(reportAuthorTag)
       val id = generateId(pubKey, createdAt, kind, tags, content)
       val sig = Utils.sign(id, privateKey)
       return ReportEvent(id, pubKey, createdAt, tags, content, sig)
@@ -58,9 +80,11 @@ class ReportEvent (
   }
 
   enum class ReportType() {
-    EXPLICIT,
+    EXPLICIT, // Not used anymore.
     ILLEGAL,
     SPAM,
-    IMPERSONATION
+    IMPERSONATION,
+    NUDITY,
+    PROFANITY,
   }
 }

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

@@ -1,6 +1,7 @@
 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
@@ -25,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()
@@ -32,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()
@@ -54,6 +70,7 @@ object Client: RelayPool.Listener {
 
     fun close(subscriptionId: String) {
         RelayPool.close(subscriptionId)
+        subscriptions = subscriptions.minus(subscriptionId)
     }
 
     fun disconnect() {
@@ -65,7 +82,7 @@ object Client: RelayPool.Listener {
     override fun onEvent(event: Event, subscriptionId: String, relay: 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 {
+        GlobalScope.launch(Dispatchers.Default) {
             listeners.forEach { it.onEvent(event, subscriptionId, relay) }
         }
     }
@@ -73,7 +90,7 @@ object Client: RelayPool.Listener {
     override fun onError(error: Error, subscriptionId: String, relay: 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 {
+        GlobalScope.launch(Dispatchers.Default) {
             listeners.forEach { it.onError(error, subscriptionId, relay) }
         }
     }
@@ -81,7 +98,7 @@ object Client: RelayPool.Listener {
     override fun onRelayStateChange(type: Relay.Type, relay: Relay, channel: String?) {
         // Releases the Web thread for the new payload.
         // May need to add a processing queue if processing new events become too costly.
-        GlobalScope.launch {
+        GlobalScope.launch(Dispatchers.Default) {
             listeners.forEach { it.onRelayStateChange(type, relay, channel) }
         }
     }
@@ -89,7 +106,7 @@ object Client: RelayPool.Listener {
     override fun onSendResponse(eventId: String, success: Boolean, message: String, relay: 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 {
+        GlobalScope.launch(Dispatchers.Default) {
             listeners.forEach { it.onSendResponse(eventId, success, message, relay) }
         }
     }

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

@@ -3,7 +3,6 @@ package com.vitorpamplona.amethyst.service.relays
 import android.util.Log
 import com.google.gson.JsonElement
 import java.util.Date
-import java.util.concurrent.TimeUnit
 import nostr.postr.events.Event
 import okhttp3.OkHttpClient
 import okhttp3.Request
@@ -31,6 +30,7 @@ class Relay(
     private var isReady: Boolean = false
 
     var eventDownloadCounter = 0
+    var spamCounter = 0
     var eventUploadCounter = 0
     var errorCounter = 0
     var ping: Long? = null
@@ -54,7 +54,7 @@ class Relay(
         if (socket != null) return
 
         try {
-            val request = Request.Builder().url(url.trim()).build()
+            val request = Request.Builder().header("Origin", "amethyst.social").url(url.trim()).build()
             val listener = object : WebSocketListener() {
 
                 override fun onOpen(webSocket: WebSocket, response: Response) {
@@ -88,7 +88,7 @@ class Relay(
                             "NOTICE" -> listeners.forEach {
                                 //Log.w("Relay", "Relay onNotice $url, $channel")
                                 // "channel" being the second string in the string array ...
-                                it.onError(this@Relay, channel, Error("Relay sent notice: $channel"))
+                                it.onError(this@Relay, channel, Error("Relay sent notice: " + channel))
                             }
                             "OK" -> listeners.forEach {
                                 //Log.w("Relay", "Relay onOK $url, $channel")
@@ -204,6 +204,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/service/relays/RelayPool.kt

@@ -94,7 +94,6 @@ object RelayPool: Relay.Listener {
         fun onSendResponse(eventId: String, success: Boolean, message: String, relay: Relay)
     }
 
-    @Synchronized
     override fun onEvent(relay: Relay, subscriptionId: String, event: Event) {
         listeners.forEach { it.onEvent(event, subscriptionId, relay) }
     }

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

@@ -1,6 +1,5 @@
 package com.vitorpamplona.amethyst.service.relays
 
-import com.google.gson.Gson
 import com.google.gson.GsonBuilder
 import com.google.gson.JsonArray
 import com.google.gson.JsonObject

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,22 +14,14 @@ import coil.ImageLoader
 import coil.decode.GifDecoder
 import coil.decode.ImageDecoderDecoder
 import coil.decode.SvgDecoder
-import coil.disk.DiskCache
-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.Locale
 
 class MainActivity : ComponentActivity() {
   override fun onCreate(savedInstanceState: Bundle?) {
@@ -51,7 +42,7 @@ class MainActivity : ComponentActivity() {
           add(GifDecoder.Factory())
         }
         add(SvgDecoder.Factory())
-      }
+      } //.logger(DebugLogger())
         .respectCacheHeaders(false)
         .build()
     }
@@ -61,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)
         }
       }
     }
@@ -75,7 +66,8 @@ class MainActivity : ComponentActivity() {
 
   override fun onResume() {
     super.onResume()
-
+    
+    // Only starts after login
     ServiceManager.start()
   }
 
@@ -84,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/ImageSaver.kt

@@ -9,11 +9,12 @@ import android.os.Environment
 import android.provider.MediaStore
 import androidx.annotation.RequiresApi
 import androidx.core.net.toUri
+import java.io.File
+import com.vitorpamplona.amethyst.R
 import okhttp3.*
 import okio.BufferedSource
 import okio.IOException
 import okio.sink
-import java.io.File
 
 
 object ImageSaver {
@@ -49,7 +50,7 @@ object ImageSaver {
                     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
                         val contentType = response.header("Content-Type")
                         checkNotNull(contentType) {
-                            "Can't find out the content type"
+                            context.getString(R.string.can_t_find_out_the_content_type)
                         }
 
                         saveContentQ(
@@ -57,6 +58,7 @@ object ImageSaver {
                             contentType = contentType,
                             contentSource = response.body.source(),
                             contentResolver = context.contentResolver,
+                            context = context
                         )
                     } else {
                         saveContentDefault(
@@ -80,6 +82,7 @@ object ImageSaver {
         contentType: String,
         contentSource: BufferedSource,
         contentResolver: ContentResolver,
+        context: Context
     ) {
         val contentValues = ContentValues().apply {
             put(MediaStore.MediaColumns.DISPLAY_NAME, displayName)
@@ -93,13 +96,13 @@ object ImageSaver {
         val uri =
             contentResolver.insert(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, contentValues)
         checkNotNull(uri) {
-            "Can't insert the new content"
+            context.getString(R.string.can_t_insert_the_new_content)
         }
 
         try {
             val outputStream = contentResolver.openOutputStream(uri)
             checkNotNull(outputStream) {
-                "Can't open the content output stream"
+                context.getString(R.string.can_t_open_the_content_output_stream)
             }
 
             outputStream.use {

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

@@ -1,14 +1,23 @@
 package com.vitorpamplona.amethyst.ui.actions
 
 import android.content.ContentResolver
+import android.content.Context
 import android.net.Uri
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
-import okhttp3.*
+import java.io.IOException
+import java.util.UUID
+import okhttp3.Call
+import okhttp3.Callback
+import okhttp3.MediaType
+import com.vitorpamplona.amethyst.R
 import okhttp3.MediaType.Companion.toMediaType
+import okhttp3.MultipartBody
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import okhttp3.RequestBody
+import okhttp3.Response
 import okio.BufferedSink
 import okio.source
-import java.io.IOException
-import java.util.*
 
 object ImageUploader {
   fun uploadImage(
@@ -16,6 +25,7 @@ object ImageUploader {
     contentResolver: ContentResolver,
     onSuccess: (String) -> Unit,
     onError: (Throwable) -> Unit,
+    context : Context
 ) {
     val contentType = contentResolver.getType(uri)
 
@@ -33,7 +43,7 @@ object ImageUploader {
           override fun writeTo(sink: BufferedSink) {
             val imageInputStream = contentResolver.openInputStream(uri)
             checkNotNull(imageInputStream) {
-              "Can't open the image input stream"
+              context.getString(R.string.can_t_open_the_image_input_stream)
             }
 
             imageInputStream.source().use(sink::writeAll)
@@ -56,7 +66,7 @@ object ImageUploader {
             val tree = jacksonObjectMapper().readTree(body.string())
             val url = tree?.get("data")?.get("link")?.asText()
             checkNotNull(url) {
-              "There must be an uploaded image URL in the response"
+              context.getString(R.string.there_must_be_an_uploaded_image_url_in_the_response)
             }
 
             onSuccess(url)

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

@@ -17,18 +17,17 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.input.KeyboardCapitalization
 import androidx.compose.ui.text.style.TextDirection
 import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
 import androidx.compose.ui.window.Dialog
 import androidx.compose.ui.window.DialogProperties
 import androidx.lifecycle.viewmodel.compose.viewModel
+import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.Channel
-import com.vitorpamplona.amethyst.ui.screen.AccountStateViewModel
-import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 
 @Composable
 fun NewChannelView(onClose: () -> Unit, account: Account, channel: Channel? = null) {
@@ -71,13 +70,13 @@ fun NewChannelView(onClose: () -> Unit, account: Account, channel: Channel? = nu
                 Spacer(modifier = Modifier.height(15.dp))
 
                 OutlinedTextField(
-                    label = { Text(text = "Channel Name") },
+                    label = { Text(text = stringResource(R.string.channel_name)) },
                     modifier = Modifier.fillMaxWidth(),
                     value = postViewModel.channelName.value,
                     onValueChange = { postViewModel.channelName.value = it },
                     placeholder = {
                         Text(
-                            text = "My Awesome Group",
+                            text = stringResource(R.string.my_awesome_group),
                             color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
                         )
                     },
@@ -90,7 +89,7 @@ fun NewChannelView(onClose: () -> Unit, account: Account, channel: Channel? = nu
                 Spacer(modifier = Modifier.height(15.dp))
 
                 OutlinedTextField(
-                    label = { Text(text = "Picture Url") },
+                    label = { Text(text = stringResource(R.string.picture_url)) },
                     modifier = Modifier.fillMaxWidth(),
                     value = postViewModel.channelPicture.value,
                     onValueChange = { postViewModel.channelPicture.value = it },
@@ -105,13 +104,13 @@ fun NewChannelView(onClose: () -> Unit, account: Account, channel: Channel? = nu
                 Spacer(modifier = Modifier.height(15.dp))
 
                 OutlinedTextField(
-                    label = { Text(text = "Description") },
+                    label = { Text(text = stringResource(R.string.description)) },
                     modifier = Modifier.fillMaxWidth().height(100.dp),
                     value = postViewModel.channelDescription.value,
                     onValueChange = { postViewModel.channelDescription.value = it },
                     placeholder = {
                         Text(
-                            text = "About us.. ",
+                            text = stringResource(R.string.about_us),
                             color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
                         )
                     },

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

@@ -4,12 +4,8 @@ import android.content.Context
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.ui.text.input.TextFieldValue
 import androidx.lifecycle.ViewModel
-import com.vitorpamplona.amethyst.LocalPreferences
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.Channel
-import com.vitorpamplona.amethyst.ui.screen.AccountStateViewModel
-import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
-import nostr.postr.toHex
 
 class NewChannelViewModel: ViewModel() {
     private var account: Account? = null
@@ -38,8 +34,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

@@ -25,6 +25,7 @@ import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalSoftwareKeyboardController
 import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.input.KeyboardCapitalization
 import androidx.compose.ui.text.style.TextDirection
 import androidx.compose.ui.unit.dp
@@ -38,18 +39,16 @@ import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.ui.components.*
 import com.vitorpamplona.amethyst.ui.navigation.UploadFromGallery
 import com.vitorpamplona.amethyst.ui.note.ReplyInformation
-import com.vitorpamplona.amethyst.ui.screen.UserLine
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.UserLine
 import kotlinx.coroutines.delay
 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
@@ -59,6 +58,7 @@ fun NewPostView(onClose: () -> Unit, baseReplyTo: Note? = null, account: Account
     val scroolState = rememberScrollState()
 
     LaunchedEffect(Unit) {
+        postViewModel.load(account, baseReplyTo, quote)
         delay(100)
         focusRequester.requestFocus()
 
@@ -109,7 +109,7 @@ fun NewPostView(onClose: () -> Unit, baseReplyTo: Note? = null, account: Account
                     ) {
                         Column(modifier = Modifier.fillMaxWidth().verticalScroll(scroolState)) {
                             if (postViewModel.replyTos != null && baseReplyTo?.event is TextNoteEvent) {
-                                ReplyInformation(postViewModel.replyTos, postViewModel.mentions, "✖ ") {
+                                ReplyInformation(postViewModel.replyTos, postViewModel.mentions, account, "✖ ") {
                                     postViewModel.removeFromReplyList(it)
                                 }
                             }
@@ -137,7 +137,7 @@ fun NewPostView(onClose: () -> Unit, baseReplyTo: Note? = null, account: Account
                                     },
                                 placeholder = {
                                     Text(
-                                        text = "What's on your mind?",
+                                        text = stringResource(R.string.what_s_on_your_mind),
                                         color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
                                     )
                                 },
@@ -222,7 +222,7 @@ fun CloseButton(onCancel: () -> Unit) {
                 backgroundColor = Color.Gray
             )
     ) {
-        Text(text = "Cancel", color = Color.White)
+        Text(text = stringResource(R.string.cancel), color = Color.White)
     }
 }
 
@@ -241,7 +241,26 @@ fun PostButton(onPost: () -> Unit = {}, isActive: Boolean, modifier: Modifier =
                 backgroundColor = if (isActive) MaterialTheme.colors.primary else Color.Gray
             )
     ) {
-        Text(text = "Post", color = Color.White)
+        Text(text = stringResource(R.string.post), color = Color.White)
+    }
+}
+
+@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 = stringResource(R.string.save), color = Color.White)
     }
 }
 
@@ -260,7 +279,7 @@ fun CreateButton(onPost: () -> Unit = {}, isActive: Boolean, modifier: Modifier
                 backgroundColor = if (isActive) MaterialTheme.colors.primary else Color.Gray
             )
     ) {
-        Text(text = "Create", color = Color.White)
+        Text(text = stringResource(R.string.create), color = Color.White)
     }
 }
 

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

@@ -9,12 +9,16 @@ import androidx.compose.ui.text.TextRange
 import androidx.compose.ui.text.input.TextFieldValue
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.vitorpamplona.amethyst.model.*
+import com.vitorpamplona.amethyst.model.Account
+import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.model.User
+import com.vitorpamplona.amethyst.model.parseDirtyWordForKey
+import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.ui.components.isValidURL
 import com.vitorpamplona.amethyst.ui.components.noProtocolUrlValidator
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.launch
-import nostr.postr.toNpub
 
 class NewPostViewModel: ViewModel() {
     private var account: Account? = null
@@ -31,7 +35,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 +49,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 +117,7 @@ class NewPostViewModel: ViewModel() {
         message = TextFieldValue("")
         urlPreview = null
         isUploadingImage = false
+        mentions = null
     }
 
     fun upload(it: Uri, context: Context) {
@@ -118,9 +134,10 @@ class NewPostViewModel: ViewModel() {
             onError = {
                 isUploadingImage = false
                 viewModelScope.launch {
-                    imageUploadingError.emit("Failed to upload the image")
+                    imageUploadingError.emit(context.getString(R.string.failed_to_upload_the_image))
                 }
-            }
+            },
+            context = context
         )
     }
 
@@ -128,6 +145,7 @@ class NewPostViewModel: ViewModel() {
         message = TextFieldValue("")
         urlPreview = null
         isUploadingImage = false
+        mentions = null
     }
 
     fun findUrlInMessage(): String? {
@@ -161,7 +179,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
@@ -40,6 +41,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
@@ -140,7 +142,7 @@ fun ServerConfigHeader() {
             Column(Modifier.weight(1f)) {
                 Row(verticalAlignment = Alignment.CenterVertically) {
                     Text(
-                        text = "Relay Address",
+                        text = stringResource(R.string.relay_address),
                         modifier = Modifier.weight(1f),
                         maxLines = 1,
                         overflow = TextOverflow.Ellipsis
@@ -148,12 +150,12 @@ fun ServerConfigHeader() {
                 }
             }
 
-            Column(Modifier.weight(1f)) {
+            Column(Modifier.weight(1.4f)) {
                 Row(verticalAlignment = Alignment.CenterVertically) {
                     Spacer(modifier = Modifier.size(25.dp))
 
                     Text(
-                        text = "Posts",
+                        text = stringResource(R.string.posts),
                         maxLines = 1,
                         fontSize = 14.sp,
                         modifier = Modifier.weight(1f),
@@ -163,7 +165,7 @@ fun ServerConfigHeader() {
                     Spacer(modifier = Modifier.size(10.dp))
 
                     Text(
-                        text = "Posts",
+                        text = stringResource(id = R.string.posts),
                         maxLines = 1,
                         fontSize = 14.sp,
                         modifier = Modifier.weight(1f),
@@ -173,7 +175,7 @@ fun ServerConfigHeader() {
                     Spacer(modifier = Modifier.size(10.dp))
 
                     Text(
-                        text = "Errors",
+                        text = stringResource(R.string.errors),
                         maxLines = 1,
                         fontSize = 14.sp,
                         modifier = Modifier.weight(1f),
@@ -181,6 +183,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))
                 }
             }
         }
@@ -216,7 +228,9 @@ fun ServerConfig(
                     Icon(
                         imageVector = Icons.Default.Cancel,
                         null,
-                        modifier = Modifier.padding(end = 5.dp).size(15.dp),
+                        modifier = Modifier
+                            .padding(end = 5.dp)
+                            .size(15.dp),
                         tint = Color.Red
                     )
                 }
@@ -241,8 +255,10 @@ fun ServerConfig(
                             ) {
                                 Icon(
                                     painterResource(R.drawable.ic_home),
-                                    "Home Feed",
-                                    modifier = Modifier.padding(end = 5.dp).size(15.dp),
+                                    stringResource(R.string.home_feed),
+                                    modifier = Modifier
+                                        .padding(end = 5.dp)
+                                        .size(15.dp),
                                     tint = if (item.feedTypes.contains(FeedType.FOLLOWS)) Color.Green else MaterialTheme.colors.onSurface.copy(
                                         alpha = 0.32f
                                     )
@@ -254,8 +270,10 @@ fun ServerConfig(
                             ) {
                                 Icon(
                                     painterResource(R.drawable.ic_dm),
-                                    "Private Message Feed",
-                                    modifier = Modifier.padding(horizontal = 5.dp).size(15.dp),
+                                    stringResource(R.string.private_message_feed),
+                                    modifier = Modifier
+                                        .padding(horizontal = 5.dp)
+                                        .size(15.dp),
                                     tint = if (item.feedTypes.contains(FeedType.PRIVATE_DMS)) Color.Green else MaterialTheme.colors.onSurface.copy(
                                         alpha = 0.32f
                                     )
@@ -267,8 +285,10 @@ fun ServerConfig(
                             ) {
                                 Icon(
                                     imageVector = Icons.Default.Groups,
-                                    "Public Chat Feed",
-                                    modifier = Modifier.padding(horizontal = 5.dp).size(15.dp),
+                                    stringResource(R.string.public_chat_feed),
+                                    modifier = Modifier
+                                        .padding(horizontal = 5.dp)
+                                        .size(15.dp),
                                     tint = if (item.feedTypes.contains(FeedType.PUBLIC_CHATS)) Color.Green else MaterialTheme.colors.onSurface.copy(
                                         alpha = 0.32f
                                     )
@@ -280,8 +300,10 @@ fun ServerConfig(
                             ) {
                                 Icon(
                                     imageVector = Icons.Default.Public,
-                                    "Global Feed",
-                                    modifier = Modifier.padding(horizontal = 5.dp).size(15.dp),
+                                    stringResource(R.string.global_feed),
+                                    modifier = Modifier
+                                        .padding(horizontal = 5.dp)
+                                        .size(15.dp),
                                     tint = if (item.feedTypes.contains(FeedType.GLOBAL)) Color.Green else MaterialTheme.colors.onSurface.copy(
                                         alpha = 0.32f
                                     )
@@ -290,7 +312,7 @@ fun ServerConfig(
                         }
                     }
 
-                    Column(Modifier.weight(1f)) {
+                    Column(Modifier.weight(1.4f)) {
                         Row(verticalAlignment = Alignment.CenterVertically) {
                             IconButton(
                                 modifier = Modifier.size(30.dp),
@@ -299,7 +321,9 @@ fun ServerConfig(
                                 Icon(
                                     imageVector = Icons.Default.Download,
                                     null,
-                                    modifier = Modifier.padding(horizontal = 5.dp).size(15.dp),
+                                    modifier = Modifier
+                                        .padding(horizontal = 5.dp)
+                                        .size(15.dp),
                                     tint = if (item.read) Color.Green else MaterialTheme.colors.onSurface.copy(
                                         alpha = 0.32f
                                     )
@@ -321,7 +345,9 @@ fun ServerConfig(
                                 Icon(
                                     imageVector = Icons.Default.Upload,
                                     null,
-                                    modifier = Modifier.padding(horizontal = 5.dp).size(15.dp),
+                                    modifier = Modifier
+                                        .padding(horizontal = 5.dp)
+                                        .size(15.dp),
                                     tint = if (item.write) Color.Green else MaterialTheme.colors.onSurface.copy(
                                         alpha = 0.32f
                                     )
@@ -339,7 +365,9 @@ fun ServerConfig(
                             Icon(
                                 imageVector = Icons.Default.SyncProblem,
                                 null,
-                                modifier = Modifier.padding(horizontal = 5.dp).size(15.dp),
+                                modifier = Modifier
+                                    .padding(horizontal = 5.dp)
+                                    .size(15.dp),
                                 tint = if (item.errorCount > 0) Color.Yellow else Color.Green
                             )
 
@@ -350,6 +378,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),
+                            )
                         }
                     }
                 }
@@ -370,7 +413,7 @@ fun EditableServerConfig(relayToAdd: String, onNewRelay: (RelaySetupInfo) -> Uni
 
     Row(verticalAlignment = Alignment.CenterVertically) {
         OutlinedTextField(
-            label = { Text(text = "Add a Relay") },
+            label = { Text(text = stringResource(R.string.add_a_relay)) },
             modifier =  Modifier.weight(1f),
             value = url,
             onValueChange = { url = it },
@@ -423,7 +466,7 @@ fun EditableServerConfig(relayToAdd: String, onNewRelay: (RelaySetupInfo) -> Uni
                     backgroundColor = if (url.isNotBlank()) MaterialTheme.colors.primary else MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
                 )
         ) {
-            Text(text = "Add", color = Color.White)
+            Text(text = stringResource(id = R.string.add), color = Color.White)
         }
 
     }

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

@@ -2,7 +2,6 @@ package com.vitorpamplona.amethyst.ui.actions
 
 import android.content.Context
 import androidx.lifecycle.ViewModel
-import com.vitorpamplona.amethyst.LocalPreferences
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.RelaySetupInfo
 import com.vitorpamplona.amethyst.service.relays.FeedType
@@ -25,7 +24,6 @@ class NewRelayListViewModel: ViewModel() {
     fun create(ctx: Context) {
         relays.let {
             account.saveRelayList(it.value)
-            LocalPreferences(ctx).saveToEncryptedStorage(account)
         }
 
         clear(ctx)
@@ -43,8 +41,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 +52,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/NewUserMetadataView.kt

@@ -17,15 +17,14 @@ import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.input.KeyboardCapitalization
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.Dialog
 import androidx.compose.ui.window.DialogProperties
 import androidx.lifecycle.viewmodel.compose.viewModel
+import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.model.Account
-import com.vitorpamplona.amethyst.model.Channel
-import com.vitorpamplona.amethyst.ui.screen.AccountStateViewModel
-import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 
 @OptIn(ExperimentalComposeUiApi::class)
 @Composable
@@ -64,7 +63,7 @@ fun NewUserMetadataView(onClose: () -> Unit, account: Account) {
                             postViewModel.create()
                             onClose()
                         },
-                        postViewModel.userName.value.isNotBlank()
+                        true
                     )
                 }
 
@@ -72,13 +71,13 @@ fun NewUserMetadataView(onClose: () -> Unit, account: Account) {
 
                 Row(modifier = Modifier.fillMaxWidth(1f), verticalAlignment = Alignment.CenterVertically) {
                     OutlinedTextField(
-                        label = { Text(text = "Display Name") },
+                        label = { Text(text = stringResource(R.string.display_name)) },
                         modifier =  Modifier.weight(1f),
                         value = postViewModel.displayName.value,
                         onValueChange = { postViewModel.displayName.value = it },
                         placeholder = {
                             Text(
-                                text = "My display name",
+                                text = stringResource(R.string.my_display_name),
                                 color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
                             )
                         },
@@ -91,13 +90,13 @@ fun NewUserMetadataView(onClose: () -> Unit, account: Account) {
                     Text("@", Modifier.padding(5.dp))
 
                     OutlinedTextField(
-                        label = { Text(text = "Username") },
+                        label = { Text(text = stringResource(R.string.username)) },
                         modifier = Modifier.weight(1f),
                         value = postViewModel.userName.value,
                         onValueChange = { postViewModel.userName.value = it },
                         placeholder = {
                             Text(
-                                text = "My username",
+                                text = stringResource(R.string.my_username),
                                 color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
                             )
                         },
@@ -108,7 +107,7 @@ fun NewUserMetadataView(onClose: () -> Unit, account: Account) {
                 Spacer(modifier = Modifier.height(10.dp))
 
                 OutlinedTextField(
-                    label = { Text(text = "About me") },
+                    label = { Text(text = stringResource(R.string.about_me)) },
                     modifier = Modifier
                         .fillMaxWidth()
                         .height(100.dp),
@@ -116,7 +115,7 @@ fun NewUserMetadataView(onClose: () -> Unit, account: Account) {
                     onValueChange = { postViewModel.about.value = it },
                     placeholder = {
                         Text(
-                            text = "About me",
+                            text = stringResource(id = R.string.about_me),
                             color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
                         )
                     },
@@ -129,7 +128,7 @@ fun NewUserMetadataView(onClose: () -> Unit, account: Account) {
                 Spacer(modifier = Modifier.height(10.dp))
 
                 OutlinedTextField(
-                    label = { Text(text = "Avatar URL") },
+                    label = { Text(text = stringResource(R.string.avatar_url)) },
                     modifier = Modifier.fillMaxWidth(),
                     value = postViewModel.picture.value,
                     onValueChange = { postViewModel.picture.value = it },
@@ -145,7 +144,7 @@ fun NewUserMetadataView(onClose: () -> Unit, account: Account) {
                 Spacer(modifier = Modifier.height(10.dp))
 
                 OutlinedTextField(
-                    label = { Text(text = "Banner URL") },
+                    label = { Text(text = stringResource(R.string.banner_url)) },
                     modifier = Modifier.fillMaxWidth(),
                     value = postViewModel.banner.value,
                     onValueChange = { postViewModel.banner.value = it },
@@ -161,7 +160,7 @@ fun NewUserMetadataView(onClose: () -> Unit, account: Account) {
                 Spacer(modifier = Modifier.height(10.dp))
 
                 OutlinedTextField(
-                    label = { Text(text = "Website URL") },
+                    label = { Text(text = stringResource(R.string.website_url)) },
                     modifier = Modifier.fillMaxWidth(),
                     value = postViewModel.website.value,
                     onValueChange = { postViewModel.website.value = it },
@@ -177,7 +176,7 @@ fun NewUserMetadataView(onClose: () -> Unit, account: Account) {
                 Spacer(modifier = Modifier.height(10.dp))
 
                 OutlinedTextField(
-                    label = { Text(text = "NIP-05") },
+                    label = { Text(text = stringResource(R.string.nip_05)) },
                     modifier = Modifier.fillMaxWidth(),
                     value = postViewModel.nip05.value,
                     onValueChange = { postViewModel.nip05.value = it },
@@ -192,7 +191,7 @@ fun NewUserMetadataView(onClose: () -> Unit, account: Account) {
 
                 Spacer(modifier = Modifier.height(10.dp))
                 OutlinedTextField(
-                    label = { Text(text = "LN Address") },
+                    label = { Text(text = stringResource(R.string.ln_address)) },
                     modifier = Modifier.fillMaxWidth(),
                     value = postViewModel.lnAddress.value,
                     onValueChange = { postViewModel.lnAddress.value = it },
@@ -208,13 +207,13 @@ fun NewUserMetadataView(onClose: () -> Unit, account: Account) {
                 Spacer(modifier = Modifier.height(10.dp))
 
                 OutlinedTextField(
-                    label = { Text(text = "LN URL (outdated)") },
+                    label = { Text(text = stringResource(R.string.ln_url_outdated)) },
                     modifier = Modifier.fillMaxWidth(),
                     value = postViewModel.lnURL.value,
                     onValueChange = { postViewModel.lnURL.value = it },
                     placeholder = {
                         Text(
-                            text = "LNURL...",
+                            text = stringResource(R.string.lnurl),
                             color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
                         )
                     },

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/actions/SaveToGallery.kt

@@ -11,10 +11,12 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import com.google.accompanist.permissions.ExperimentalPermissionsApi
 import com.google.accompanist.permissions.isGranted
 import com.google.accompanist.permissions.rememberPermissionState
+import com.vitorpamplona.amethyst.R
 import kotlinx.coroutines.launch
 
 /**
@@ -29,6 +31,7 @@ fun SaveToGallery(url: String) {
     val localContext = LocalContext.current
     val scope = rememberCoroutineScope()
 
+
     fun saveImage() {
         ImageSaver.saveImage(
             context = localContext,
@@ -37,7 +40,7 @@ fun SaveToGallery(url: String) {
                 scope.launch {
                     Toast.makeText(
                         localContext,
-                        "Image saved to the gallery",
+                        localContext.getString(R.string.image_saved_to_the_gallery),
                         Toast.LENGTH_SHORT
                     )
                         .show()
@@ -47,7 +50,7 @@ fun SaveToGallery(url: String) {
                 scope.launch {
                     Toast.makeText(
                         localContext,
-                        "Failed to save the image",
+                        localContext.getString(R.string.failed_to_save_the_image),
                         Toast.LENGTH_SHORT
                     )
                         .show()
@@ -78,6 +81,6 @@ fun SaveToGallery(url: String) {
                 backgroundColor = Color.Gray
             )
     ) {
-        Text(text = "Save", color = Color.White)
+        Text(text = stringResource(id = R.string.save), color = Color.White)
     }
 }

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

@@ -12,10 +12,12 @@ import androidx.compose.material.Text
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import com.google.accompanist.permissions.ExperimentalPermissionsApi
 import com.google.accompanist.permissions.isGranted
 import com.google.accompanist.permissions.rememberPermissionState
+import com.vitorpamplona.amethyst.R
 
 @OptIn(ExperimentalPermissionsApi::class)
 @Composable
@@ -54,9 +56,9 @@ fun UploadFromGallery(
                     }
                 ) {
                     if (!isUploading) {
-                        Text("Upload Image")
+                        Text(stringResource(R.string.upload_image))
                     } else {
-                        Text("Uploading…")
+                        Text(stringResource(R.string.uploading))
                     }
                 }
             }
@@ -68,9 +70,9 @@ fun UploadFromGallery(
                 enabled = !isUploading,
             ) {
                 if (!isUploading) {
-                    Text("Upload Image")
+                    Text(stringResource(R.string.upload_image))
                 } else {
-                    Text("Uploading…")
+                    Text(stringResource(R.string.uploading))
                 }
             }
         }

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

@@ -9,8 +9,6 @@ import androidx.compose.material.MaterialTheme
 import androidx.compose.material.OutlinedButton
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.Add
-import androidx.compose.material.icons.outlined.Visibility
-import androidx.compose.material.icons.outlined.VisibilityOff
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
@@ -18,14 +16,11 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.ui.actions.NewChannelView
-import com.vitorpamplona.amethyst.ui.actions.NewPostView
-import com.vitorpamplona.amethyst.ui.screen.AccountStateViewModel
-import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 
 @Composable
 fun NewChannelButton(account: Account) {
@@ -45,7 +40,7 @@ fun NewChannelButton(account: Account) {
     ) {
         Icon(
             imageVector = Icons.Outlined.Add,
-            contentDescription = "New Channel",
+            contentDescription = stringResource(R.string.new_channel),
             modifier = Modifier.size(26.dp),
             tint = Color.White
         )

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

@@ -11,14 +11,22 @@ 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)
+data class ResizeImage(val url: String?, val size: Dp) {
+  fun proxyUrl(): String? {
+    if (url == null) return null
+
+    // Fixes Image size to reduce pings to servers for each size used in the app
+    val imgPx = 200 // with(LocalDensity.current) { model.size.toPx().toInt() }
+    val base64 = Base64.getUrlEncoder().encodeToString(url.toByteArray())
+
+    return "https://d12fidohs5rlxk.cloudfront.net/preset:sharp/rs:fit:$imgPx:$imgPx:0/gravity:sm/$base64"
+  }
+}
 
 
 @Composable
@@ -42,7 +50,6 @@ fun AsyncImageProxy(
     AsyncImage(
       model = model.url,
       contentDescription = contentDescription,
-      imageLoader = LocalImageLoader.current,
       modifier = modifier,
       placeholder = placeholder,
       error = error,
@@ -57,14 +64,9 @@ fun AsyncImageProxy(
       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",
+      model = model.proxyUrl(),
       contentDescription = contentDescription,
-      imageLoader = LocalImageLoader.current,
       modifier = modifier,
       placeholder = placeholder,
       error = error,

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

@@ -8,7 +8,6 @@ import androidx.compose.material.LocalTextStyle
 import androidx.compose.material.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.platform.LocalUriHandler
 import androidx.compose.ui.text.AnnotatedString
 
 @Composable

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

@@ -4,12 +4,9 @@ import androidx.compose.foundation.text.ClickableText
 import androidx.compose.material.LocalTextStyle
 import androidx.compose.material.MaterialTheme
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.livedata.observeAsState
 import androidx.compose.ui.text.AnnotatedString
 import androidx.navigation.NavController
 import com.vitorpamplona.amethyst.model.Note
-import com.vitorpamplona.amethyst.model.toNote
 import com.vitorpamplona.amethyst.ui.note.toShortenHex
 
 @Composable
@@ -18,7 +15,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/ClickablePhone.kt

@@ -1,6 +1,5 @@
 package com.vitorpamplona.amethyst.ui.components
 
-import android.content.ActivityNotFoundException
 import android.content.Context
 import android.content.Intent
 import android.net.Uri
@@ -9,7 +8,6 @@ import androidx.compose.material.LocalTextStyle
 import androidx.compose.material.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.platform.LocalUriHandler
 import androidx.compose.ui.text.AnnotatedString
 
 @Composable

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,21 @@ 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
+import com.vitorpamplona.amethyst.R
+import androidx.compose.ui.res.stringResource
 
 @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 +43,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 +54,8 @@ fun ExpandableRichTextViewer(
           .background(
             brush = Brush.verticalGradient(
               colors = listOf(
-                MaterialTheme.colors.background.copy(alpha = 0f),
-                MaterialTheme.colors.background
+                backgroundColor.copy(alpha = 0f),
+                backgroundColor
               )
             )
           )
@@ -58,11 +65,11 @@ 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)
         ) {
-          Text(text = "Show More", color = Color.White)
+          Text(text = stringResource(R.string.show_more), color = Color.White)
         }
       }
     }

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

@@ -9,35 +9,26 @@ import androidx.compose.foundation.layout.fillMaxWidth
 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.Divider
 import androidx.compose.material.Icon
-import androidx.compose.material.LocalTextStyle
 import androidx.compose.material.MaterialTheme
-import androidx.compose.material.OutlinedTextField
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.input.KeyboardCapitalization
-import androidx.compose.ui.text.input.KeyboardType
-import androidx.compose.ui.text.style.TextDirection
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.core.content.ContextCompat.startActivity
 import com.vitorpamplona.amethyst.R
-import com.vitorpamplona.amethyst.lnurl.LnInvoiceUtil
+import com.vitorpamplona.amethyst.service.lnurl.LnInvoiceUtil
 import java.text.NumberFormat
 
 @Composable
@@ -78,7 +69,7 @@ fun InvoicePreview(lnInvoice: String) {
         )
 
         Text(
-          text = "Lightning Invoice",
+          text = stringResource(R.string.lightning_invoice),
           fontSize = 20.sp,
           fontWeight = FontWeight.W500,
           modifier = Modifier.padding(start = 10.dp)
@@ -89,7 +80,9 @@ fun InvoicePreview(lnInvoice: String) {
 
       amount?.let {
         Text(
-          text = "${NumberFormat.getInstance().format(amount)} sats",
+          text = "${
+            NumberFormat.getInstance().format(amount)
+          } ${stringResource(id = R.string.sats)}",
           fontSize = 25.sp,
           fontWeight = FontWeight.W500,
           modifier = Modifier
@@ -100,7 +93,9 @@ fun InvoicePreview(lnInvoice: String) {
 
 
       Button(
-        modifier = Modifier.fillMaxWidth().padding(vertical = 10.dp),
+        modifier = Modifier
+          .fillMaxWidth()
+          .padding(vertical = 10.dp),
         onClick = {
           runCatching {
             val intent = Intent(Intent.ACTION_VIEW, Uri.parse("lightning:$lnInvoice"))
@@ -112,7 +107,7 @@ fun InvoicePreview(lnInvoice: String) {
           backgroundColor = MaterialTheme.colors.primary
         )
       ) {
-        Text(text = "Pay", color = Color.White, fontSize = 20.sp)
+        Text(text = stringResource(R.string.pay), color = Color.White, fontSize = 20.sp)
       }
     }
   }

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

@@ -30,6 +30,7 @@ import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.input.KeyboardCapitalization
 import androidx.compose.ui.text.input.KeyboardType
@@ -37,7 +38,7 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.core.content.ContextCompat.startActivity
 import com.vitorpamplona.amethyst.R
-import com.vitorpamplona.amethyst.lnurl.LightningAddressResolver
+import com.vitorpamplona.amethyst.service.lnurl.LightningAddressResolver
 import com.vitorpamplona.amethyst.model.Account
 import kotlinx.coroutines.launch
 
@@ -73,7 +74,7 @@ fun InvoiceRequest(lud16: String, toUserPubKeyHex: String, account: Account, onC
         )
 
         Text(
-          text = "Lightning Tips",
+          text = stringResource(R.string.lightning_tips),
           fontSize = 20.sp,
           fontWeight = FontWeight.W500,
           modifier = Modifier.padding(start = 10.dp)
@@ -86,13 +87,13 @@ fun InvoiceRequest(lud16: String, toUserPubKeyHex: String, account: Account, onC
       var amount by remember { mutableStateOf(1000L) }
 
       OutlinedTextField(
-        label = { Text(text = "Note to Receiver") },
+        label = { Text(text = stringResource(R.string.note_to_receiver)) },
         modifier = Modifier.fillMaxWidth(),
         value = message,
         onValueChange = { message = it },
         placeholder = {
           Text(
-            text = "Thank you so much!",
+            text = stringResource(R.string.thank_you_so_much),
             color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
           )
         },
@@ -103,7 +104,7 @@ fun InvoiceRequest(lud16: String, toUserPubKeyHex: String, account: Account, onC
       )
 
       OutlinedTextField(
-        label = { Text(text = "Amount in Sats") },
+        label = { Text(text = stringResource(R.string.amount_in_sats)) },
         modifier = Modifier.fillMaxWidth(),
         value = amount.toString(),
         onValueChange = {
@@ -152,7 +153,7 @@ fun InvoiceRequest(lud16: String, toUserPubKeyHex: String, account: Account, onC
           backgroundColor = MaterialTheme.colors.primary
         )
       ) {
-        Text(text = "Send Sats", color = Color.White, fontSize = 20.sp)
+        Text(text = stringResource(R.string.send_sats), color = Color.White, fontSize = 20.sp)
       }
     }
   }

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

@@ -2,20 +2,49 @@ package com.vitorpamplona.amethyst.ui.components
 
 import android.util.Patterns
 import androidx.compose.animation.animateContentSize
-import androidx.compose.foundation.layout.*
-import androidx.compose.material.*
-import androidx.compose.runtime.*
+import androidx.compose.foundation.background
+import androidx.compose.foundation.border
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.LocalContentColor
+import androidx.compose.material.LocalTextStyle
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.Text
+import androidx.compose.material.contentColorFor
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
+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.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.compositeOver
+import androidx.compose.ui.text.Paragraph
+import androidx.compose.ui.text.SpanStyle
+import androidx.compose.ui.text.style.TextDecoration
 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
+import com.halilibo.richtext.markdown.Markdown
+import com.halilibo.richtext.markdown.MarkdownParseOptions
+import com.halilibo.richtext.ui.RichText
+import com.halilibo.richtext.ui.RichTextStyle
+import com.halilibo.richtext.ui.currentRichTextStyle
+import com.halilibo.richtext.ui.material.MaterialRichText
+import com.halilibo.richtext.ui.resolveDefaults
+import com.halilibo.richtext.ui.string.RichTextString
+import com.halilibo.richtext.ui.string.RichTextStringStyle
+import com.vitorpamplona.amethyst.service.lnurl.LnInvoiceUtil
 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.toShortenHex
-import nostr.postr.toNpub
+import com.vitorpamplona.amethyst.ui.note.NoteCompose
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import java.net.MalformedURLException
 import java.net.URISyntaxException
 import java.net.URL
@@ -45,66 +74,88 @@ 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
-      .animateContentSize()) {
-    // FlowRow doesn't work well with paragraphs. So we need to split them
-    content.split('\n').forEach { paragraph ->
 
-      FlowRow() {
-        paragraph.split(' ').forEach { word: String ->
+  Column(modifier = modifier.animateContentSize()) {
 
-          if (canPreview) {
-            // Explicit URL
-            val lnInvoice = LnInvoiceUtil.findInvoice(word)
-            if (lnInvoice != null) {
-              InvoicePreview(lnInvoice)
-            } else if (isValidURL(word)) {
-              val removedParamsFromUrl = word.split("?")[0].toLowerCase()
-              if (imageExtension.matcher(removedParamsFromUrl).matches()) {
-                ZoomableImageView(word)
-              } else if (videoExtension.matcher(removedParamsFromUrl).matches()) {
-                VideoView(word)
+    if (content.startsWith("# ") || content.contains("##") || content.contains("```")) {
+      var richTextStyle by remember { mutableStateOf(RichTextStyle().resolveDefaults()) }
+
+      MaterialRichText(
+        style = RichTextStyle().resolveDefaults().copy(
+          stringStyle = richTextStyle.stringStyle?.copy(
+            linkStyle = SpanStyle(
+              textDecoration = TextDecoration.Underline,
+              color = MaterialTheme.colors.primary
+            )
+          )
+        ),
+      ) {
+        Markdown(
+          content = content,
+          markdownParseOptions = MarkdownParseOptions.Default,
+        )
+      }
+    } else {
+      // FlowRow doesn't work well with paragraphs. So we need to split them
+      content.split('\n').forEach { paragraph ->
+        FlowRow() {
+          paragraph.split(' ').forEach { word: String ->
+
+            if (canPreview) {
+              // Explicit URL
+              val lnInvoice = LnInvoiceUtil.findInvoice(word)
+              if (lnInvoice != null) {
+                InvoicePreview(lnInvoice)
+              } else if (isValidURL(word)) {
+                val removedParamsFromUrl = word.split("?")[0].toLowerCase()
+                if (imageExtension.matcher(removedParamsFromUrl).matches()) {
+                  ZoomableImageView(word)
+                } else if (videoExtension.matcher(removedParamsFromUrl).matches()) {
+                  VideoView(word)
+                } else {
+                  UrlPreview(word, word)
+                }
+              } else if (Patterns.EMAIL_ADDRESS.matcher(word).matches()) {
+                ClickableEmail(word)
+              } else if (Patterns.PHONE.matcher(word).matches() && word.length > 6) {
+                ClickablePhone(word)
+              } else if (noProtocolUrlValidator.matcher(word).matches()) {
+                UrlPreview("https://$word", word)
+              } else if (tagIndex.matcher(word).matches() && tags != null) {
+                TagLink(word, tags, canPreview, backgroundColor, accountViewModel, navController)
+              } else if (isBechLink(word)) {
+                BechLink(word, navController)
               } else {
-                UrlPreview(word, word)
+                Text(
+                  text = "$word ",
+                  style = LocalTextStyle.current.copy(textDirection = TextDirection.Content),
+                )
               }
-            } else if (Patterns.EMAIL_ADDRESS.matcher(word).matches()) {
-              ClickableEmail(word)
-            } else if (Patterns.PHONE.matcher(word).matches() && word.length > 6) {
-              ClickablePhone(word)
-            } else if (noProtocolUrlValidator.matcher(word).matches()) {
-              UrlPreview("https://$word", word)
-            } else if (tagIndex.matcher(word).matches() && tags != null) {
-              TagLink(word, tags, navController)
-            } else if (isBechLink(word)) {
-              BechLink(word, navController)
             } else {
-              Text(
-                text = "$word ",
-                style = LocalTextStyle.current.copy(textDirection = TextDirection.Content),
-              )
-            }
-          } else {
-            if (isValidURL(word)) {
-              ClickableUrl("$word ", word)
-            } else if (Patterns.EMAIL_ADDRESS.matcher(word).matches()) {
-              ClickableEmail(word)
-            } else if (Patterns.PHONE.matcher(word).matches() && word.length > 6) {
-              ClickablePhone(word)
-            } else if (noProtocolUrlValidator.matcher(word).matches()) {
-              ClickableUrl(word, "https://$word")
-            } else if (tagIndex.matcher(word).matches() && tags != null) {
-              TagLink(word, tags, navController)
-            } else if (isBechLink(word)) {
-              BechLink(word, navController)
-            } else {
-              Text(
-                text = "$word ",
-                style = LocalTextStyle.current.copy(textDirection = TextDirection.Content),
-              )
+              if (isValidURL(word)) {
+                ClickableUrl("$word ", word)
+              } else if (Patterns.EMAIL_ADDRESS.matcher(word).matches()) {
+                ClickableEmail(word)
+              } else if (Patterns.PHONE.matcher(word).matches() && word.length > 6) {
+                ClickablePhone(word)
+              } else if (noProtocolUrlValidator.matcher(word).matches()) {
+                ClickableUrl(word, "https://$word")
+              } else if (tagIndex.matcher(word).matches() && tags != null) {
+                TagLink(word, tags, canPreview, backgroundColor, accountViewModel, navController)
+              } else if (isBechLink(word)) {
+                BechLink(word, navController)
+              } else {
+                Text(
+                  text = "$word ",
+                  style = LocalTextStyle.current.copy(textDirection = TextDirection.Content),
+                )
+              }
             }
           }
         }
@@ -151,7 +202,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>>, canPreview: Boolean, backgroundColor: Color, accountViewModel: AccountViewModel, navController: NavController) {
   val matcher = tagIndex.matcher(word)
 
   val index = try {
@@ -168,22 +219,48 @@ 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)
+        if (canPreview) {
+          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 {
+          ClickableNoteTag(note, 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,7 +25,9 @@ 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.res.stringResource
 import androidx.compose.ui.text.SpanStyle
 import androidx.compose.ui.text.buildAnnotatedString
 import androidx.compose.ui.text.style.TextOverflow
@@ -28,16 +35,21 @@ import androidx.compose.ui.text.withStyle
 import androidx.compose.ui.unit.dp
 import androidx.core.os.ConfigurationCompat
 import androidx.navigation.NavController
+import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.service.lang.LanguageTranslatorService
 import com.vitorpamplona.amethyst.service.lang.ResultOrError
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import java.util.Locale
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
 
 @Composable
 fun TranslateableRichTextViewer(
   content: String,
   canPreview: Boolean,
+  modifier: Modifier = Modifier,
   tags: List<List<String>>?,
+  backgroundColor: Color,
   accountViewModel: AccountViewModel,
   navController: NavController
 ) {
@@ -54,14 +66,23 @@ fun TranslateableRichTextViewer(
   val account = accountState?.account ?: return
 
   LaunchedEffect(accountState) {
-    LanguageTranslatorService.autoTranslate(content, account.dontTranslateFrom, account.translateTo)
-      .addOnCompleteListener { task ->
-        if (task.isSuccessful) {
+    withContext(Dispatchers.IO) {
+      LanguageTranslatorService.autoTranslate(
+        content,
+        account.dontTranslateFrom,
+        account.translateTo
+      ).addOnCompleteListener { task ->
+        if (task.isSuccessful && content != task.result.result) {
+          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 +91,11 @@ fun TranslateableRichTextViewer(
     ExpandableRichTextViewer(
       toBeViewed,
       canPreview,
+      modifier,
       tags,
-      navController
+      backgroundColor,
+      accountViewModel,
+      navController,
     )
 
     val target = translatedTextState.value.targetLang
@@ -79,24 +103,26 @@ 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))
 
           val annotatedTranslationString = buildAnnotatedString {
             withStyle(clickableTextStyle) {
               pushStringAnnotation("langSettings", true.toString())
-              append("Auto")
+              append(stringResource(R.string.auto))
             }
 
-            append("-translated from ")
+            append("-${stringResource(R.string.translated_from)} ")
 
             withStyle(clickableTextStyle) {
               pushStringAnnotation("showOriginal", true.toString())
               append(Locale(source).displayName)
             }
 
-            append(" to ")
+            append(" ${stringResource(R.string.to)} ")
 
             withStyle(clickableTextStyle) {
               pushStringAnnotation("showOriginal", false.toString())
@@ -128,9 +154,63 @@ fun TranslateableRichTextViewer(
               accountViewModel.dontTranslateFrom(source, context)
               langSettingsPopupExpanded = false
             }) {
-              Text("Never translate from ${Locale(source).displayName}")
+              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(stringResource(R.string.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))
+
+              // TODO : Rashed translate this
+              Text(
+                "${stringResource(R.string.show_in)} ${Locale(source).displayName} ${
+                  stringResource(
+                    R.string.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("${stringResource(id = R.string.show_in)} ${Locale(target).displayName} ${R.string.first}")
+            }
+            Divider()
+
             val languageList =
               ConfigurationCompat.getLocales(Resources.getSystem().getConfiguration())
             for (i in 0 until languageList.size()) {
@@ -139,7 +219,18 @@ fun TranslateableRichTextViewer(
                   accountViewModel.translateTo(lang, context)
                   langSettingsPopupExpanded = false
                 }) {
-                  Text("Always translate to ${lang.displayName}")
+                  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("${stringResource(R.string.always_translate_to)}${lang.displayName}")
                 }
               }
             }

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

@@ -8,29 +8,46 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
+import androidx.compose.ui.platform.LocalContext
 import com.baha.url.preview.IUrlPreviewCallback
 import com.baha.url.preview.UrlInfoItem
+import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.model.UrlCachedPreviewer
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
 
 
 @Composable
-fun UrlPreview(url: String, urlText: String, showUrlIfError: Boolean = true) {
-  var urlPreviewState by remember { mutableStateOf<UrlPreviewState>(UrlPreviewState.Loading) }
+fun UrlPreview(url: String, urlText: String) {
+  val default = UrlCachedPreviewer.cache[url]?.let { UrlPreviewState.Loaded(it) } ?: UrlPreviewState.Loading
+  var context = LocalContext.current
+
+  var urlPreviewState by remember { mutableStateOf(default) }
 
   // Doesn't use a viewModel because of viewModel reusing issues (too many UrlPreview are created).
   LaunchedEffect(url) {
-    UrlCachedPreviewer.previewInfo(url, object : IUrlPreviewCallback {
-      override fun onComplete(urlInfo: UrlInfoItem) {
-        if (urlInfo.allFetchComplete() && urlInfo.url == url)
-          urlPreviewState = UrlPreviewState.Loaded(urlInfo)
-        else
-          urlPreviewState = UrlPreviewState.Empty
-      }
+    if (urlPreviewState == UrlPreviewState.Loading) {
+      withContext(Dispatchers.IO) {
+        UrlCachedPreviewer.previewInfo(url, object : IUrlPreviewCallback {
+          override fun onComplete(urlInfo: UrlInfoItem) {
+            if (urlInfo.allFetchComplete() && urlInfo.url == url)
+              urlPreviewState = UrlPreviewState.Loaded(urlInfo)
+            else
+              urlPreviewState = UrlPreviewState.Empty
+          }
 
-      override fun onFailed(throwable: Throwable) {
-        urlPreviewState = UrlPreviewState.Error("Error parsing preview for ${url}: ${throwable.message}")
+          override fun onFailed(throwable: Throwable) {
+            urlPreviewState = UrlPreviewState.Error(
+              context.getString(
+                R.string.error_parsing_preview_for,
+                url,
+                throwable.message
+              )
+            )
+          }
+        })
       }
-    })
+    }
   }
 
   Crossfade(targetState = urlPreviewState, animationSpec = tween(durationMillis = 100)) { state ->
@@ -39,9 +56,7 @@ fun UrlPreview(url: String, urlText: String, showUrlIfError: Boolean = true) {
         UrlPreviewCard(url, state.previewInfo)
       }
       else -> {
-        if (showUrlIfError) {
-          ClickableUrl(urlText, url)
-        }
+        ClickableUrl(urlText, url)
       }
     }
   }

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

@@ -15,10 +15,12 @@ import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalUriHandler
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import coil.compose.AsyncImage
 import com.baha.url.preview.UrlInfoItem
+import com.vitorpamplona.amethyst.R
 
 @Composable
 fun UrlPreviewCard(
@@ -36,7 +38,7 @@ fun UrlPreviewCard(
     Column {
       AsyncImage(
         model = previewInfo.image,
-        contentDescription = "Preview Card Image for ${url}",
+        contentDescription = stringResource(R.string.preview_card_image_for, url),
         contentScale = ContentScale.FillWidth,
         modifier = Modifier.fillMaxWidth()
       )

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

@@ -16,8 +16,6 @@ import com.google.android.exoplayer2.Player
 import com.google.android.exoplayer2.source.ProgressiveMediaSource
 import com.google.android.exoplayer2.ui.AspectRatioFrameLayout
 import com.google.android.exoplayer2.ui.StyledPlayerView
-import com.google.android.exoplayer2.upstream.DefaultHttpDataSource
-import com.google.android.exoplayer2.upstream.cache.CacheDataSource
 import com.vitorpamplona.amethyst.VideoCache
 
 @Composable

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

@@ -17,7 +17,9 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.graphicsLayer
 import androidx.compose.ui.input.pointer.pointerInput
 import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.res.stringResource
 import coil.compose.AsyncImage
+import com.vitorpamplona.amethyst.R
 
 @Composable
 fun ZoomableAsyncImage(imageUrl: String) {
@@ -46,14 +48,16 @@ fun ZoomableAsyncImage(imageUrl: String) {
     ) {
         AsyncImage(
             model = imageUrl,
-            contentDescription = "Profile Image",
+            contentDescription = stringResource(id = R.string.profile_image),
             contentScale = ContentScale.FillWidth,
-            modifier = Modifier.fillMaxSize().graphicsLayer(
-                scaleX = scale,
-                scaleY = scale,
-                translationX = offsetX,
-                translationY = offsetY
-            ),
+            modifier = Modifier
+                .fillMaxSize()
+                .graphicsLayer(
+                    scaleX = scale,
+                    scaleY = scale,
+                    translationX = offsetX,
+                    translationY = offsetY
+                ),
         )
     }
 }

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

@@ -3,18 +3,26 @@ package com.vitorpamplona.amethyst.ui.components
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.border
 import androidx.compose.foundation.combinedClickable
-import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Surface
-import androidx.compose.runtime.*
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalClipboardManager
-import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.Dialog

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

@@ -0,0 +1,21 @@
+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
+
+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,19 @@
+package com.vitorpamplona.amethyst.ui.dal
+
+import android.util.Log
+import kotlin.time.ExperimentalTime
+import kotlin.time.measureTimedValue
+
+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,21 @@
+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 nostr.postr.events.TextNoteEvent
+
+object GlobalFeedFilter: FeedFilter<Note>() {
+  lateinit var account: Account
+
+  override fun feed() = LocalCache.notes.values
+    .filter {
+      (it.event is TextNoteEvent && (it.event as TextNoteEvent).replyTos.isEmpty()) ||
+      (it.event is ChannelMessageEvent && (it.event as ChannelMessageEvent).replyTos.isEmpty())
+    }
+    .filter { account.isAcceptable(it) }
+    .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,26 @@
+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.author?.let { !HomeNewThreadFeedFilter.account.isHidden(it) } ?: true
+          && !it.isNewThread()
+      }
+      .sortedBy { it.event?.createdAt }
+      .reversed()
+  }
+}

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

@@ -0,0 +1,27 @@
+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.LongTextNoteEvent
+import com.vitorpamplona.amethyst.service.model.RepostEvent
+import nostr.postr.events.TextNoteEvent
+
+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.event is LongTextNoteEvent)
+          && it.author in user.follows
+          // && account.isAcceptable(it)  // This filter follows only. No need to check if acceptable
+          && it.author?.let { !account.isHidden(it) } ?: true
+          && it.isNewThread()
+      }
+      .sortedBy { it.event?.createdAt }
+      .reversed()
+  }
+}

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

@@ -0,0 +1,69 @@
+package com.vitorpamplona.amethyst.ui.dal
+
+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.ChannelMetadataEvent
+import com.vitorpamplona.amethyst.service.model.LnZapRequestEvent
+import com.vitorpamplona.amethyst.service.model.ReactionEvent
+import com.vitorpamplona.amethyst.service.model.RepostEvent
+import nostr.postr.events.TextNoteEvent
+
+object NotificationFeedFilter: FeedFilter<Note>() {
+  lateinit var account: Account
+
+  override fun feed(): List<Note> {
+    return account.userProfile().taggedPosts
+      .filter {
+           it.author == null
+        || (!account.isHidden(it.author!!) && it.author != account.userProfile())
+      }
+      .filter {
+           it.event !is ChannelCreateEvent
+        && it.event !is ChannelMetadataEvent
+        && it.event !is LnZapRequestEvent
+      }
+      .filter {
+        it.event !is TextNoteEvent
+          ||
+          (
+            it.event is TextNoteEvent
+              &&
+              (
+                it.replyTo?.any { it.author == account.userProfile() } == true
+                  ||
+                  account.userProfile() in it.directlyCiteUsers()
+                )
+            )
+      }
+      .filter {
+        it.event !is ReactionEvent
+          ||
+          (
+            it.event is ReactionEvent
+              &&
+              (
+                it.replyTo?.lastOrNull()?.author == account.userProfile()
+                  ||
+                  account.userProfile() in it.directlyCiteUsers()
+                )
+            )
+      }
+      .filter {
+        it.event !is RepostEvent
+          ||
+          (
+            it.event is RepostEvent
+              &&
+              (
+                it.replyTo?.lastOrNull()?.author == account.userProfile()
+                  ||
+                  account.userProfile() in it.directlyCiteUsers()
+                )
+            )
+      }
+
+      .sortedBy { it.event?.createdAt }
+      .reversed()
+  }
+}

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

@@ -0,0 +1,21 @@
+package com.vitorpamplona.amethyst.ui.dal
+
+import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.model.ThreadAssembler
+
+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() {}
 }