v0.20.1

2. Checks if NIP 05 is an email before starting to verify to avoid crashes.
3. Allowing ellipsis to avoid breaking the nip05 into multiple lines.

README.md

@@ -11,20 +11,24 @@ Amethyst brings the best social network to your Android phone. Just insert your
 - [x] Notifications Feed
 - [x] Global Feed
 - [x] Reactions (like, boost, reply)
-- [x] Image Preview (gifs, svgs)
+- [x] Image/Video Preview (gifs, svgs, etc)
 - [x] Url Preview
 - [x] View Threads
 - [x] Private Messages (NIP-04)
 - [x] User Profiles (follow/unfollow)
 - [x] Public Chats (NIP-28)
-- [ ] Notification Bubbles
+- [x] Notification Dots
+- [x] Reporting and Hide User capability
+- [x] Automatic Translations
+- [x] Profile Edit
+- [x] Relay Edit (separate relay sets for home, dms, public chats, global)
+- [x] Dropdown to Link Users when writing
+- [x] Lightning Tips
+- [x] Zaps 
+- [x] Event Deletion (NIP-09: like, boost, text notes and reports)
+- [ ] Internationalization
 - [ ] Infinity Scroll 
-- [ ] Dropdown to Link Users/Posts when writing
 - [ ] Identity Verification (NIP-05)
-- [ ] Event Delegation (NIP-09)
-- [ ] Filter messages from Unknown People
-- [ ] Profile Edit
-- [ ] Relay Edit
 - [ ] Account Creation / Backup Guidance
 - [ ] Message Sent feedback
 
@@ -123,4 +127,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+SOFTWARE.

app/build.gradle

@@ -11,8 +11,8 @@ android {
         applicationId "com.vitorpamplona.amethyst"
         minSdk 26
         targetSdk 33
-        versionCode 33
-        versionName "0.11.7"
+        versionCode 76
+        versionName "0.20.2"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {
@@ -22,8 +22,14 @@ android {
 
     buildTypes {
         release {
-            //minifyEnabled false
+            //minifyEnabled true
             //proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+            resValue "string", "app_name", "@string/app_name_release"
+        }
+        debug {
+            applicationIdSuffix '.debug'
+            versionNameSuffix '-DEBUG'
+            resValue "string", "app_name", "@string/app_name_debug"
         }
     }
     compileOptions {
@@ -37,7 +43,7 @@ android {
         compose true
     }
     composeOptions {
-        kotlinCompilerExtensionVersion '1.4.0'
+        kotlinCompilerExtensionVersion "1.4.3"
     }
     packagingOptions {
         resources {
@@ -48,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"
 
@@ -56,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'
@@ -85,14 +91,19 @@ dependencies {
     implementation 'com.squareup.okhttp3:okhttp:5.0.0-alpha.11'
 
     // Json Serialization
-    implementation 'com.fasterxml.jackson.module:jackson-module-kotlin:2.14.1'
+    implementation 'com.fasterxml.jackson.module:jackson-module-kotlin:2.14.2'
+
+    // Robohash for Avatars
+    implementation group: 'com.github.vitorpamplona', name: 'android-robohash', version: 'master-SNAPSHOT', ext: 'aar'
 
     // 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"
@@ -110,13 +121,31 @@ 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.0"
+    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'
+
+    // For QR Scanning
     implementation 'com.google.mlkit:vision-common:17.3.0'
-    implementation 'com.google.android.gms:play-services-mlkit-barcode-scanning:18.1.0'
+
+    // Local Barcode Scanning model
+    // The idea is to make it work for degoogled phones
+    implementation 'com.google.mlkit:barcode-scanning:17.0.3'
+
+    // Local model for language identification
+    implementation 'com.google.mlkit:language-id:17.0.4'
+
+    // 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/proguard-rules.pro

@@ -26,6 +26,12 @@
 # For the NostrPostr library
 -keep class nostr.postr.** { *; }
 -keep class nostr.postr.events.** { *; }
+# Json parsing
 -keep class com.google.gson.reflect.** { *; }
+-keep class * extends com.google.gson.reflect.TypeToken
+-keep public class * implements java.lang.reflect.Type
+
+-keep class com.vitorpamplona.amethyst.lnurl.** { *; }
 -keep class com.vitorpamplona.amethyst.model.** { *; }
--keep class com.vitorpamplona.amethyst.service.** { *; }
+-keep class com.vitorpamplona.amethyst.service.** { *; }
+-keep class com.vitorpamplona.amethyst.ui.** { *; }

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,7 +5,9 @@ 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
 import org.junit.Assert.*
 import org.junit.Test
@@ -22,13 +24,14 @@ class EUrlUserTagTransformationTest {
   fun useAppContext() {
     // Context of the app under test.
     val appContext = InstrumentationRegistry.getInstrumentation().targetContext
-    assertEquals("com.vitorpamplona.amethyst", appContext.packageName)
+    assertEquals("com.vitorpamplona.amethyst", appContext.packageName.removeSuffix(".debug"))
   }
 
   @Test
   fun transformationText() {
-    val user = LocalCache.getOrCreateUser(decodePublicKey("npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z"))
-    user.info.displayName = "Vitor Pamplona"
+    val user = LocalCache.getOrCreateUser(decodePublicKey("npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z").toHexKey())
+    user.info = UserMetadata()
+    user.info?.displayName = "Vitor Pamplona"
 
     var transformedText = buildAnnotatedStringWithUrlHighlighting(
       AnnotatedString("New Hey @npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z"),
@@ -61,8 +64,9 @@ class EUrlUserTagTransformationTest {
 
   @Test
   fun transformationTextTwoKeys() {
-    val user = LocalCache.getOrCreateUser(decodePublicKey("npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z"))
-    user.info.displayName = "Vitor Pamplona"
+    val user = LocalCache.getOrCreateUser(decodePublicKey("npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z").toHexKey())
+    user.info = UserMetadata()
+    user.info?.displayName = "Vitor Pamplona"
 
     var transformedText = buildAnnotatedStringWithUrlHighlighting(
       AnnotatedString("New Hey @npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z and @npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z"),

app/src/androidTest/res/values/strings.xml

@@ -0,0 +1,4 @@
+<resources>
+    <string name="app_name_release">Amethyst</string>
+    <string name="app_name_debug">Amethyst Debug</string>
+</resources>

app/src/main/AndroidManifest.xml

@@ -4,10 +4,15 @@
 
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.READ_MEDIA_IMAGES"/>
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.CAMERA" />
 
+    <!-- Used for SDK < 29 -->
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        tools:ignore="ScopedStorage" />
+
     <application
-        android:allowBackup="true"
+        android:allowBackup="false"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
         android:icon="@drawable/amethyst"
@@ -16,9 +21,9 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.Amethyst"
         android:largeHeap="true"
-        tools:targetApi="31">
+        android:usesCleartextTraffic="true"
+        tools:targetApi="33">
         <activity
-            android:label="Amethyst"
             android:name=".ui.MainActivity"
             android:exported="true"
             android:windowSoftInputMode="adjustResize"
@@ -40,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

@@ -1,17 +1,21 @@
 package com.vitorpamplona.amethyst
 
 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.Channel
-import com.vitorpamplona.amethyst.model.DefaultChannels
-import com.vitorpamplona.amethyst.model.User
+import com.vitorpamplona.amethyst.model.RelaySetupInfo
 import com.vitorpamplona.amethyst.model.toByteArray
-import com.vitorpamplona.amethyst.ui.navigation.Route
+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) {
   val encryptedPreferences = EncryptedStorage().preferences(context)
+  val gson = GsonBuilder().create()
 
   fun clearEncryptedStorage() {
     encryptedPreferences.edit().apply {
@@ -19,6 +23,12 @@ class LocalPreferences(context: Context) {
       remove("nostr_pubkey")
       remove("following_channels")
       remove("hidden_users")
+      remove("relays")
+      remove("dontTranslateFrom")
+      remove("languagePreferences")
+      remove("translateTo")
+      remove("zapAmounts")
+      remove("latestContactList")
     }.apply()
   }
 
@@ -28,6 +38,12 @@ class LocalPreferences(context: Context) {
       account.loggedIn.pubKey.let { putString("nostr_pubkey", it.toHex()) }
       account.followingChannels.let { putStringSet("following_channels", it) }
       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()
   }
 
@@ -35,14 +51,50 @@ class LocalPreferences(context: Context) {
     encryptedPreferences.apply {
       val privKey = getString("nostr_privkey", null)
       val pubKey = getString("nostr_pubkey", null)
-      val followingChannels = getStringSet("following_channels", DefaultChannels)?.toMutableSet() ?: DefaultChannels.toMutableSet()
-      val hiddenUsers = getStringSet("hidden_users", emptySet())?.toMutableSet() ?: mutableSetOf()
+      val followingChannels = getStringSet("following_channels", null) ?: setOf()
+      val hiddenUsers = getStringSet("hidden_users", emptySet()) ?: setOf()
+      val localRelays = gson.fromJson(
+        getString("relays", "[]"),
+        object : TypeToken<Set<RelaySetupInfo>>() {}.type
+      ) ?: setOf<RelaySetupInfo>()
+
+      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()),
           followingChannels,
-          hiddenUsers
+          hiddenUsers,
+          localRelays,
+          dontTranslateFrom,
+          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,31 @@ object NotificationCache {
 
   // Observers line up here.
   val live: NotificationLiveData = NotificationLiveData(this)
-
-  // Refreshes observers in batches.
-  var handlerWaiting = false
-  @Synchronized
-  fun invalidateData() {
-    if (handlerWaiting) return
-
-    handlerWaiting = true
-    val scope = CoroutineScope(Job() + Dispatchers.Default)
-    scope.launch {
-      delay(100)
-      live.refresh()
-      handlerWaiting = false
-    }
-  }
 }
 
 class NotificationLiveData(val cache: NotificationCache): LiveData<NotificationState>(NotificationState(cache)) {
+  // Refreshes observers in batches.
+  var handlerWaiting = AtomicBoolean()
+
+  @Synchronized
+  fun invalidateData() {
+    if (!hasActiveObservers()) return
+    if (handlerWaiting.getAndSet(true)) return
+
+    handlerWaiting.set(true)
+    val scope = CoroutineScope(Job() + Dispatchers.Main)
+    scope.launch {
+      try {
+        delay(100)
+        refresh()
+      } finally {
+        withContext(NonCancellable) {
+          handlerWaiting.set(false)
+        }
+      }
+    }
+  }
+
   fun refresh() {
     postValue(NotificationState(cache))
   }

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

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

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

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

@@ -0,0 +1,41 @@
+package com.vitorpamplona.amethyst
+
+import android.content.Context
+import com.google.android.exoplayer2.database.StandaloneDatabaseProvider
+import com.google.android.exoplayer2.upstream.DefaultHttpDataSource
+import com.google.android.exoplayer2.upstream.cache.CacheDataSource
+import com.google.android.exoplayer2.upstream.cache.LeastRecentlyUsedCacheEvictor
+import com.google.android.exoplayer2.upstream.cache.SimpleCache
+
+object VideoCache {
+
+  var exoPlayerCacheSize: Long = 90 * 1024 * 1024 // 90MB
+
+  var leastRecentlyUsedCacheEvictor = LeastRecentlyUsedCacheEvictor(exoPlayerCacheSize)
+
+  lateinit var exoDatabaseProvider: StandaloneDatabaseProvider
+  lateinit var simpleCache: SimpleCache
+
+  lateinit var cacheDataSourceFactory: CacheDataSource.Factory
+
+  fun get(context: Context): CacheDataSource.Factory {
+    if (!this::simpleCache.isInitialized) {
+      exoDatabaseProvider = StandaloneDatabaseProvider(context)
+
+      simpleCache = SimpleCache(
+        context.cacheDir,
+        leastRecentlyUsedCacheEvictor,
+        exoDatabaseProvider
+      )
+
+      cacheDataSourceFactory = CacheDataSource.Factory()
+        .setCache(simpleCache)
+        .setUpstreamDataSourceFactory(
+          DefaultHttpDataSource.Factory().setAllowCrossProtocolRedirects(true)
+        )
+        .setFlags(CacheDataSource.FLAG_IGNORE_CACHE_ON_ERROR)
+    }
+
+    return cacheDataSourceFactory
+  }
+}

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

@@ -1,26 +1,36 @@
 package com.vitorpamplona.amethyst.model
 
+import android.content.res.Resources
+import androidx.core.os.ConfigurationCompat
 import androidx.lifecycle.LiveData
-import com.vitorpamplona.amethyst.service.Constants
 import com.vitorpamplona.amethyst.service.model.ChannelCreateEvent
 import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
 import com.vitorpamplona.amethyst.service.model.ChannelMetadataEvent
+import com.vitorpamplona.amethyst.service.model.LnZapRequestEvent
 import com.vitorpamplona.amethyst.service.model.ReactionEvent
 import com.vitorpamplona.amethyst.service.model.ReportEvent
 import com.vitorpamplona.amethyst.service.model.RepostEvent
 import com.vitorpamplona.amethyst.service.relays.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
 import java.util.Date
+import java.util.Locale
+import java.util.concurrent.atomic.AtomicBoolean
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.Job
+import kotlinx.coroutines.NonCancellable
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import nostr.postr.Contact
 import nostr.postr.Persona
 import nostr.postr.Utils
 import nostr.postr.events.ContactListEvent
+import nostr.postr.events.DeletionEvent
 import nostr.postr.events.Event
 import nostr.postr.events.MetadataEvent
 import nostr.postr.events.PrivateDmEvent
@@ -32,14 +42,35 @@ val DefaultChannels = setOf(
   "42224859763652914db53052103f0b744df79dfc4efef7e950fc0802fc3df3c5"  // -> Amethyst's Group
 )
 
+fun getLanguagesSpokenByUser(): Set<String> {
+  val languageList = ConfigurationCompat.getLocales(Resources.getSystem().getConfiguration())
+  val codedList = mutableSetOf<String>()
+  for (i in 0 until languageList.size()) {
+    languageList.get(i)?.let { codedList.add(it.language) }
+  }
+  return codedList
+}
+
 class Account(
   val loggedIn: Persona,
-  val followingChannels: MutableSet<String> = DefaultChannels.toMutableSet(),
-  val hiddenUsers: MutableSet<String> = mutableSetOf()
+  var followingChannels: Set<String> = DefaultChannels,
+  var hiddenUsers: Set<String> = setOf(),
+  var localRelays: Set<RelaySetupInfo> = Constants.defaultRelays.toSet(),
+  var dontTranslateFrom: Set<String> = getLanguagesSpokenByUser(),
+  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)
+    return LocalCache.getOrCreateUser(loggedIn.pubKey.toHexKey())
   }
 
   fun followingChannels(): List<Channel> {
@@ -47,7 +78,7 @@ class Account(
   }
 
   fun hiddenUsers(): List<User> {
-    return hiddenUsers.map { LocalCache.getOrCreateUser(it.toByteArray()) }
+    return (hiddenUsers + transientHiddenUsers).map { LocalCache.getOrCreateUser(it) }
   }
 
   fun isWriteable(): Boolean {
@@ -57,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) {
@@ -88,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.reactions.firstOrNull { it.author == userProfile() && it.event?.content == "+" } != null) {
+    if (hasReacted(note)) {
       // has already liked this note
       return
     }
@@ -103,12 +155,30 @@ class Account(
     }
   }
 
+  fun createZapRequestFor(note: Note): LnZapRequestEvent? {
+    if (!isWriteable()) return null
+
+    note.event?.let {
+      return LnZapRequestEvent.create(it, userProfile().relays?.keys?.ifEmpty { null } ?: localRelays.map { it.url }.toSet(), loggedIn.privKey!!)
+    }
+
+    return null
+  }
+
+  fun createZapRequestFor(user: User): LnZapRequestEvent? {
+    return createZapRequestFor(user.pubkeyHex)
+  }
+
+  fun createZapRequestFor(userPubKeyHex: String): LnZapRequestEvent? {
+    if (!isWriteable()) return null
+
+    return LnZapRequestEvent.create(userPubKeyHex, userProfile().relays?.keys?.ifEmpty { null } ?: localRelays.map { it.url }.toSet(), loggedIn.privKey!!)
+  }
+
   fun report(note: Note, type: ReportEvent.ReportType) {
     if (!isWriteable()) return
 
-    if (
-      note.reactions.firstOrNull { it.author == userProfile() && it.event?.content == "⚠️"} != null
-    ) {
+    if (note.hasReacted(userProfile(), "⚠️")) {
       // has already liked this note
       return
     }
@@ -122,33 +192,43 @@ class Account(
     note.event?.let {
       val event = ReportEvent.create(it, type, loggedIn.privKey!!)
       Client.send(event)
-      LocalCache.consume(event)
+      LocalCache.consume(event, null)
     }
   }
 
   fun report(user: User, type: ReportEvent.ReportType) {
     if (!isWriteable()) return
 
-    if (
-      user.reports.firstOrNull { it.author == userProfile() && it.event is ReportEvent && (it.event as ReportEvent).reportType.contains(type) } != null
-    ) {
+    if (user.hasReport(userProfile(), type)) {
       // has already reported this note
       return
     }
 
     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
 
-    val currentTime = Date().time / 1000
-
-    if (
-      note.boosts.firstOrNull { it.author == userProfile() && (it?.event?.createdAt ?: 0) > currentTime - (60 * 5)} != null // 5 minute protection
-    ) {
+    if (note.hasBoostedInTheLast5Minutes(userProfile())) {
       // has already bosted in the past 5mins 
       return
     }
@@ -169,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 {
@@ -191,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)
     }
@@ -232,22 +315,58 @@ class Account(
       privateKey = loggedIn.privKey!!
     )
     Client.send(signedEvent)
-    LocalCache.consume(signedEvent)
+    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
     )
     Client.send(signedEvent)
-    LocalCache.consume(signedEvent)
+    LocalCache.consume(signedEvent, null)
   }
 
   fun sendCreateNewChannel(name: String, about: String, picture: String) {
@@ -269,23 +388,36 @@ class Account(
   }
 
   fun joinChannel(idHex: String) {
-    followingChannels.add(idHex)
-    invalidateData()
+    followingChannels = followingChannels + idHex
+    live.invalidateData()
+
+    saveable.invalidateData()
   }
 
   fun leaveChannel(idHex: String) {
-    followingChannels.remove(idHex)
-    invalidateData()
+    followingChannels = followingChannels - idHex
+    live.invalidateData()
+
+    saveable.invalidateData()
   }
 
   fun hideUser(pubkeyHex: String) {
-    hiddenUsers.add(pubkeyHex)
-    invalidateData()
+    hiddenUsers = hiddenUsers + pubkeyHex
+    live.invalidateData()
+    saveable.invalidateData()
   }
 
   fun showUser(pubkeyHex: String) {
-    hiddenUsers.remove(pubkeyHex)
-    invalidateData()
+    hiddenUsers = hiddenUsers - pubkeyHex
+    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) {
@@ -304,7 +436,7 @@ class Account(
     Client.send(event)
     LocalCache.consume(event)
 
-    followingChannels.add(event.id.toHex())
+    joinChannel(event.id.toHex())
   }
 
   fun decryptContent(note: Note): String? {
@@ -337,62 +469,160 @@ class Account(
     }
   }
 
-  fun activeRelays(): Array<Relay>? {
-    return userProfile().relays?.map { Relay(it.key, it.value.read, it.value.write) }?.toTypedArray()
+  fun addDontTranslateFrom(languageCode: String) {
+    dontTranslateFrom = dontTranslateFrom.plus(languageCode)
+    liveLanguages.invalidateData()
+
+    saveable.invalidateData()
   }
 
-  init {
-    userProfile().subscribe(object: User.Listener() {
-      override fun onRelayChange() {
-        Client.disconnect()
-        Client.connect(activeRelays() ?: Constants.defaultRelays)
-        RelayPool.requestAndWatch()
-      }
-    })
+  fun updateTranslateTo(languageCode: String) {
+    translateTo = languageCode
+    liveLanguages.invalidateData()
+
+    saveable.invalidateData()
   }
 
-  // Observers line up here.
-  val live: AccountLiveData = AccountLiveData(this)
+  fun prefer(source: String, target: String, preference: String) {
+    languagePreferences = languagePreferences + Pair("$source,$target", preference)
+    saveable.invalidateData()
+  }
 
-  // Refreshes observers in batches.
-  var handlerWaiting = false
-  @Synchronized
-  fun invalidateData() {
-    if (handlerWaiting) return
+  fun preferenceBetween(source: String, target: String): String? {
+    return languagePreferences.get("$source,$target")
+  }
 
-    handlerWaiting = true
-    val scope = CoroutineScope(Job() + Dispatchers.Default)
-    scope.launch {
-      delay(100)
-      live.refresh()
-      handlerWaiting = false
+  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 isHidden(user: User) = user !in hiddenUsers()
+  fun activeRelays(): Array<Relay>? {
+    return userProfile().relays?.map {
+      val localFeedTypes = localRelays.firstOrNull() { localRelay -> localRelay.url == it.key }?.feedTypes ?: FeedType.values().toSet()
+      Relay(it.key, it.value.read, it.value.write, localFeedTypes)
+    }?.toTypedArray()
+  }
+
+  fun convertLocalRelays(): Array<Relay> {
+    return localRelays.map {
+      Relay(it.url, it.read, it.write, it.feedTypes)
+    }.toTypedArray()
+  }
+
+  fun reconnectIfRelaysHaveChanged() {
+    val newRelaySet = activeRelays() ?: convertLocalRelays()
+    if (!Client.isSameRelaySetConfig(newRelaySet)) {
+      Client.disconnect()
+      Client.connect(newRelaySet)
+      RelayPool.requestAndWatch()
+    }
+  }
+
+  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.reportsBy( userProfile().follows ).size < 5
+        && user.reportAuthorsBy( userProfile().follows ).size < 5
   }
 
   fun isAcceptableDirect(note: Note): Boolean {
     return note.reportsBy( userProfile() ).isEmpty()  // if user has not reported this post
-        && note.reportsBy( userProfile().follows ).size < 5 // if it has 5 reports by reliable users
+        && note.reportAuthorsBy( userProfile().follows ).size < 5 // if it has 5 reports by reliable users
   }
 
   fun isAcceptable(note: Note): Boolean {
     return note.author?.let { isAcceptable(it) } ?: true // if user hasn't hided this author
         && isAcceptableDirect(note)
         && (note.event !is RepostEvent
-          || (note.event is RepostEvent && note.replyTo?.firstOrNull { isAcceptableDirect(note) } != null)
+          || (note.event is RepostEvent && note.replyTo?.firstOrNull { isAcceptableDirect(it) } != null)
         ) // is not a reaction about a blocked post
   }
 
+  fun getRelevantReports(note: Note): Set<Note> {
+    val followsPlusMe = userProfile().follows + userProfile()
+
+    val innerReports = if (note.event is RepostEvent) {
+      note.replyTo?.map { getRelevantReports(it) }?.flatten() ?: emptyList()
+    } else {
+      emptyList()
+    }
+
+    return (note.reportsBy(followsPlusMe) +
+          (note.author?.reportsBy(followsPlusMe) ?: emptyList()) +
+          innerReports).toSet()
+  }
+
+  fun saveRelayList(value: List<RelaySetupInfo>) {
+    localRelays = value.toSet()
+    sendNewRelayList(value.associate { it.url to ContactListEvent.ReadWrite(it.read, it.write) } )
+
+    saveable.invalidateData()
+  }
+
+  init {
+    backupContactList?.let {
+      println("Loading saved contacts ${it.toJson()}")
+      if (userProfile().latestContactList == null) {
+        LocalCache.consume(it)
+      }
+    }
+
+    // Observes relays to restart connections
+    userProfile().live().relays.observeForever {
+      GlobalScope.launch(Dispatchers.IO) {
+        reconnectIfRelaysHaveChanged()
+      }
+    }
+
+    // saves contact list for the next time.
+    userProfile().live().follows.observeForever {
+      updateContactListTo(userProfile().latestContactList)
+    }
+
+    // imports transient blocks due to spam.
+    LocalCache.antiSpam.liveSpam.observeForever {
+      GlobalScope.launch(Dispatchers.IO) {
+        it.cache.spamMessages.snapshot().values.forEach {
+          if (it.pubkeyHex !in transientHiddenUsers && it.duplicatedMessages.size >= 5) {
+            val userToBlock = LocalCache.getOrCreateUser(it.pubkeyHex)
+            if (userToBlock != userProfile() && userToBlock !in userProfile().follows) {
+              transientHiddenUsers = transientHiddenUsers + it.pubkeyHex
+            }
+          }
+        }
+      }
+    }
+  }
 }
 
 class AccountLiveData(private val account: Account): LiveData<AccountState>(AccountState(account)) {
+  var handlerWaiting = AtomicBoolean()
+
+  @Synchronized
+  fun invalidateData() {
+    if (handlerWaiting.getAndSet(true)) return
+
+    handlerWaiting.set(true)
+    val scope = CoroutineScope(Job() + Dispatchers.Default)
+    scope.launch {
+      try {
+        delay(100)
+        refresh()
+      } finally {
+        withContext(NonCancellable) {
+          handlerWaiting.set(false)
+        }
+      }
+    }
+  }
+
   fun refresh() {
     postValue(AccountState(account))
   }

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

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

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

@@ -1,15 +1,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,6 +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 ?: idDisplayNote()
+    }
+
     @Synchronized
     fun addNote(note: Note) {
         notes[note.idHex] = note
@@ -30,9 +36,9 @@ class Channel(val id: ByteArray) {
         live.refresh()
     }
 
-    fun profilePicture(): String {
+    fun profilePicture(): String? {
         if (info.picture.isNullOrBlank()) info.picture = null
-        return info.picture ?: "https://robohash.org/${idHex}.png"
+        return info.picture
     }
 
     fun anyNameStartsWith(prefix: String): Boolean {
@@ -43,8 +49,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
     }
 }
 
@@ -56,12 +75,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
@@ -11,6 +10,17 @@ import nostr.postr.toHex
 /** Makes the distinction between String and Hex **/
 typealias HexKey = String
 
+typealias NPubKey = String
+typealias NoteId = String
+
+fun NPubKey.toDisplayKey(): String {
+  return this.toShortenHex()
+}
+
+fun NoteId.toDisplayId(): String {
+  return this.toShortenHex()
+}
+
 fun ByteArray.toNote() = Bech32.encodeBytes(hrp = "note", this, Bech32.Encoding.Bech32)
 
 fun ByteArray.toHexKey(): HexKey {
@@ -30,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

@@ -10,16 +10,26 @@ import com.vitorpamplona.amethyst.service.model.ChannelHideMessageEvent
 import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
 import com.vitorpamplona.amethyst.service.model.ChannelMetadataEvent
 import com.vitorpamplona.amethyst.service.model.ChannelMuteUserEvent
+import com.vitorpamplona.amethyst.service.model.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
+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
@@ -36,20 +46,41 @@ 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(pubkey: ByteArray): User {
-    val key = pubkey.toHexKey()
+  fun getOrCreateUser(key: HexKey): User {
     return users[key] ?: run {
-      val answer = User(pubkey)
+      val answer = User(key)
       users.put(key, answer)
       answer
     }
   }
 
+  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 {
@@ -59,10 +90,21 @@ object LocalCache {
     }
   }
 
+  fun checkGetOrCreateChannel(key: String): Channel? {
+    return try {
+      val checkHex = Hex.decode(key).toNote() // Checks if this is a valid Hex
+      getOrCreateChannel(key)
+    } catch (e: IllegalArgumentException) {
+      Log.e("LocalCache", "Invalid Key to create channel: $key", e)
+      null
+    }
+  }
+
+
   @Synchronized
   fun getOrCreateChannel(key: String): Channel {
     return channels[key] ?: run {
-      val answer = Channel(key.toByteArray())
+      val answer = Channel(key)
       channels.put(key, answer)
       answer
     }
@@ -71,20 +113,21 @@ object LocalCache {
 
   fun consume(event: MetadataEvent) {
     // new event
-    val oldUser = getOrCreateUser(event.pubKey)
-    if (event.createdAt > oldUser.updatedMetadataAt) {
-      //Log.d("MT", "New User ${users.size} ${event.contactMetaData.name}")
-
+    val oldUser = getOrCreateUser(event.pubKey.toHexKey())
+    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)}")
     }
@@ -95,26 +138,35 @@ object LocalCache {
       .format(DateTimeFormatter.ofPattern("uuuu MMM d hh:mm a"))
   }
 
+
   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())
 
-    val author = getOrCreateUser(event.pubKey)
-
-    if (relay != null)
-      author.addRelay(relay, event.createdAt)
+    if (relay != null) {
+      author.addRelayBeingUsed(relay, event.createdAt)
+      note.addRelay(relay)
+    }
 
     // Already processed this event.
     if (note.event != null) return
 
-    val mentions = Collections.synchronizedList(event.mentions.map { getOrCreateUser(decodePublicKey(it)) })
-    val replyTo = Collections.synchronizedList(event.replyTos.map { getOrCreateNote(it) }.toMutableList())
+    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.notes.add(note)
+    author.addNote(note)
 
     // Adds notifications to users.
     mentions.forEach {
@@ -132,20 +184,40 @@ object LocalCache {
     refreshObservers()
   }
 
+  private fun replyToWithoutCitations(event: TextNoteEvent): List<String> {
+    var citations = mutableSetOf<String>()
+    // Removes citations from replies:
+    val matcher = tagSearch.matcher(event.content)
+    while (matcher.find()) {
+      try {
+        val tag = matcher.group(1)?.let { event.tags[it.toInt()] }
+        if (tag != null && tag[0] == "e") {
+          citations.add(tag[1])
+        }
+      } catch (e: Exception) {
+
+      }
+    }
+
+    return event.replyTos.filter { it !in citations }
+  }
+
   fun consume(event: RecommendRelayEvent) {
     //Log.d("RR", event.toJson())
   }
 
   fun consume(event: ContactListEvent) {
-    val user = getOrCreateUser(event.pubKey)
+    val user = getOrCreateUser(event.pubKey.toHexKey())
+
+    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
 
-    if (event.createdAt > user.updatedFollowsAt) {
-      //Log.d("CL", "AAA ${user.toBestDisplayName()} ${event.follows.size}")
       user.updateFollows(
         event.follows.map {
           try {
             val pubKey = decodePublicKey(it.pubKeyHex)
-            getOrCreateUser(pubKey)
+            getOrCreateUser(pubKey.toHexKey())
           } catch (e: Exception) {
             println("Could not parse Hex key: ${it.pubKeyHex}")
             println("UpdateFollows: " + event.toJson())
@@ -156,6 +228,7 @@ object LocalCache {
         event.createdAt
       )
 
+      // Saves relay list only if it's a user that is currently been seen
       try {
         if (event.content.isNotEmpty()) {
           val relays: Map<String, ContactListEvent.ReadWrite> =
@@ -163,29 +236,39 @@ object LocalCache {
               event.content,
               object : TypeToken<Map<String, ContactListEvent.ReadWrite>>() {}.type
             )
+
           user.updateRelays(relays)
         }
       } catch (e: Exception) {
+        println("relay import issue")
         e.printStackTrace()
       }
 
-      user.latestContactList = event
+      Log.d(
+        "CL",
+        "AAA ${user.toBestDisplayName()} ${event.follows.size}"
+      )
     }
   }
 
-  fun consume(event: PrivateDmEvent) {
+  fun consume(event: PrivateDmEvent, 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)
-    val recipient = event.recipientPubKey?.let { getOrCreateUser(it) }
+    val recipient = event.recipientPubKey?.let { getOrCreateUser(it.toHexKey()) }
 
     //Log.d("PM", "${author.toBestDisplayName()} to ${recipient?.toBestDisplayName()}")
 
-    val repliesTo = event.tags.filter { it.firstOrNull() == "e" }.mapNotNull { it.getOrNull(1) }.map { getOrCreateNote(it) }.toMutableList()
-    val mentions = event.tags.filter { it.firstOrNull() == "p" }.mapNotNull { it.getOrNull(1) }.map { getOrCreateUser(decodePublicKey(it)) }
+    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)
 
@@ -198,7 +281,41 @@ object LocalCache {
   }
 
   fun consume(event: DeletionEvent) {
-    //Log.d("DEL", event.toJson())
+    var deletedAtLeastOne = false
+
+    event.deleteEvents.mapNotNull { notes[it] }.forEach { deleteNote ->
+      // must be the same author
+      if (deleteNote.author?.pubkeyHex == event.pubKey.toHexKey()) {
+        deleteNote.author?.removeNote(deleteNote)
+
+        // reverts the add
+        deleteNote.mentions?.forEach { user ->
+          user.removeTaggedPost(deleteNote)
+          user.removeReport(deleteNote)
+        }
+
+        deleteNote.replyTo?.forEach { replyingNote ->
+          replyingNote.author?.removeTaggedPost(deleteNote)
+        }
+
+        // Counts the replies
+        deleteNote.replyTo?.forEach { masterNote ->
+          masterNote.removeReply(deleteNote)
+          masterNote.removeBoost(deleteNote)
+          masterNote.removeReaction(deleteNote)
+          masterNote.removeZap(deleteNote)
+          masterNote.removeReport(deleteNote)
+        }
+
+        notes.remove(deleteNote.idHex)
+
+        deletedAtLeastOne = true
+      }
+    }
+
+    if (deletedAtLeastOne) {
+      live.invalidateData()
+    }
   }
 
   fun consume(event: RepostEvent) {
@@ -209,14 +326,14 @@ object LocalCache {
 
     //Log.d("TN", "New Boost (${notes.size},${users.size}) ${note.author?.toBestDisplayName()} ${formattedDateTime(event.createdAt)}")
 
-    val author = getOrCreateUser(event.pubKey)
-    val mentions = event.originalAuthor.map { getOrCreateUser(decodePublicKey(it)) }.toList()
-    val repliesTo = event.boostedPost.map { getOrCreateNote(it) }.toMutableList()
+    val author = getOrCreateUser(event.pubKey.toHexKey())
+    val mentions = event.originalAuthor.mapNotNull { checkGetOrCreateUser(it) }
+    val repliesTo = event.boostedPost.mapNotNull { checkGetOrCreateNote(it) }
 
     note.loadEvent(event, author, mentions, repliesTo)
 
     // Prepares user's profile view.
-    author.notes.add(note)
+    author.addNote(note)
 
     // Adds notifications to users.
     mentions.forEach {
@@ -235,14 +352,14 @@ object LocalCache {
   }
 
   fun consume(event: ReactionEvent) {
-    val note = getOrCreateNote(event.id.toHex())
+    val note = getOrCreateNote(event.id.toHexKey())
 
     // Already processed this event.
     if (note.event != null) return
 
-    val author = getOrCreateUser(event.pubKey)
-    val mentions = event.originalAuthor.map { getOrCreateUser(decodePublicKey(it)) }
-    val repliesTo = event.originalPost.map { getOrCreateNote(it) }.toMutableList()
+    val author = getOrCreateUser(event.pubKey.toHexKey())
+    val mentions = event.originalAuthor.mapNotNull { checkGetOrCreateUser(it) }
+    val repliesTo = event.originalPost.mapNotNull { checkGetOrCreateNote(it) }
 
     note.loadEvent(event, author, mentions, repliesTo)
 
@@ -279,22 +396,29 @@ 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)
-    val mentions = event.reportedAuthor.map { getOrCreateUser(decodePublicKey(it)) }
-    val repliesTo = event.reportedPost.map { getOrCreateNote(it) }.toMutableList()
+    val mentions = event.reportedAuthor.mapNotNull { checkGetOrCreateUser(it) }
+    val repliesTo = event.reportedPost.mapNotNull { checkGetOrCreateNote(it) }
 
     note.loadEvent(event, author, mentions, repliesTo)
 
     //Log.d("RP", "New Report ${event.content} by ${note.author?.toBestDisplayName()} ${formattedDateTime(event.createdAt)}")
     // Adds notifications to users.
-    mentions.forEach {
-      it.addReport(note)
+    if (repliesTo.isEmpty()) {
+      mentions.forEach {
+        it.addReport(note)
+      }
     }
     repliesTo.forEach {
       it.addReport(note)
@@ -305,7 +429,7 @@ object LocalCache {
     //Log.d("MT", "New Event ${event.content} ${event.id.toHex()}")
     // new event
     val oldChannel = getOrCreateChannel(event.id.toHex())
-    val author = getOrCreateUser(event.pubKey)
+    val author = getOrCreateUser(event.pubKey.toHexKey())
     if (event.createdAt > oldChannel.updatedMetadataAt) {
       if (oldChannel.creator == null || oldChannel.creator == author) {
         oldChannel.updateChannelInfo(author, event.channelInfo, event.createdAt)
@@ -313,7 +437,7 @@ object LocalCache {
         val note = getOrCreateNote(event.id.toHex())
         oldChannel.addNote(note)
         note.channel = oldChannel
-        note.loadEvent(event, author, emptyList(), mutableListOf())
+        note.loadEvent(event, author, emptyList(), emptyList())
 
         refreshObservers()
       }
@@ -326,8 +450,8 @@ object LocalCache {
     if (event.channel.isNullOrBlank()) return
 
     // new event
-    val oldChannel = getOrCreateChannel(event.channel)
-    val author = getOrCreateUser(event.pubKey)
+    val oldChannel = checkGetOrCreateChannel(event.channel) ?: return
+    val author = getOrCreateUser(event.pubKey.toHexKey())
     if (event.createdAt > oldChannel.updatedMetadataAt) {
       if (oldChannel.creator == null || oldChannel.creator == author) {
         oldChannel.updateChannelInfo(author, event.channelInfo, event.createdAt)
@@ -335,7 +459,7 @@ object LocalCache {
         val note = getOrCreateNote(event.id.toHex())
         oldChannel.addNote(note)
         note.channel = oldChannel
-        note.loadEvent(event, author, emptyList(), mutableListOf())
+        note.loadEvent(event, author, emptyList(), emptyList())
 
         refreshObservers()
       }
@@ -344,25 +468,34 @@ object LocalCache {
     }
   }
 
-  fun consume(event: ChannelMessageEvent) {
+  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)
 
+    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)
-    val mentions = Collections.synchronizedList(event.mentions.map { getOrCreateUser(decodePublicKey(it)) })
-    val replyTo = Collections.synchronizedList(
-      event.replyTos
-        .map { getOrCreateNote(it) }
-        .filter { it.event !is ChannelCreateEvent }
-        .toMutableList()
-    )
+    val mentions = event.mentions.mapNotNull { checkGetOrCreateUser(it) }
+    val replyTo = event.replyTos
+      .mapNotNull { checkGetOrCreateNote(it) }
+      .filter { it.event !is ChannelCreateEvent }
 
     note.channel = channel
     note.loadEvent(event, author, mentions, replyTo)
@@ -393,11 +526,77 @@ object LocalCache {
 
   }
 
+  fun consume(event: LnZapEvent) {
+    val note = getOrCreateNote(event.id.toHexKey())
+
+    // Already processed this event.
+    if (note.event != null) return
+
+    val author = getOrCreateUser(event.pubKey.toHexKey())
+    val mentions = event.zappedAuthor.mapNotNull { checkGetOrCreateUser(it) }
+    val repliesTo = event.zappedPost.mapNotNull { checkGetOrCreateNote(it) }
+
+    note.loadEvent(event, author, mentions, repliesTo)
+
+    val zapRequest = event.containedPost?.id?.toHexKey()?.let { getOrCreateNote(it) }
+    if (zapRequest == null) {
+      Log.e("ZP","Zap Request not found. Unable to process Zap {${event.toJson()}}")
+      return
+    }
+
+    //Log.d("ZP", "New ZapEvent ${event.content} (${notes.size},${users.size}) ${note.author?.toBestDisplayName()} ${formattedDateTime(event.createdAt)}")
+
+    // Adds notifications to users.
+    mentions.forEach {
+      it.addTaggedPost(note)
+    }
+    repliesTo.forEach {
+      it.author?.addTaggedPost(note)
+    }
+
+    repliesTo.forEach {
+      it.addZap(zapRequest, note)
+    }
+    mentions.forEach {
+      it.addZap(zapRequest, note)
+    }
+  }
+
+  fun consume(event: LnZapRequestEvent) {
+    val note = getOrCreateNote(event.id.toHexKey())
+
+    // Already processed this event.
+    if (note.event != null) return
+
+    val author = getOrCreateUser(event.pubKey.toHexKey())
+    val mentions = event.zappedAuthor.mapNotNull { checkGetOrCreateUser(it) }
+    val repliesTo = event.zappedPost.mapNotNull { checkGetOrCreateNote(it) }
+
+    note.loadEvent(event, author, mentions, repliesTo)
+
+    //Log.d("ZP", "New Zap Request ${event.content} (${notes.size},${users.size}) ${note.author?.toBestDisplayName()} ${formattedDateTime(event.createdAt)}")
+
+    // Adds notifications to users.
+    mentions.forEach {
+      it.addTaggedPost(note)
+    }
+    repliesTo.forEach {
+      it.author?.addTaggedPost(note)
+    }
+
+    repliesTo.forEach {
+      it.addZap(note, null)
+    }
+    mentions.forEach {
+      it.addZap(note, null)
+    }
+  }
+
   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)
     }
   }
 
@@ -406,28 +605,156 @@ object LocalCache {
       (it.event is TextNoteEvent && it.event?.content?.contains(text, true) ?: false)
         || (it.event is ChannelMessageEvent && it.event?.content?.contains(text, true) ?: false)
         || it.idHex.startsWith(text, true)
-        || it.id.toNote().startsWith(text, true)
+        || it.idNote().startsWith(text, true)
     }
   }
 
   fun findChannelsStartingWith(text: String): List<Channel> {
     return channels.values.filter {
-      it.anyNameStartsWith(text)
+        it.anyNameStartsWith(text)
         || it.idHex.startsWith(text, true)
-        || it.id.toNote().startsWith(text, true)
+        || it.idNote().startsWith(text, true)
     }
   }
 
+  fun cleanObservers() {
+    notes.forEach {
+      it.value.clearLive()
+    }
+
+    users.forEach {
+      it.value.clearLive()
+    }
+  }
+
+  fun pruneOldAndHiddenMessages(account: Account) {
+    channels.forEach {
+      val toBeRemoved = it.value.pruneOldAndHiddenMessages(account)
+
+      toBeRemoved.forEach {
+        notes.remove(it.idHex)
+        // Doesn't need to clean up the replies and mentions.. Too small to matter.
+
+        // reverts the add
+        it.mentions?.forEach { user ->
+          user.removeTaggedPost(it)
+        }
+        it.replyTo?.forEach { replyingNote ->
+          replyingNote.author?.removeTaggedPost(it)
+        }
+
+        // Counts the replies
+        it.replyTo?.forEach { replyingNote ->
+          it.removeReply(it)
+        }
+      }
+
+      println("PRUNE: ${toBeRemoved.size} messages removed from ${it.value.info.name}")
+    }
+  }
+
+  fun pruneNonFollows(account: Account) {
+    val follows = account.userProfile().follows
+    val knownPMs = account.userProfile().privateChatrooms.filter {
+      account.userProfile().hasSentMessagesTo(it.key) && account.isAcceptable(it.key)
+    }
+
+    val followsFollow = follows.map {
+      it.follows
+    }.flatten()
+
+    val followSet = follows.plus(knownPMs).plus(account.userProfile()).plus(followsFollow)
+
+    val toBeRemoved = notes
+      .filter {
+        (it.value.author == null || it.value.author!! !in followSet) && it.value.event?.kind == TextNoteEvent.kind && it.value.liveSet?.isInUse() != true
+      }
+
+    toBeRemoved.forEach {
+      notes.remove(it.key)
+    }
+
+    val toBeRemovedUsers = users
+      .filter {
+        (it.value !in followSet) && it.value.liveSet?.isInUse() != true
+      }
+
+    toBeRemovedUsers.forEach {
+      users.remove(it.key)
+    }
+
+    println("PRUNE: ${toBeRemoved.size} messages removed because they came from NonFollows")
+    println("PRUNE: ${toBeRemovedUsers.size} users removed because are NonFollows")
+  }
+
+  fun pruneHiddenMessages(account: Account) {
+    val toBeRemoved = account.hiddenUsers.map {
+      users[it]?.notes ?: emptySet()
+    }.flatten()
+
+    account.hiddenUsers.forEach {
+      users[it]?.clearNotes()
+    }
+
+    toBeRemoved.forEach {
+      it.author?.removeNote(it)
+
+      // reverts the add
+      it.mentions?.forEach { user ->
+        user.removeTaggedPost(it)
+      }
+      it.replyTo?.forEach { replyingNote ->
+        replyingNote.author?.removeTaggedPost(it)
+      }
+
+      // Counts the replies
+      it.replyTo?.forEach { masterNote ->
+        masterNote.removeReply(it)
+        masterNote.removeBoost(it)
+        masterNote.removeReaction(it)
+        masterNote.removeZap(it)
+        masterNote.removeReport(it)
+      }
+
+      notes.remove(it.idHex)
+    }
+
+    println("PRUNE: ${toBeRemoved.size} messages removed because they were Hidden")
+  }
+
   // Observers line up here.
   val live: LocalCacheLiveData = LocalCacheLiveData(this)
 
   private fun refreshObservers() {
-    live.refresh()
+    live.invalidateData()
   }
 }
 
 class LocalCacheLiveData(val cache: LocalCache): LiveData<LocalCacheState>(LocalCacheState(cache)) {
-  fun refresh() {
+
+  // Refreshes observers in batches.
+  var handlerWaiting = AtomicBoolean()
+
+  @Synchronized
+  fun invalidateData() {
+    if (!hasActiveObservers()) return
+    if (handlerWaiting.getAndSet(true)) return
+
+    handlerWaiting.set(true)
+    val scope = CoroutineScope(Job() + Dispatchers.Main)
+    scope.launch {
+      try {
+        delay(100)
+        refresh()
+      } finally {
+        withContext(NonCancellable) {
+          handlerWaiting.set(false)
+        }
+      }
+    }
+  }
+
+  private fun refresh() {
     postValue(LocalCacheState(cache))
   }
 }

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

@@ -2,48 +2,66 @@ package com.vitorpamplona.amethyst.model
 
 import androidx.lifecycle.LiveData
 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.delay
 import kotlinx.coroutines.launch
-import com.vitorpamplona.amethyst.service.relays.Relay
 import nostr.postr.events.Event
 
-class Note(val idHex: String) {
-    // These fields are always available.
-    // They are immutable
-    val id = Hex.decode(idHex)
-    val idDisplayNote = id.toNote().toShortenHex()
+val tagSearch = Pattern.compile("(?:\\s|\\A)\\#\\[([0-9]+)\\]")
 
+class Note(val idHex: String) {
     // These fields are only available after the Text Note event is received.
     // They are immutable after that.
     var event: Event? = null
     var author: User? = null
     var mentions: List<User>? = null
-    var replyTo: MutableList<Note>? = null
+    var replyTo: List<Note>? = null
 
     // These fields are updated every time an event related to this note is received.
-    val replies = Collections.synchronizedSet(mutableSetOf<Note>())
-    val reactions = Collections.synchronizedSet(mutableSetOf<Note>())
-    val boosts = Collections.synchronizedSet(mutableSetOf<Note>())
-    val reports = Collections.synchronizedSet(mutableSetOf<Note>())
+    var replies = setOf<Note>()
+        private set
+    var reactions = setOf<Note>()
+        private set
+    var boosts = setOf<Note>()
+        private set
+    var reports = mapOf<User, Set<Note>>()
+        private set
+    var zaps = mapOf<Note, Note?>()
+        private set
+
+    var relays = setOf<String>()
+        private set
 
     var channel: Channel? = null
 
-    fun loadEvent(event: Event, author: User, mentions: List<User>, replyTo: MutableList<Note>) {
+    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
 
-        invalidateData(live)
+        liveSet?.metadata?.invalidateData()
     }
 
     fun formattedDateTime(timestamp: Long): String {
@@ -51,97 +69,269 @@ 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 (replies.add(note))
-            invalidateData(liveReplies)
+        if (note !in replies) {
+            replies = replies + note
+            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 (boosts.add(note))
-            invalidateData(liveBoosts)
+        if (note !in boosts) {
+            boosts = boosts + note
+            liveSet?.boosts?.invalidateData()
+        }
+    }
+
+    fun addZap(zapRequest: Note, zap: Note?) {
+        if (zapRequest !in zaps.keys) {
+            zaps = zaps + Pair(zapRequest, zap)
+            liveSet?.zaps?.invalidateData()
+        } else if (zapRequest in zaps.keys && zaps[zapRequest] == null) {
+            zaps = zaps + Pair(zapRequest, zap)
+            liveSet?.zaps?.invalidateData()
+        }
     }
 
     fun addReaction(note: Note) {
-        if (reactions.add(note))
-            invalidateData(liveReactions)
+        if (note !in reactions) {
+            reactions = reactions + note
+            liveSet?.reactions?.invalidateData()
+        }
     }
 
     fun addReport(note: Note) {
-        if (reports.add(note))
-            invalidateData(liveReports)
+        val author = note.author ?: return
+
+        if (author !in reports.keys) {
+            reports = reports + Pair(author, setOf(note))
+            liveSet?.reports?.invalidateData()
+        } else if (reports[author]?.contains(note) == false) {
+            reports = reports + Pair(author, (reports[author] ?: emptySet()) + note)
+            liveSet?.reports?.invalidateData()
+        }
+    }
+
+    fun addRelay(relay: Relay) {
+        if (relay.url !in relays) {
+            relays = relays + relay.url
+            liveSet?.relays?.invalidateData()
+        }
+    }
+
+    fun isZappedBy(user: User): Boolean {
+        // Zaps who the requester was the user
+        return zaps.any { it.key.author == user }
     }
 
     fun isReactedBy(user: User): Boolean {
-        return synchronized(reactions) {
-            reactions.any { it.author == user }
-        }
+        return reactions.any { it.author == user }
     }
 
     fun isBoostedBy(user: User): Boolean {
-        return synchronized(boosts) {
-            boosts.any { it.author == user }
-        }
+        return boosts.any { it.author == user }
     }
 
-    fun reportsBy(user: User): List<Note> {
-        return synchronized(reports) {
-            reports.filter { it.author == user }
-        }
+    fun reportsBy(user: User): Set<Note> {
+        return reports[user] ?: emptySet()
+    }
+
+    fun reportAuthorsBy(users: Set<User>): List<User> {
+        return reports.keys.filter { it in users }
     }
 
     fun reportsBy(users: Set<User>): List<Note> {
-        return synchronized(reports) {
-            reports.filter { it.author in users }
-        }
+        return reportAuthorsBy(users).mapNotNull {
+            reports[it]
+        }.flatten()
     }
 
-    // Observers line up here.
-    val live: NoteLiveData = NoteLiveData(this)
+    fun zappedAmount(): BigDecimal {
+        return zaps.mapNotNull { it.value?.event }
+            .filterIsInstance<LnZapEvent>()
+            .mapNotNull {
+                it.amount
+            }.sumOf { it }
+    }
 
-    val liveReactions: NoteLiveData = NoteLiveData(this)
-    val liveBoosts: NoteLiveData = NoteLiveData(this)
-    val liveReplies: NoteLiveData = NoteLiveData(this)
-    val liveReports: NoteLiveData = NoteLiveData(this)
+    fun hasAnyReports(): Boolean {
+        val dayAgo = Date().time / 1000 - 24*60*60
+        return reports.isNotEmpty() ||
+          (author?.reports?.values?.filter {
+              it.firstOrNull { ( it.event?.createdAt ?: 0 ) > dayAgo } != null
+          }?.isNotEmpty() ?: false)
+    }
 
-    // Refreshes observers in batches.
-    var handlerWaiting = false
-    @Synchronized
-    fun invalidateData(live: NoteLiveData) {
-        if (handlerWaiting) return
+    fun directlyCiteUsers(): Set<User> {
+        val matcher = tagSearch.matcher(event?.content ?: "")
+        val returningList = mutableSetOf<User>()
+        while (matcher.find()) {
+            try {
+                val tag = matcher.group(1)?.let { event?.tags?.get(it.toInt()) }
+                if (tag != null && tag[0] == "p") {
+                    LocalCache.checkGetOrCreateUser(tag[1])?.let {
+                        returningList.add(it)
+                    }
+                }
+            } catch (e: Exception) {
 
-        handlerWaiting = true
-        val scope = CoroutineScope(Job() + Dispatchers.Default)
-        scope.launch {
-            delay(100)
-            live.refresh()
-            handlerWaiting = false
+            }
+        }
+        return returningList
+    }
+
+    fun directlyCites(userProfile: User): Boolean {
+        return author == userProfile
+          || (userProfile in directlyCiteUsers())
+          || (event is ReactionEvent && replyTo?.lastOrNull()?.directlyCites(userProfile) == true)
+          || (event is RepostEvent && replyTo?.lastOrNull()?.directlyCites(userProfile) == true)
+    }
+
+    fun isNewThread(): Boolean {
+        return event is RepostEvent || replyTo == null || replyTo?.size == 0
+    }
+
+    fun hasZapped(loggedIn: User): Boolean {
+        return zaps.any { it.key.author == loggedIn }
+    }
+
+    fun hasReacted(loggedIn: User, content: String): Boolean {
+        return reactedBy(loggedIn, content).isNotEmpty()
+    }
+
+    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
+    }
+
+    fun boostedBy(loggedIn: User): List<Note> {
+        return boosts.filter { it.author == loggedIn }
+    }
+
+    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)
+        }
+    }
+
     fun refresh() {
         postValue(NoteState(note))
     }

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

@@ -0,0 +1,14 @@
+package com.vitorpamplona.amethyst.model
+
+import com.vitorpamplona.amethyst.service.relays.FeedType
+
+data class RelaySetupInfo(
+    val url: String,
+    val read: Boolean,
+    val write: Boolean,
+    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,15 +7,16 @@ 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
 import kotlinx.coroutines.launch
 
 object UrlCachedPreviewer {
-  val cache = ConcurrentHashMap<String, UrlInfoItem>()
-  val failures = ConcurrentHashMap<String, Throwable>()
+  var cache = mapOf<String, UrlInfoItem>()
+    private set
+  var failures = mapOf<String, Throwable>()
+    private set
 
   fun previewInfo(url: String, callback: IUrlPreviewCallback? = null) {
     cache[url]?.let {
@@ -32,12 +33,12 @@ object UrlCachedPreviewer {
     scope.launch {
       BahaUrlPreview(url, object : IUrlPreviewCallback {
         override fun onComplete(urlInfo: UrlInfoItem) {
-          cache.put(url, urlInfo)
+          cache = cache + Pair(url, urlInfo)
           callback?.onComplete(urlInfo)
         }
 
         override fun onFailed(throwable: Throwable) {
-          failures.put(url, throwable)
+          failures = failures + Pair(url, throwable)
           callback?.onFailed(throwable)
         }
       }).fetchUrlPreview()

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

@@ -2,135 +2,231 @@ package com.vitorpamplona.amethyst.model
 
 import androidx.lifecycle.LiveData
 import com.vitorpamplona.amethyst.service.NostrSingleUserDataSource
-import com.vitorpamplona.amethyst.service.relays.Client
+import com.vitorpamplona.amethyst.service.model.LnZapEvent
+import com.vitorpamplona.amethyst.service.model.ReportEvent
 import com.vitorpamplona.amethyst.service.relays.Relay
 import com.vitorpamplona.amethyst.ui.note.toShortenHex
-import java.util.Collections
-import java.util.concurrent.ConcurrentHashMap
+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.Event
 import nostr.postr.events.MetadataEvent
 import nostr.postr.toNpub
 
-class User(val pubkey: ByteArray) {
-    val pubkeyHex = pubkey.toHexKey()
-    val pubkeyDisplayHex = pubkey.toNpub().toShortenHex()
+val lnurlpPattern = Pattern.compile("(?i:http|https):\\/\\/((.+)\\/)*\\.well-known\\/lnurlp\\/(.*)")
 
-    var info = UserMetadata()
+class User(val pubkeyHex: String) {
+    var info: UserMetadata? = null
 
-    var updatedMetadataAt: Long = 0;
     var updatedFollowsAt: Long = 0;
-
     var latestContactList: ContactListEvent? = null
-    var latestMetadata: MetadataEvent? = null
 
-    val notes = Collections.synchronizedSet(mutableSetOf<Note>())
-    val follows = Collections.synchronizedSet(mutableSetOf<User>())
+    var follows = setOf<User>()
+        private set
+    var followers = setOf<User>()
+        private set
 
-    val taggedPosts = Collections.synchronizedSet(mutableSetOf<Note>())
+    var notes = setOf<Note>()
+        private set
+    var taggedPosts = setOf<Note>()
+        private set
+
+    var reports = mapOf<User, Set<Note>>()
+        private set
+    var latestReportTime: Long = 0
+
+    var zaps = mapOf<Note, Note?>()
+        private set
 
     var relays: Map<String, ContactListEvent.ReadWrite>? = null
+        private set
 
-    val followers = Collections.synchronizedSet(mutableSetOf<User>())
-    val messages = ConcurrentHashMap<User, MutableSet<Note>>()
+    var relaysBeingUsed = mapOf<String, RelayInfo>()
+        private set
 
-    val reports = Collections.synchronizedSet(mutableSetOf<Note>())
-    val relaysBeingUsed = mutableMapOf<String, RelayInfo>()
+    var privateChatrooms = mapOf<User, Chatroom>()
+        private set
+
+    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 profilePicture(): String {
-        if (info.picture.isNullOrBlank()) info.picture = null
-        return info.picture ?: "https://robohash.org/${pubkeyHex}.png"
+    fun nip05(): String? {
+        return info?.nip05?.ifBlank { null }
+    }
+
+    fun profilePicture(): String? {
+        if (info?.picture.isNullOrBlank()) info?.picture = null
+        return info?.picture
     }
 
     fun follow(user: User, followedAt: Long) {
-        follows.add(user)
-        user.followers.add(this)
+        follows = follows + user
+        user.followers = user.followers + this
 
-        invalidateData()
-        user.invalidateData()
-
-        listeners.forEach {
-            it.onFollowsChange()
-        }
+        liveSet?.follows?.invalidateData()
+        user.liveSet?.follows?.invalidateData()
     }
+
     fun unfollow(user: User) {
-        follows.remove(user)
-        user.followers.remove(this)
+        follows = follows - user
+        user.followers = user.followers - this
 
-        invalidateData()
-        user.invalidateData()
+        liveSet?.follows?.invalidateData()
+        user.liveSet?.follows?.invalidateData()
+    }
 
-        updateSubscribers {
-            it.onFollowsChange()
+    fun follow(users: Set<User>, followedAt: Long) {
+        follows = follows + users
+        users.forEach {
+            if (this !in it.followers && it.liveSet?.isInUse() == true) {
+                it.followers = it.followers + this
+                it.liveSet?.follows?.invalidateData()
+            }
         }
+
+        liveSet?.follows?.invalidateData()
+    }
+
+    fun unfollow(users: Set<User>) {
+        follows = follows - users
+        users.forEach {
+            if (this in it.followers && it.liveSet?.isInUse() == true) {
+                it.followers = it.followers - this
+                it.liveSet?.follows?.invalidateData()
+            }
+        }
+        liveSet?.follows?.invalidateData()
     }
 
     fun addTaggedPost(note: Note) {
-        taggedPosts.add(note)
-        updateSubscribers { it.onNewPosts() }
+        if (note !in taggedPosts) {
+            taggedPosts = taggedPosts + note
+            // No need for Listener yet
+        }
+    }
+
+    fun removeTaggedPost(note: Note) {
+        taggedPosts = taggedPosts - note
+    }
+
+    fun addNote(note: Note) {
+        if (note !in notes) {
+            notes = notes + note
+            // No need for Listener yet
+        }
+    }
+
+    fun removeNote(note: Note) {
+        notes = notes - note
+    }
+
+    fun clearNotes() {
+        notes = setOf<Note>()
     }
 
     fun addReport(note: Note) {
-        if (reports.add(note)) {
-            updateSubscribers { it.onNewReports() }
-            invalidateData()
+        val author = note.author ?: return
+
+        if (author !in reports.keys) {
+            reports = reports + Pair(author, setOf(note))
+            liveSet?.reports?.invalidateData()
+        } else if (reports[author]?.contains(note) == false) {
+            reports = reports + Pair(author, (reports[author] ?: emptySet()) + note)
+            liveSet?.reports?.invalidateData()
+        }
+
+        val reportTime = note.event?.createdAt ?: 0
+        if (reportTime > latestReportTime) {
+            latestReportTime = reportTime
         }
     }
 
-    fun reportsBy(user: User): List<Note> {
-        return synchronized(reports) {
-            reports.filter { it.author == user }
+    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)
+            liveSet?.zaps?.invalidateData()
+        } else if (zapRequest in zaps.keys && zaps[zapRequest] == null) {
+            zaps = zaps + Pair(zapRequest, zap)
+            liveSet?.zaps?.invalidateData()
+        }
+    }
+
+    fun zappedAmount(): BigDecimal {
+        return zaps.mapNotNull { it.value?.event }
+            .filterIsInstance<LnZapEvent>()
+            .mapNotNull {
+                it.amount
+            }.sumOf { it }
+    }
+
+    fun reportsBy(user: User): Set<Note> {
+        return reports[user] ?: emptySet()
+    }
+
+    fun reportAuthorsBy(users: Set<User>): List<User> {
+        return reports.keys.filter { it in users }
+    }
+
     fun reportsBy(users: Set<User>): List<Note> {
-        return synchronized(reports) {
-            reports.filter { it.author in users }
-        }
+        return reportAuthorsBy(users).mapNotNull {
+            reports[it]
+        }.flatten()
     }
 
     @Synchronized
-    fun getOrCreateChannel(user: User): MutableSet<Note> {
-        return messages[user] ?: run {
-            val channel = Collections.synchronizedSet(mutableSetOf<Note>())
-            messages[user] = channel
-            channel
+    fun getOrCreatePrivateChatroom(user: User): Chatroom {
+        return privateChatrooms[user] ?: run {
+            val privateChatroom = Chatroom(setOf<Note>())
+            privateChatrooms = privateChatrooms + Pair(user, privateChatroom)
+            privateChatroom
         }
     }
 
     fun addMessage(user: User, msg: Note) {
-        getOrCreateChannel(user).add(msg)
-        invalidateData()
-        updateSubscribers { it.onNewMessage() }
+        val privateChatroom = getOrCreatePrivateChatroom(user)
+        if (msg !in privateChatroom.roomMessages) {
+            privateChatroom.roomMessages = privateChatroom.roomMessages + msg
+            liveSet?.messages?.invalidateData()
+        }
     }
 
-    data class RelayInfo (
-        val url: String,
-        var lastEvent: Long,
-        var counter: Long
-    )
-
-    fun addRelay(relay: Relay, eventTime: Long) {
-        val here = relaysBeingUsed.get(relay.url)
+    fun addRelayBeingUsed(relay: Relay, eventTime: Long) {
+        val here = relaysBeingUsed[relay.url]
         if (here == null) {
-            relaysBeingUsed.put(relay.url, RelayInfo(relay.url, eventTime, 1) )
+            relaysBeingUsed = relaysBeingUsed + Pair(relay.url, RelayInfo(relay.url, eventTime, 1))
         } else {
             if (eventTime > here.lastEvent) {
                 here.lastEvent = eventTime
@@ -138,122 +234,114 @@ class User(val pubkey: ByteArray) {
             here.counter++
         }
 
-        updateSubscribers { it.onNewRelayInfo() }
+        liveSet?.relayInfo?.invalidateData()
     }
-
+    
     fun updateFollows(newFollows: Set<User>, updateAt: Long) {
-        val toBeAdded = synchronized(follows) {
-            newFollows - follows
-        }
-        val toBeRemoved = synchronized(follows) {
-            follows - newFollows
-        }
-        toBeAdded.forEach {
-            follow(it, updateAt)
-        }
-        toBeRemoved.forEach {
-            unfollow(it)
-        }
+        val toBeAdded = newFollows - follows
+        val toBeRemoved = follows - newFollows
+
+        follow(toBeAdded, updateAt)
+        unfollow(toBeRemoved)
 
         updatedFollowsAt = updateAt
     }
 
     fun updateRelays(relayUse: Map<String, ContactListEvent.ReadWrite>) {
-        if (relays != relayUse) {
-            relays = relayUse
-            listeners.forEach {
-                it.onRelayChange()
+        // no need to test if relays are different. The Account will check for us.
+        relays = relayUse
+        liveSet?.relays?.invalidateData()
+    }
+
+    fun updateUserInfo(newUserInfo: UserMetadata, latestMetadata: MetadataEvent) {
+        info = newUserInfo
+        info?.latestMetadata = latestMetadata
+        info?.updatedMetadataAt = latestMetadata.createdAt
+
+        if (newUserInfo.lud16.isNullOrBlank() && newUserInfo.lud06?.toLowerCase()?.startsWith("lnurl") == true) {
+            try {
+                val url = String(Bech32.decodeBytes(newUserInfo.lud06!!, false).second)
+
+                val matcher = lnurlpPattern.matcher(url)
+                while (matcher.find()) {
+                    val domain = matcher.group(2)
+                    val username = matcher.group(3)
+
+                    info?.lud16 = "$username@$domain"
+                }
+            } catch (t: Throwable) {
+                // Doesn't create errors.
             }
         }
 
-        invalidateData()
-    }
-
-    fun updateUserInfo(newUserInfo: UserMetadata, updateAt: Long) {
-        info = newUserInfo
-        updatedMetadataAt = updateAt
-
-        if (info.picture?.startsWith( "http://") == true) {
-            info.picture = info.picture?.replaceFirst("http://", "https://")
-        }
-
-        if (info.banner?.startsWith( "http://") == true) {
-            info.banner = info.banner?.replaceFirst("http://", "https://")
-        }
-
-        invalidateData()
+        liveSet?.metadata?.invalidateData()
     }
 
     fun isFollowing(user: User): Boolean {
-        return synchronized(follows) {
-            follows.contains(user)
-        }
+        return follows.contains(user)
     }
 
     fun hasSentMessagesTo(user: User?): Boolean {
-        val messagesToUser = messages[user] ?: return false
+        val messagesToUser = privateChatrooms[user] ?: return false
 
-        return synchronized(messagesToUser) {
-            messagesToUser.firstOrNull { this == it.author } != null
+        return messagesToUser.roomMessages.any { this == it.author }
+    }
+
+    fun hasReport(loggedIn: User, type: ReportEvent.ReportType): Boolean {
+        return reports[loggedIn]?.firstOrNull() {
+              it.event is ReportEvent && (it.event as ReportEvent).reportType.contains(type)
+        } != null
+    }
+
+    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!!
     }
 
-    // Model Observers
-    private var listeners = setOf<Listener>()
-
-    fun subscribe(listener: Listener) {
-        listeners = listeners.plus(listener)
-    }
-
-    fun unsubscribe(listener: Listener) {
-        listeners = listeners.minus(listener)
-    }
-
-    abstract class Listener {
-        open fun onRelayChange() = Unit
-        open fun onFollowsChange() = Unit
-        open fun onNewPosts() = Unit
-        open fun onNewMessage() = Unit
-        open fun onNewRelayInfo() = Unit
-        open fun onNewReports() = Unit
-    }
-
-    // Refreshes observers in batches.
-    var modelHandlerWaiting = false
-    @Synchronized
-    fun updateSubscribers(on: (Listener) -> Unit) {
-        if (modelHandlerWaiting) return
-
-        modelHandlerWaiting = true
-        val scope = CoroutineScope(Job() + Dispatchers.Default)
-        scope.launch {
-            delay(100)
-            listeners.forEach {
-                on(it)
-            }
-            modelHandlerWaiting = false
-        }
-    }
-
-    // UI Observers line up here.
-    val live: UserLiveData = UserLiveData(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
+    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
@@ -263,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
@@ -273,6 +365,9 @@ class UserMetadata {
     var main_relay: String? = null
     var twitter: String? = null
 
+    var updatedMetadataAt: Long = 0;
+    var latestMetadata: MetadataEvent? = null
+
     fun anyNameStartsWith(prefix: String): Boolean {
         return listOfNotNull(name, username, display_name, displayName, nip05, lud06, lud16)
               .filter { it.startsWith(prefix, true) }.isNotEmpty()
@@ -280,19 +375,42 @@ class UserMetadata {
 }
 
 class UserLiveData(val user: User): LiveData<UserState>(UserState(user)) {
-    fun refresh() {
+
+    // Refreshes observers in batches.
+    var handlerWaiting = AtomicBoolean()
+
+    @Synchronized
+    fun invalidateData() {
+        if (handlerWaiting.getAndSet(true)) return
+
+        handlerWaiting.set(true)
+        val scope = CoroutineScope(Job() + Dispatchers.Main)
+        scope.launch {
+            try {
+                delay(100)
+                refresh()
+            } finally {
+                withContext(NonCancellable) {
+                    handlerWaiting.set(false)
+                }
+            }
+        }
+    }
+
+    private fun refresh() {
         postValue(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/Channel.kt

@@ -1,10 +0,0 @@
-package com.vitorpamplona.amethyst.service
-
-import java.util.UUID
-import nostr.postr.JsonFilter
-
-data class Channel (
-  val id: String = UUID.randomUUID().toString().substring(0,4)
-) {
-  var filter: List<JsonFilter>? = null // Inactive when null
-}

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

@@ -1,25 +0,0 @@
-package com.vitorpamplona.amethyst.service
-
-import com.vitorpamplona.amethyst.service.relays.Relay
-
-object Constants {
-    val defaultRelays = arrayOf(
-      Relay("wss://nostr.bitcoiner.social", read = true, write = true),
-      Relay("wss://relay.nostr.bg", read = true, write = true),
-      //Relay("wss://brb.io", read = true, write = true),
-      Relay("wss://relay.snort.social", read = true, write = true),
-      Relay("wss://nostr.rocks", read = true, write = true),
-      Relay("wss://relay.damus.io", read = true, write = true),
-      Relay("wss://nostr.fmt.wiz.biz", read = true, write = true),
-      Relay("wss://nostr.oxtr.dev", read = true, write = true),
-      Relay("wss://eden.nostr.land", read = true, write = true),
-      //Relay("wss://nostr-2.zebedee.cloud", read = true, write = true),
-      Relay("wss://nostr-pub.wellorder.net", read = true, write = true),
-      Relay("wss://nostr.mom", read = true, write = true),
-      Relay("wss://nostr.orangepill.dev", read = true, write = true),
-      Relay("wss://nostr-pub.semisol.dev", read = true, write = true),
-      Relay("wss://nostr.onsats.org", read = true, write = true),
-      Relay("wss://nostr.sandwich.farm", read = true, write = true),
-      Relay("wss://relay.nostr.ch", read = true, write = true)
-    )
-}

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

@@ -43,7 +43,7 @@ class Nip19 {
     return null
   }
 
-  fun parseTLV(data: ByteArray): Map<Byte, MutableList<ByteArray>> {
+  fun parseTLV(data: ByteArray): Map<Byte, List<ByteArray>> {
     var result = mutableMapOf<Byte, MutableList<ByteArray>>()
     var rest = data
     while (rest.isNotEmpty()) {

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

@@ -1,58 +1,73 @@
 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.UserState
+import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
+import com.vitorpamplona.amethyst.service.model.LnZapEvent
+import com.vitorpamplona.amethyst.service.model.ReactionEvent
+import com.vitorpamplona.amethyst.service.model.ReportEvent
 import com.vitorpamplona.amethyst.service.model.RepostEvent
+import com.vitorpamplona.amethyst.service.relays.FeedType
+import com.vitorpamplona.amethyst.service.relays.TypedFilter
 import nostr.postr.JsonFilter
 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(): JsonFilter {
-    return JsonFilter(
-      kinds = listOf(ContactListEvent.kind),
-      authors = listOf(account.userProfile().pubkeyHex),
-      limit = 5
+  fun createAccountContactListFilter(): TypedFilter {
+    return TypedFilter(
+      types = FeedType.values().toSet(),
+      filter = JsonFilter(
+        kinds = listOf(ContactListEvent.kind),
+        authors = listOf(account.userProfile().pubkeyHex),
+        limit = 1
+      )
     )
   }
 
-  fun createAccountMetadataFilter(): JsonFilter {
-    return JsonFilter(
-      kinds = listOf(MetadataEvent.kind),
-      authors = listOf(account.userProfile().pubkeyHex),
-      limit = 5
+  fun createAccountMetadataFilter(): TypedFilter {
+    return TypedFilter(
+      types = FeedType.values().toSet(),
+      filter = JsonFilter(
+        kinds = listOf(MetadataEvent.kind),
+        authors = listOf(account.userProfile().pubkeyHex),
+        limit = 1
+      )
     )
   }
 
-  val accountMetadataChannel = requestNewChannel()
-  val accountContactListChannel = requestNewChannel()
-
-  override fun feed(): List<Note> {
-    val user = account.userProfile()
-
-    val follows = user.follows
-    val followKeys = synchronized(follows) {
-      follows.map { it.pubkeyHex }
-    }
-    val allowSet = followKeys.plus(user.pubkeyHex).toSet()
-
-    return LocalCache.notes.values
-      .filter { (it.event is TextNoteEvent || it.event is RepostEvent) && it.author?.pubkeyHex in allowSet }
-      .sortedBy { it.event?.createdAt }
-      .reversed()
+  fun createAccountReportsFilter(): TypedFilter {
+    return TypedFilter(
+      types = FeedType.values().toSet(),
+      filter = JsonFilter(
+        kinds = listOf(ReportEvent.kind),
+        authors = listOf(account.userProfile().pubkeyHex)
+      )
+    )
   }
 
+  fun createNotificationFilter() = TypedFilter(
+    types = FeedType.values().toSet(),
+    filter = JsonFilter(
+      kinds = listOf(
+        TextNoteEvent.kind, ReactionEvent.kind, RepostEvent.kind, ReportEvent.kind, LnZapEvent.kind, ChannelMessageEvent.kind
+      ),
+      tags = mapOf("p" to listOf(account.userProfile().pubkeyHex)),
+      limit = 200
+    )
+  )
+
+  val accountChannel = requestNewChannel()
+
   override fun updateChannelFilters() {
     // gets everthing about the user logged in
-    val newAccountMetadataFilter = createAccountMetadataFilter()
-    accountMetadataChannel.filter = listOf(newAccountMetadataFilter).ifEmpty { null }
-
-    val newAccountContactListEvent = createAccountContactListFilter()
-    accountContactListChannel.filter = listOf(newAccountContactListEvent).ifEmpty { null }
+    accountChannel.typedFilters = listOf(
+      createAccountMetadataFilter(),
+      createAccountContactListFilter(),
+      createNotificationFilter(),
+      createAccountReportsFilter()
+    ).ifEmpty { null }
   }
 }

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

@@ -1,26 +1,29 @@
 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.channels[channelId]
+    channel = LocalCache.getOrCreateChannel(channelId)
     resetFilters()
   }
 
-  fun createMessagesToChannelFilter(): JsonFilter? {
+  fun createMessagesToChannelFilter(): TypedFilter? {
     if (channel != null) {
-      return JsonFilter(
-        kinds = listOf(ChannelMessageEvent.kind),
-        tags = mapOf("e" to listOfNotNull(channel?.idHex)),
-        since = System.currentTimeMillis() / 1000 - (60 * 60 * 24 * 1), // 24 hours
+      return TypedFilter(
+        types = setOf(FeedType.PUBLIC_CHATS),
+        filter = JsonFilter(
+          kinds = listOf(ChannelMessageEvent.kind),
+          tags = mapOf("e" to listOfNotNull(channel?.idHex)),
+          limit = 200
+        )
       )
     }
     return null
@@ -28,12 +31,7 @@ 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.filter = listOfNotNull(createMessagesToChannelFilter()).ifEmpty { null }
+    messagesChannel.typedFilters = listOfNotNull(createMessagesToChannelFilter()).ifEmpty { null }
   }
 }

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

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

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

@@ -0,0 +1,60 @@
+package com.vitorpamplona.amethyst.service
+
+import com.vitorpamplona.amethyst.model.Account
+import com.vitorpamplona.amethyst.model.LocalCache
+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("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? {
+    val myPeer = withUser
+    
+    return if (myPeer != null) {
+      TypedFilter(
+        types = setOf(FeedType.PRIVATE_DMS),
+        filter = JsonFilter(
+          kinds = listOf(PrivateDmEvent.kind),
+          authors = listOf(myPeer.pubkeyHex) ,
+          tags = mapOf("p" to listOf(account.userProfile().pubkeyHex))
+        )
+      )
+    } else {
+      null
+    }
+  }
+
+  fun createMessagesFromMeFilter(): TypedFilter? {
+    val myPeer = withUser
+    
+    return if (myPeer != null) {
+      TypedFilter(
+        types = setOf(FeedType.PRIVATE_DMS),
+        filter = JsonFilter(
+          kinds = listOf(PrivateDmEvent.kind),
+          authors = listOf(account.userProfile().pubkeyHex),
+          tags = mapOf("p" to listOf(myPeer.pubkeyHex))
+        )
+      )
+    } else {
+      null
+    }
+  }
+
+  val inandoutChannel = requestNewChannel()
+
+  override fun updateChannelFilters() {
+    inandoutChannel.typedFilters = listOfNotNull(createMessagesToMeFilter(), createMessagesFromMeFilter()).ifEmpty { null }
+  }
+}

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

@@ -1,96 +1,88 @@
 package com.vitorpamplona.amethyst.service
 
 import com.vitorpamplona.amethyst.model.Account
-import com.vitorpamplona.amethyst.model.LocalCache
-import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.service.model.ChannelCreateEvent
 import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
 import com.vitorpamplona.amethyst.service.model.ChannelMetadataEvent
+import com.vitorpamplona.amethyst.service.relays.FeedType
+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() = JsonFilter(
-    kinds = listOf(PrivateDmEvent.kind),
-    tags = mapOf("p" to listOf(account.userProfile().pubkeyHex))
+  fun createMessagesToMeFilter() = TypedFilter(
+    types = setOf(FeedType.PRIVATE_DMS),
+      filter = JsonFilter(
+      kinds = listOf(PrivateDmEvent.kind),
+      tags = mapOf("p" to listOf(account.userProfile().pubkeyHex))
+    )
   )
 
-  fun createMessagesFromMeFilter() = JsonFilter(
-    kinds = listOf(PrivateDmEvent.kind),
-    authors = listOf(account.userProfile().pubkeyHex)
+  fun createMessagesFromMeFilter() = TypedFilter(
+    types = setOf(FeedType.PRIVATE_DMS),
+      filter = JsonFilter(
+      kinds = listOf(PrivateDmEvent.kind),
+      authors = listOf(account.userProfile().pubkeyHex)
+    )
   )
 
-  fun createChannelsCreatedbyMeFilter() = JsonFilter(
-    kinds = listOf(ChannelCreateEvent.kind, ChannelMetadataEvent.kind),
-    authors = listOf(account.userProfile().pubkeyHex)
+  fun createChannelsCreatedbyMeFilter() = TypedFilter(
+    types = setOf(FeedType.PUBLIC_CHATS),
+      filter = JsonFilter(
+      kinds = listOf(ChannelCreateEvent.kind, ChannelMetadataEvent.kind),
+      authors = listOf(account.userProfile().pubkeyHex)
+    )
   )
 
-  fun createMyChannelsFilter() = JsonFilter(
-    kinds = listOf(ChannelCreateEvent.kind),
-    ids = account.followingChannels.toList()
+  fun createMyChannelsFilter() = TypedFilter(
+    types = FeedType.values().toSet(), // Metadata comes from any relay
+      filter = JsonFilter(
+      kinds = listOf(ChannelCreateEvent.kind),
+      ids = account.followingChannels.toList()
+    )
   )
 
-  fun createLastChannelInfoFilter(): List<JsonFilter> {
+  fun createLastChannelInfoFilter(): List<TypedFilter> {
     return account.followingChannels.map {
-      JsonFilter(
-        kinds = listOf(ChannelMetadataEvent.kind),
-        tags = mapOf("e" to listOf(it)),
-        limit = 1
+      TypedFilter(
+        types = FeedType.values().toSet(), // Metadata comes from any relay
+        filter = JsonFilter(
+          kinds = listOf(ChannelMetadataEvent.kind),
+          tags = mapOf("e" to listOf(it)),
+          limit = 1
+        )
       )
     }
   }
 
-  fun createLastMessageOfEachChannelFilter(): List<JsonFilter> {
+  fun createLastMessageOfEachChannelFilter(): List<TypedFilter> {
     return account.followingChannels.map {
-      JsonFilter(
-        kinds = listOf(ChannelMessageEvent.kind),
-        tags = mapOf("e" to listOf(it)),
-        limit = 1
+      TypedFilter(
+        types = setOf(FeedType.PUBLIC_CHATS),
+        filter = JsonFilter(
+          kinds = listOf(ChannelMessageEvent.kind),
+          tags = mapOf("e" to listOf(it)),
+          limit = 100 // Remember to consider spam that is being removed from the UI
+        )
       )
     }
   }
 
-  val incomingChannel = requestNewChannel()
-  val outgoingChannel = requestNewChannel()
-
-  val myChannelsChannel = requestNewChannel()
-  val myChannelsInfoChannel = requestNewChannel()
-  val myChannelsMessagesChannel = requestNewChannel()
-
-  val myChannelsCreatedbyMeChannel = requestNewChannel()
-
-  // returns the last Note of each user.
-  override fun feed(): List<Note> {
-    val messages = account.userProfile().messages
-    val messagingWith = messages.keys().toList().filter { account.isAcceptable(it) }
-
-    val privateMessages = messagingWith.mapNotNull {
-      val conversation = messages[it]
-      if (conversation != null) {
-        synchronized(conversation) {
-          conversation.sortedBy { it.event?.createdAt }.lastOrNull { it.event != null }
-        }
-      } else {
-        null
-      }
-    }
-
-    val publicChannels = account.followingChannels().map {
-      it.notes.values.filter { account.isAcceptable(it) }.sortedBy { it.event?.createdAt }.lastOrNull { it.event != null }
-    }
-
-    return (privateMessages + publicChannels).filterNotNull().sortedBy { it.event?.createdAt }.reversed()
-  }
+  val chatroomListChannel = requestNewChannel()
 
   override fun updateChannelFilters() {
-    incomingChannel.filter = listOf(createMessagesToMeFilter()).ifEmpty { null }
-    outgoingChannel.filter = listOf(createMessagesFromMeFilter()).ifEmpty { null }
-    myChannelsChannel.filter = listOf(createMyChannelsFilter()).ifEmpty { null }
-    myChannelsInfoChannel.filter = createLastChannelInfoFilter().ifEmpty { null }
-    myChannelsMessagesChannel.filter = createLastMessageOfEachChannelFilter().ifEmpty { null }
+    val list = listOf(
+      createMessagesToMeFilter(),
+      createMessagesFromMeFilter(),
+      createMyChannelsFilter()
+    )
 
-    //myChannelsCreatedbyMeChannel.filter = listOf(createChannelsCreatedbyMeFilter()).ifEmpty { null }
+    chatroomListChannel.typedFilters = listOfNotNull(
+      list,
+      createLastChannelInfoFilter(),
+      createLastMessageOfEachChannelFilter()
+    ).flatten().ifEmpty { null }
   }
 }

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

@@ -1,24 +1,22 @@
 package com.vitorpamplona.amethyst.service
 
-import android.os.Handler
-import android.os.Looper
 import com.vitorpamplona.amethyst.model.LocalCache
-import com.vitorpamplona.amethyst.model.Note
-import com.vitorpamplona.amethyst.model.UrlCachedPreviewer
 import com.vitorpamplona.amethyst.service.model.ChannelCreateEvent
 import com.vitorpamplona.amethyst.service.model.ChannelHideMessageEvent
 import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
 import com.vitorpamplona.amethyst.service.model.ChannelMetadataEvent
 import com.vitorpamplona.amethyst.service.model.ChannelMuteUserEvent
+import com.vitorpamplona.amethyst.service.model.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
 import com.vitorpamplona.amethyst.service.relays.Client
 import com.vitorpamplona.amethyst.service.relays.Relay
-import java.util.Collections
+import com.vitorpamplona.amethyst.service.relays.Subscription
+import com.vitorpamplona.amethyst.service.relays.hasValidSignature
+import java.util.Date
 import java.util.UUID
-import kotlin.time.ExperimentalTime
-import kotlin.time.measureTimedValue
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
@@ -32,26 +30,29 @@ import nostr.postr.events.PrivateDmEvent
 import nostr.postr.events.RecommendRelayEvent
 import nostr.postr.events.TextNoteEvent
 
-abstract class NostrDataSource<T>(val debugName: String) {
-  private val channels = Collections.synchronizedSet(mutableSetOf<Channel>())
-  private val channelIds =  Collections.synchronizedSet(mutableSetOf<String>())
+abstract class NostrDataSource(val debugName: String) {
+  private var subscriptions = mapOf<String, Subscription>()
+  data class Counter(var counter:Int)
 
-  private val eventCounter = mutableMapOf<String, Int>()
+  private var eventCounter = mapOf<String, Counter>()
 
   fun printCounter() {
     eventCounter.forEach {
-      println("AAA Count ${it.key}: ${it.value}")
+      println("AAA Count ${it.key}: ${it.value.counter}")
     }
   }
 
   private val clientListener = object : Client.Listener() {
     override fun onEvent(event: Event, subscriptionId: String, relay: Relay) {
-      if (subscriptionId in channelIds) {
+      if (subscriptionId in subscriptions.keys) {
+        if (!event.hasValidSignature()) return
+
         val key = "${debugName} ${subscriptionId} ${event.kind}"
-        if (eventCounter.contains(key)) {
-          eventCounter.put(key, eventCounter.get(key)!! + 1)
+        val keyValue = eventCounter.get(key)
+        if (keyValue != null) {
+          keyValue.counter++
         } else {
-          eventCounter.put(key, 1)
+          eventCounter = eventCounter + Pair(key, Counter(1))
         }
 
         try {
@@ -60,7 +61,7 @@ abstract class NostrDataSource<T>(val debugName: String) {
             is TextNoteEvent -> LocalCache.consume(event, relay)
             is RecommendRelayEvent -> LocalCache.consume(event)
             is ContactListEvent -> LocalCache.consume(event)
-            is PrivateDmEvent -> LocalCache.consume(event)
+            is PrivateDmEvent -> LocalCache.consume(event, relay)
             is DeletionEvent -> LocalCache.consume(event)
             else -> when (event.kind) {
               RepostEvent.kind -> {
@@ -70,11 +71,19 @@ 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)
+
+                zapEvent.containedPost?.let { onEvent(it, subscriptionId, relay) }
+                LocalCache.consume(zapEvent)
+              }
+              LnZapRequestEvent.kind -> LocalCache.consume(LnZapRequestEvent(event.id, event.pubKey, event.createdAt, event.tags, event.content, event.sig))
 
               ChannelCreateEvent.kind -> LocalCache.consume(ChannelCreateEvent(event.id, event.pubKey, event.createdAt, event.tags, event.content, event.sig))
               ChannelMetadataEvent.kind -> LocalCache.consume(ChannelMetadataEvent(event.id, event.pubKey, event.createdAt, event.tags, event.content, event.sig))
-              ChannelMessageEvent.kind -> LocalCache.consume(ChannelMessageEvent(event.id, event.pubKey, event.createdAt, event.tags, event.content, event.sig))
+              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))
             }
@@ -90,7 +99,7 @@ abstract class NostrDataSource<T>(val debugName: String) {
       //Log.e("ERROR", "Relay ${relay.url}: ${error.message}")
     }
 
-    override fun onRelayStateChange(type: Relay.Type, relay: Relay) {
+    override fun onRelayStateChange(type: Relay.Type, relay: Relay, channel: String?) {
       //Log.d("RELAY", "Relay ${relay.url} ${when (type) {
       //  Relay.Type.CONNECT -> "connected."
       //  Relay.Type.DISCONNECT -> "disconnected."
@@ -98,11 +107,10 @@ abstract class NostrDataSource<T>(val debugName: String) {
       //  Relay.Type.EOSE -> "sent all events it had stored."
       //}}")
 
-      /*
-      if (type == Relay.Type.EOSE) {
-        // One everything is loaded, if new users are found, update filters
-        resetFilters()
-      }*/
+      if (type == Relay.Type.EOSE && channel != null) {
+        // updates a per subscripton since date
+        subscriptions[channel]?.updateEOSE(Date().time / 1000)
+      }
     }
 
     override fun onSendResponse(eventId: String, success: Boolean, message: String, relay: Relay) {
@@ -119,43 +127,21 @@ abstract class NostrDataSource<T>(val debugName: String) {
   }
 
   open fun stop() {
-    channels.forEach { channel ->
-      if (channel.filter != null) // if it is active, close
-        Client.close(channel.id)
+    subscriptions.values.forEach { channel ->
+      Client.close(channel.id)
+      channel.typedFilters = null
     }
   }
 
-  fun loadTop(): List<T> {
-    val returningList = feed().take(100)
-
-    // prepare previews
-    val scope = CoroutineScope(Job() + Dispatchers.IO)
-    scope.launch {
-      loadPreviews(returningList)
-    }
-
-    return returningList
+  fun requestNewChannel(onEOSE: ((Long) -> Unit)? = null): Subscription {
+    val newSubscription = Subscription(UUID.randomUUID().toString().substring(0,4), onEOSE)
+    subscriptions = subscriptions + Pair(newSubscription.id, newSubscription)
+    return newSubscription
   }
 
-  fun loadPreviews(list: List<T>) {
-    list.forEach {
-      if (it is Note) {
-        UrlCachedPreviewer.preloadPreviewsFor(it)
-      }
-    }
-  }
-
-  fun requestNewChannel(): Channel {
-    val newChannel = Channel(debugName+UUID.randomUUID().toString().substring(0,4))
-    channels.add(newChannel)
-    channelIds.add(newChannel.id)
-    return newChannel
-  }
-
-  fun dismissChannel(channel: Channel) {
-    Client.close(channel.id)
-    channels.remove(channel)
-    channelIds.remove(channel.id)
+  fun dismissChannel(subscription: Subscription) {
+    Client.close(subscription.id)
+    subscriptions = subscriptions.minus(subscription.id)
   }
 
   var handlerWaiting = false
@@ -181,37 +167,37 @@ abstract class NostrDataSource<T>(val debugName: String) {
 
   fun resetFiltersSuspend() {
     // saves the channels that are currently active
-    val activeChannels = channels.filter { it.filter != null }
+    val activeSubscriptions = subscriptions.values.filter { it.typedFilters != null }
     // saves the current content to only update if it changes
-    val currentFilter = activeChannels.associate { it.id to it.filter!!.joinToString("|") { it.toJson() }  }
+    val currentFilters = activeSubscriptions.associate { it.id to it.toJson()  }
 
     updateChannelFilters()
 
     // Makes sure to only send an updated filter when it actually changes.
-    channels.forEach { channel ->
-      val channelsNewFilter = channel.filter
+    subscriptions.values.forEach { updatedSubscription ->
+      val updatedSubscriotionNewFilters = updatedSubscription.typedFilters
 
-      if (channel in activeChannels) {
-        if (channelsNewFilter == null) {
+      if (updatedSubscription.id in currentFilters.keys) {
+        if (updatedSubscriotionNewFilters == null) {
           // was active and is not active anymore, just close.
-          Client.close(channel.id)
+          Client.close(updatedSubscription.id)
         } else {
           // was active and is still active, check if it has changed.
-          if (channelsNewFilter.joinToString("|") { it.toJson() } != currentFilter[channel.id]) {
-            Client.close(channel.id)
-            Client.sendFilter(channel.id, channelsNewFilter)
+          if (updatedSubscription.toJson() != currentFilters[updatedSubscription.id]) {
+            Client.close(updatedSubscription.id)
+            Client.sendFilter(updatedSubscription.id, updatedSubscriotionNewFilters)
           } else {
             // hasn't changed, does nothing.
-            Client.sendFilterOnlyIfDisconnected(channel.id, channelsNewFilter)
+            Client.sendFilterOnlyIfDisconnected(updatedSubscription.id, updatedSubscriotionNewFilters)
           }
         }
       } else {
-        if (channelsNewFilter == null) {
+        if (updatedSubscriotionNewFilters == null) {
           // was not active and is still not active, does nothing
         } else {
           // was not active and becomes active, sends the filter.
-          if (channelsNewFilter.joinToString("|") { it.toJson() } != currentFilter[channel.id]) {
-            Client.sendFilter(channel.id, channelsNewFilter)
+          if (updatedSubscription.toJson() != currentFilters[updatedSubscription.id]) {
+            Client.sendFilter(updatedSubscription.id, updatedSubscriotionNewFilters)
           }
         }
       }
@@ -219,5 +205,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,31 +1,25 @@
 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") {
+object NostrGlobalDataSource: NostrDataSource("GlobalFeed") {
   lateinit var account: Account
-  fun createGlobalFilter() = JsonFilter(
-    kinds = listOf(TextNoteEvent.kind, ChannelMessageEvent.kind),
-    limit = 200
+  fun createGlobalFilter() = TypedFilter(
+    types = setOf(FeedType.GLOBAL),
+    filter = JsonFilter(
+      kinds = listOf(TextNoteEvent.kind, ChannelMessageEvent.kind),
+      limit = 200
+    )
   )
 
   val globalFeedChannel = requestNewChannel()
 
-  override fun feed() = LocalCache.notes.values
-    .filter { account.isAcceptable(it) }
-    .filter {
-      (it.event is TextNoteEvent && (it.event as TextNoteEvent).replyTos.isEmpty()) ||
-      (it.event is ChannelMessageEvent && (it.event as ChannelMessageEvent).replyTos.isEmpty())
-    }
-    .sortedBy { it.event?.createdAt }
-    .reversed()
-
   override fun updateChannelFilters() {
-    globalFeedChannel.filter = listOf(createGlobalFilter()).ifEmpty { null }
+    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,97 +1,62 @@
 package com.vitorpamplona.amethyst.service
 
 import com.vitorpamplona.amethyst.model.Account
-import com.vitorpamplona.amethyst.model.LocalCache
-import com.vitorpamplona.amethyst.model.Note
-import com.vitorpamplona.amethyst.model.User
 import com.vitorpamplona.amethyst.model.UserState
-import com.vitorpamplona.amethyst.service.model.RepostEvent
-import com.vitorpamplona.amethyst.service.relays.Client
-import com.vitorpamplona.amethyst.service.relays.Relay
-import com.vitorpamplona.amethyst.service.relays.RelayPool
+import com.vitorpamplona.amethyst.service.relays.FeedType
+import com.vitorpamplona.amethyst.service.relays.TypedFilter
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
 import nostr.postr.JsonFilter
 import nostr.postr.events.TextNoteEvent
-import nostr.postr.toHex
 
-object NostrHomeDataSource: NostrDataSource<Note>("HomeFeed") {
+object NostrHomeDataSource: NostrDataSource("HomeFeed") {
   lateinit var account: Account
 
-  object cacheListener: User.Listener() {
-    override fun onFollowsChange() {
-      resetFilters()
-    }
+  private val cacheListener: (UserState) -> Unit = {
+    invalidateFilters()
   }
 
   override fun start() {
-    if (this::account.isInitialized)
-      account.userProfile().subscribe(cacheListener)
+    if (this::account.isInitialized) {
+      GlobalScope.launch(Dispatchers.Main) {
+        account.userProfile().live().follows.observeForever(cacheListener)
+      }
+    }
     super.start()
   }
 
   override fun stop() {
     super.stop()
-    if (this::account.isInitialized)
-      account.userProfile().unsubscribe(cacheListener)
+    if (this::account.isInitialized) {
+      GlobalScope.launch(Dispatchers.Main) {
+        account.userProfile().live().follows.removeObserver(cacheListener)
+      }
+    }
   }
 
-  fun createFollowAccountsFilter(): JsonFilter {
-    val follows = account.userProfile().follows ?: emptySet()
+  fun createFollowAccountsFilter(): TypedFilter {
+    val follows = account.userProfile().follows
 
-    val followKeys = synchronized(follows) {
-      follows.map {
-        it.pubkey.toHex().substring(0, 6)
-      }
+    val followKeys = follows.map {
+      it.pubkeyHex.substring(0, 6)
     }
 
     val followSet = followKeys.plus(account.userProfile().pubkeyHex.substring(0, 6))
 
-    return JsonFilter(
-      kinds = listOf(TextNoteEvent.kind, RepostEvent.kind),
-      authors = followSet,
-      limit = 400
+    return TypedFilter(
+      types = setOf(FeedType.FOLLOWS),
+      filter = JsonFilter(
+        kinds = listOf(TextNoteEvent.kind),
+        authors = followSet,
+        limit = 400
+      )
     )
   }
 
   val followAccountChannel = requestNewChannel()
 
-  fun <T> equalsIgnoreOrder(list1:List<T>?, list2:List<T>?): Boolean {
-    if (list1 == null && list2 == null) return true
-    if (list1 == null) return false
-    if (list2 == null) return false
-
-    return list1.size == list2.size && list1.toSet() == list2.toSet()
-  }
-
-  fun equalAuthors(list1:JsonFilter?, list2:JsonFilter?): Boolean {
-    if (list1 == null && list2 == null) return true
-    if (list1 == null) return false
-    if (list2 == null) return false
-
-    return equalsIgnoreOrder(list1.authors, list2.authors)
-  }
-
-  override fun feed(): List<Note> {
-    val user = account.userProfile()
-
-    val follows = user.follows
-    val followKeys = synchronized(follows) {
-      follows.map { it.pubkeyHex }
-    }
-
-    val allowSet = followKeys.plus(user.pubkeyHex).toSet()
-
-    return LocalCache.notes.values
-      .filter { (it.event is TextNoteEvent || it.event is RepostEvent) && it.author?.pubkeyHex in allowSet }
-      .filter { account.isAcceptable(it) }
-      .sortedBy { it.event?.createdAt }
-      .reversed()
-  }
-
   override fun updateChannelFilters() {
-    val newFollowAccountsFilter = createFollowAccountsFilter()
-
-    if (!equalAuthors(newFollowAccountsFilter, followAccountChannel.filter?.firstOrNull())) {
-      followAccountChannel.filter = listOf(newFollowAccountsFilter).ifEmpty { null }
-    }
+    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 nostr.postr.JsonFilter
-
-object NostrNotificationDataSource: NostrDataSource<Note>("NotificationFeed") {
-  lateinit var account: Account
-
-  fun createNotificationFilter() = JsonFilter(
-    tags = mapOf("p" to listOf(account.userProfile().pubkeyHex)),
-    limit = 100
-  )
-
-  val notificationChannel = requestNewChannel()
-
-  override fun feed(): List<Note> {
-    val set = account.userProfile().taggedPosts
-    val filtered = synchronized(set) {
-      set.filter { it.event != null }.filter { account.isAcceptable(it) }
-    }
-
-    return filtered.sortedBy { it.event?.createdAt }.reversed()
-  }
-
-  override fun updateChannelFilters() {
-    notificationChannel.filter = listOf(createNotificationFilter()).ifEmpty { null }
-  }
-}

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

@@ -1,43 +1,43 @@
 package com.vitorpamplona.amethyst.service
 
-import com.vitorpamplona.amethyst.model.LocalCache
-import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.model.decodePublicKey
-import com.vitorpamplona.amethyst.service.model.ReactionEvent
-import com.vitorpamplona.amethyst.service.model.RepostEvent
-import java.util.Collections
+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.TextNoteEvent
+import nostr.postr.events.MetadataEvent
 import nostr.postr.toHex
 
-object NostrSearchEventOrUserDataSource: NostrDataSource<Note>("SingleEventFeed") {
+object NostrSearchEventOrUserDataSource: NostrDataSource("SingleEventFeed") {
   private var hexToWatch: String? = null
 
-  private fun createAnythingWithIDFilter(): List<JsonFilter>? {
+  private fun createAnythingWithIDFilter(): List<TypedFilter>? {
     if (hexToWatch == null) {
       return null
     }
 
     // downloads all the reactions to a given event.
     return listOf(
-      JsonFilter(
-        ids = listOfNotNull(hexToWatch)
+      TypedFilter(
+        types = FeedType.values().toSet(),
+        filter = JsonFilter(
+          ids = listOfNotNull(hexToWatch)
+        )
       ),
-      JsonFilter(
-        authors = listOfNotNull(hexToWatch)
+      TypedFilter(
+        types = FeedType.values().toSet(),
+        filter = JsonFilter(
+          kinds = listOf(MetadataEvent.kind),
+          authors = listOfNotNull(hexToWatch)
+        )
       )
     )
   }
 
   val searchChannel = requestNewChannel()
 
-  override fun feed(): List<Note> {
-    return emptyList<Note>()
-  }
-
   override fun updateChannelFilters() {
-    searchChannel.filter = createAnythingWithIDFilter()
+    searchChannel.typedFilters = createAnythingWithIDFilter()
   }
 
   fun search(eventId: String) {

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

@@ -1,20 +1,16 @@
 package com.vitorpamplona.amethyst.service
 
 import com.vitorpamplona.amethyst.model.LocalCache
-import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.service.model.ChannelCreateEvent
-import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
 import com.vitorpamplona.amethyst.service.model.ChannelMetadataEvent
-import com.vitorpamplona.amethyst.service.model.ReactionEvent
-import com.vitorpamplona.amethyst.service.model.RepostEvent
-import java.util.Collections
+import com.vitorpamplona.amethyst.service.relays.FeedType
+import com.vitorpamplona.amethyst.service.relays.TypedFilter
 import nostr.postr.JsonFilter
-import nostr.postr.events.TextNoteEvent
 
-object NostrSingleChannelDataSource: NostrDataSource<Note>("SingleChannelFeed") {
+object NostrSingleChannelDataSource: NostrDataSource("SingleChannelFeed") {
   private var channelsToWatch = setOf<String>()
 
-  private fun createRepliesAndReactionsFilter(): JsonFilter? {
+  private fun createRepliesAndReactionsFilter(): TypedFilter? {
     val reactionsToWatch = channelsToWatch.map { it }
 
     if (reactionsToWatch.isEmpty()) {
@@ -22,13 +18,16 @@ object NostrSingleChannelDataSource: NostrDataSource<Note>("SingleChannelFeed")
     }
 
     // downloads all the reactions to a given event.
-    return JsonFilter(
-      kinds = listOf(ChannelMetadataEvent.kind),
-      tags = mapOf("e" to reactionsToWatch)
+    return TypedFilter(
+      types = setOf(FeedType.PUBLIC_CHATS),
+      filter = JsonFilter(
+        kinds = listOf(ChannelMetadataEvent.kind),
+        tags = mapOf("e" to reactionsToWatch)
+      )
     )
   }
 
-  fun createLoadEventsIfNotLoadedFilter(): JsonFilter? {
+  fun createLoadEventsIfNotLoadedFilter(): TypedFilter? {
     val directEventsToLoad = channelsToWatch
       .map { LocalCache.getOrCreateChannel(it) }
       .filter { it.notes.isEmpty() }
@@ -40,25 +39,22 @@ object NostrSingleChannelDataSource: NostrDataSource<Note>("SingleChannelFeed")
     }
 
     // downloads linked events to this event.
-    return JsonFilter(
-      kinds = listOf(ChannelCreateEvent.kind),
-      ids = interestedEvents.toList()
+    return TypedFilter(
+      types = FeedType.values().toSet(),
+      filter = JsonFilter(
+        kinds = listOf(ChannelCreateEvent.kind),
+        ids = interestedEvents.toList()
+      )
     )
   }
 
-  val repliesAndReactionsChannel = requestNewChannel()
-  val loadEventsChannel = requestNewChannel()
-
-  override fun feed(): List<Note> {
-    return emptyList()
-  }
+  val singleChannelChannel = requestNewChannel()
 
   override fun updateChannelFilters() {
     val reactions = createRepliesAndReactionsFilter()
     val missing = createLoadEventsIfNotLoadedFilter()
 
-    repliesAndReactionsChannel.filter = listOfNotNull(reactions).ifEmpty { null }
-    loadEventsChannel.filter = listOfNotNull(missing).ifEmpty { null }
+    singleChannelChannel.typedFilters = listOfNotNull(reactions, missing).ifEmpty { null }
   }
 
   fun add(eventId: String) {

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

@@ -1,37 +1,50 @@
 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
-import java.util.Collections
+import com.vitorpamplona.amethyst.service.relays.FeedType
+import com.vitorpamplona.amethyst.service.relays.TypedFilter
+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(): JsonFilter? {
-    val reactionsToWatch = eventsToWatch.map { it }
+  private fun createRepliesAndReactionsFilter(): List<TypedFilter>? {
+    val reactionsToWatch = eventsToWatch.map { LocalCache.getOrCreateNote(it) }
 
     if (reactionsToWatch.isEmpty()) {
       return null
     }
 
-    // downloads all the reactions to a given event.
-    return JsonFilter(
-      kinds = listOf(
-        TextNoteEvent.kind, ReactionEvent.kind, RepostEvent.kind, ReportEvent.kind
-      ),
-      tags = mapOf("e" to reactionsToWatch)
-    )
+    val now = Date().time / 1000
+
+    return reactionsToWatch.filter {
+      val lastTime = it.lastReactionsDownloadTime
+      lastTime == null || lastTime < (now - 10)
+    }.map {
+      TypedFilter(
+        types = FeedType.values().toSet(),
+        filter = JsonFilter(
+          kinds = listOf(
+            TextNoteEvent.kind, ReactionEvent.kind, RepostEvent.kind, ReportEvent.kind, LnZapEvent.kind, LnZapRequestEvent.kind
+          ),
+          tags = mapOf("e" to listOf(it.idHex)),
+          since = it.lastReactionsDownloadTime
+        )
+      )
+    }
   }
 
-  fun createLoadEventsIfNotLoadedFilter(): JsonFilter? {
+  fun createLoadEventsIfNotLoadedFilter(): List<TypedFilter>? {
     val directEventsToLoad = eventsToWatch
       .map { LocalCache.getOrCreateNote(it) }
       .filter { it.event == null }
@@ -51,32 +64,34 @@ object NostrSingleEventDataSource: NostrDataSource<Note>("SingleEventFeed") {
     }
 
     // downloads linked events to this event.
-    return JsonFilter(
-      kinds = listOf(
-        TextNoteEvent.kind, ReactionEvent.kind, RepostEvent.kind,
-        ChannelMessageEvent.kind, ChannelCreateEvent.kind, ChannelMetadataEvent.kind
-      ),
-      ids = interestedEvents.toList()
+    return listOf(
+      TypedFilter(
+        types = FeedType.values().toSet(),
+        filter = JsonFilter(
+          kinds = listOf(
+            TextNoteEvent.kind, ReactionEvent.kind, RepostEvent.kind, LnZapEvent.kind, LnZapRequestEvent.kind,
+            ChannelMessageEvent.kind, ChannelCreateEvent.kind, ChannelMetadataEvent.kind
+          ),
+          ids = interestedEvents.toList()
+        )
+      )
     )
   }
 
-  val repliesAndReactionsChannel = requestNewChannel()
-  val loadEventsChannel = requestNewChannel()
-
-  override fun feed(): List<Note> {
-    return synchronized(eventsToWatch) {
-      eventsToWatch.map {
-        LocalCache.notes[it]
-      }.filterNotNull()
+  val singleEventChannel = requestNewChannel { time ->
+    eventsToWatch.forEach {
+      LocalCache.getOrCreateNote(it).lastReactionsDownloadTime = time
     }
+    // Many relays operate with limits in the amount of filters.
+    // As information comes, the filters will be rotated to get more data.
+    invalidateFilters()
   }
 
   override fun updateChannelFilters() {
     val reactions = createRepliesAndReactionsFilter()
     val missing = createLoadEventsIfNotLoadedFilter()
 
-    repliesAndReactionsChannel.filter = listOfNotNull(reactions).ifEmpty { null }
-    loadEventsChannel.filter = listOfNotNull(missing).ifEmpty { null }
+    singleEventChannel.typedFilters = listOfNotNull(reactions, missing).flatten().ifEmpty { null }
   }
 
   fun add(eventId: String) {

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

@@ -1,62 +1,65 @@
 package com.vitorpamplona.amethyst.service
 
-import com.vitorpamplona.amethyst.model.LocalCache
-import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.model.User
 import com.vitorpamplona.amethyst.service.model.ReportEvent
-import java.util.Collections
+import com.vitorpamplona.amethyst.service.relays.FeedType
+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<JsonFilter>? {
+  fun createUserFilter(): List<TypedFilter>? {
     if (usersToWatch.isEmpty()) return null
 
-    return usersToWatch.map {
-      JsonFilter(
-        kinds = listOf(MetadataEvent.kind),
-        authors = listOf(it),
-        limit = 1
+    return usersToWatch.filter { it.info?.latestMetadata == null }.map {
+      TypedFilter(
+        types = FeedType.values().toSet(),
+        filter = JsonFilter(
+          kinds = listOf(MetadataEvent.kind),
+          authors = listOf(it.pubkeyHex),
+          limit = 1
+        )
       )
     }
   }
 
-  fun createUserReportFilter(): List<JsonFilter>? {
+  fun createUserReportFilter(): List<TypedFilter>? {
     if (usersToWatch.isEmpty()) return null
 
     return usersToWatch.map {
-      JsonFilter(
-        kinds = listOf(ReportEvent.kind),
-        tags = mapOf("p" to listOf(it))
+      TypedFilter(
+        types = FeedType.values().toSet(),
+        filter = JsonFilter(
+          kinds = listOf(ReportEvent.kind),
+          tags = mapOf("p" to listOf(it.pubkeyHex)),
+          since = it.latestReportTime
+        )
       )
     }
   }
 
-  val userChannel = requestNewChannel()
-  val userReportChannel = requestNewChannel()
-
-  override fun feed(): List<User> {
-    return synchronized(usersToWatch) {
-      usersToWatch.map {
-        LocalCache.users[it]
-      }.filterNotNull()
-    }
-  }
-
-  override fun updateChannelFilters() {
-    userChannel.filter = createUserFilter()
-    userReportChannel.filter = createUserReportFilter()
-  }
-
-  fun add(userId: String) {
-    usersToWatch = usersToWatch.plus(userId)
+  val userChannel = 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 remove(userId: String) {
-    usersToWatch = usersToWatch.minus(userId)
+  val userChannelOnce = requestNewChannel()
+
+  override fun updateChannelFilters() {
+    userChannel.typedFilters = listOfNotNull(createUserFilter()).flatten().ifEmpty { null }
+    userChannelOnce.typedFilters = listOfNotNull(createUserReportFilter()).flatten().ifEmpty { null }
+  }
+
+  fun add(user: User) {
+    usersToWatch = usersToWatch.plus(user)
+    invalidateFilters()
+  }
+
+  fun remove(user: User) {
+    usersToWatch = usersToWatch.minus(user)
     invalidateFilters()
   }
 }

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

@@ -1,124 +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 java.util.Collections
+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") {
-  val eventsToWatch = Collections.synchronizedList(mutableListOf<String>())
+object NostrThreadDataSource: NostrDataSource("SingleThreadFeed") {
+  private var eventToWatch: String? = null
 
-  fun createRepliesAndReactionsFilter(): JsonFilter? {
-    val reactionsToWatch = eventsToWatch.map { it }
+  fun createLoadEventsIfNotLoadedFilter(): TypedFilter? {
+    val threadToLoad = eventToWatch ?: return null
 
-    if (reactionsToWatch.isEmpty()) {
-      return null
-    }
-
-    return JsonFilter(
-      kinds = listOf(TextNoteEvent.kind, ReactionEvent.kind, RepostEvent.kind),
-      tags = mapOf("e" to reactionsToWatch)
-    )
-  }
-
-  fun createLoadEventsIfNotLoadedFilter(): JsonFilter? {
-    val nodes = synchronized(eventsToWatch) {
-      eventsToWatch.map { LocalCache.notes[it] }
-    }
-
-    val eventsToLoad = nodes
-      .filterNotNull()
+    val eventsToLoad = ThreadAssembler().findThreadFor(threadToLoad)
       .filter { it.event == null }
-      .map { it.idHex.substring(0, 8) }
+      .map { it.idHex }
+      .toSet()
+      .ifEmpty { null } ?: return null
 
-    if (eventsToLoad.isEmpty()) {
-      return null
-    }
-
-    return JsonFilter(
-      ids = eventsToLoad
+    return TypedFilter(
+      types = FeedType.values().toSet(),
+      filter = JsonFilter(
+        ids = eventsToLoad.map { it.substring(0, 8) }
+      )
     )
   }
 
-  val repliesAndReactionsChannel = requestNewChannel()
-  val loadEventsChannel = requestNewChannel()
-
-  override fun feed(): List<Note> {
-    return synchronized(eventsToWatch) {
-      eventsToWatch.map {
-        LocalCache.notes[it]
-      }.filterNotNull()
-    }
+  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()
   }
 
   override fun updateChannelFilters() {
-    repliesAndReactionsChannel.filter = listOfNotNull(createRepliesAndReactionsFilter()).ifEmpty { null }
-    loadEventsChannel.filter = listOfNotNull(createLoadEventsIfNotLoadedFilter()).ifEmpty { null }
+    loadEventsChannel.typedFilters = listOfNotNull(createLoadEventsIfNotLoadedFilter()).ifEmpty { null }
   }
 
-  fun searchRoot(note: Note, testedNotes: MutableSet<Note> = mutableSetOf()): Note? {
-    if (note.replyTo == null || note.replyTo?.isEmpty() == true) return note
+  fun loadThread(noteId: String?) {
+    eventToWatch = noteId
 
-    val markedAsRoot = note.event?.tags?.firstOrNull { it[0] == "e" && it.size > 3 && it[3] == "root" }?.getOrNull(1)
-    if (markedAsRoot != null) return LocalCache.getOrCreateNote(markedAsRoot)
-
-    val hasNoReplyTo = note.replyTo?.firstOrNull { it.replyTo?.isEmpty() == true }
-    if (hasNoReplyTo != null) return hasNoReplyTo
-
-    testedNotes.add(note)
-
-    // recursive
-    val roots = note.replyTo?.map {
-      if (it !in testedNotes)
-        searchRoot(it, testedNotes)
-      else
-        null
-    }?.filterNotNull()
-
-    if (roots != null && roots.isNotEmpty()) {
-      return roots[0]
-    }
-
-    return null
-  }
-
-  fun loadThread(noteId: String) {
-    val note = LocalCache.notes[noteId]
-
-    if (note != null) {
-      val thread = mutableListOf<Note>()
-      val threadSet = mutableSetOf<Note>()
-
-      val threadRoot = searchRoot(note) ?: note
-
-      loadDown(threadRoot, thread, threadSet)
-
-      // Currently orders by date of each event, descending, at each level of the reply stack
-      val order = compareByDescending<Note> { it.replyLevelSignature() }
-
-      eventsToWatch.clear()
-      eventsToWatch.addAll(thread.sortedWith(order).map { it.idHex })
-    } else {
-      eventsToWatch.clear()
-      eventsToWatch.add(noteId)
-    }
-
-    resetFilters()
-  }
-
-  fun loadDown(note: Note, thread: MutableList<Note>, threadSet: MutableSet<Note>) {
-    if (note !in threadSet) {
-      thread.add(note)
-      threadSet.add(note)
-
-      synchronized(note.replies) {
-        note.replies.toList()
-      }.forEach {
-        loadDown(it, thread, threadSet)
-      }
-    }
+    invalidateFilters()
   }
 }

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

@@ -1,52 +1,90 @@
 package com.vitorpamplona.amethyst.service
 
-import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.LocalCache
-import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.model.User
-import com.vitorpamplona.amethyst.model.toByteArray
+import com.vitorpamplona.amethyst.service.model.LnZapEvent
+import com.vitorpamplona.amethyst.service.relays.FeedType
+import com.vitorpamplona.amethyst.service.relays.TypedFilter
 import nostr.postr.JsonFilter
+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.toByteArray())
+  fun loadUserProfile(userId: String?) {
+    if (userId != null) {
+      user = LocalCache.getOrCreateUser(userId)
+    } else {
+      user = null
+    }
+
     resetFilters()
   }
 
-  fun createUserInfoFilter(): JsonFilter {
-    return JsonFilter(
-      kinds = listOf(MetadataEvent.kind),
-      authors = listOf(user!!.pubkeyHex),
-      limit = 1
+  fun createUserInfoFilter() = user?.let {
+    TypedFilter(
+      types = FeedType.values().toSet(),
+      filter = JsonFilter(
+        kinds = listOf(MetadataEvent.kind),
+        authors = listOf(it.pubkeyHex),
+        limit = 1
+      )
     )
   }
 
-  fun createUserPostsFilter(): JsonFilter {
-    return JsonFilter(
-      kinds = listOf(TextNoteEvent.kind),
-      authors = listOf(user!!.pubkeyHex),
-      limit = 100
+  fun createUserPostsFilter() = user?.let {
+    TypedFilter(
+      types = FeedType.values().toSet(),
+      filter = JsonFilter(
+        kinds = listOf(TextNoteEvent.kind),
+        authors = listOf(it.pubkeyHex),
+        limit = 200
+      )
+    )
+  }
+
+  fun createUserReceivedZapsFilter() = user?.let {
+    TypedFilter(
+      types = FeedType.values().toSet(),
+      filter = JsonFilter(
+        kinds = listOf(LnZapEvent.kind),
+        tags = mapOf("p" to listOf(it.pubkeyHex))
+      )
+    )
+  }
+
+  fun createFollowFilter() = user?.let {
+    TypedFilter(
+      types = FeedType.values().toSet(),
+      filter = JsonFilter(
+        kinds = listOf(ContactListEvent.kind),
+        authors = listOf(it.pubkeyHex),
+        limit = 1
+      )
+    )
+  }
+
+  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()
-  val notesChannel = requestNewChannel()
-
-  override fun feed(): List<Note> {
-    val notes = user?.notes ?: return emptyList()
-    val sortedNotes = synchronized(notes) {
-      notes.filter { account.isAcceptable(it) }.sortedBy { it.event?.createdAt }
-    }
-    return sortedNotes.reversed()
-  }
 
   override fun updateChannelFilters() {
-    userInfoChannel.filter = listOf(createUserInfoFilter()).ifEmpty { null }
-    notesChannel.filter = listOf(createUserPostsFilter()).ifEmpty { null }
+    userInfoChannel.typedFilters = listOfNotNull(
+      createUserInfoFilter(),
+      createUserPostsFilter(),
+      createFollowFilter(),
+      createFollowersFilter(),
+      createUserReceivedZapsFilter()
+    ).ifEmpty { null }
   }
 }

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

@@ -1,36 +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 NostrUserProfileFollowersDataSource: NostrDataSource<User>("UserProfileFollowerFeed") {
-  lateinit var account: Account
-  var user: User? = null
-
-  fun loadUserProfile(userId: String) {
-    user = LocalCache.users[userId]
-    resetFilters()
-  }
-
-  fun createFollowersFilter() = JsonFilter(
-    kinds = listOf(ContactListEvent.kind),
-    tags = mapOf("p" to listOf(user!!.pubkeyHex))
-  )
-
-  val followerChannel = requestNewChannel()
-
-  override fun feed(): List<User> {
-    val followers = user?.followers ?: emptyList()
-
-    return synchronized(followers) {
-      followers.filter { account.isAcceptable(it) }.toList()
-    }
-  }
-
-  override fun updateChannelFilters() {
-    followerChannel.filter = listOf(createFollowersFilter()).ifEmpty { null }
-  }
-}

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

@@ -1,39 +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()
-  }
-
-  fun createFollowFilter(): JsonFilter {
-    return JsonFilter(
-      kinds = listOf(ContactListEvent.kind),
-      authors = listOf(user!!.pubkeyHex),
-      limit = 1
-    )
-  }
-
-  val followChannel = requestNewChannel()
-
-  override fun feed(): List<User> {
-    val follows = user?.follows ?: emptyList()
-
-    return synchronized(follows) {
-      follows.filter { account.isAcceptable(it) }.toList()
-    }
-  }
-
-  override fun updateChannelFilters() {
-    followChannel.filter = listOf(createFollowFilter()).ifEmpty { null }
-  }
-}

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

@@ -0,0 +1,135 @@
+package com.vitorpamplona.amethyst.service.lang
+
+import android.util.LruCache
+import com.google.android.gms.tasks.Task
+import com.google.android.gms.tasks.Tasks
+import com.google.mlkit.nl.languageid.LanguageIdentification
+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 com.linkedin.urls.detection.UrlDetector
+import com.linkedin.urls.detection.UrlDetectorOptions
+import java.util.regex.Pattern
+
+class ResultOrError(
+  var result: String?,
+  var sourceLang: String?,
+  var targetLang: String?,
+  var error: Exception?
+)
+
+object LanguageTranslatorService {
+  private val languageIdentification = LanguageIdentification.getClient()
+  val lnRegex = Pattern.compile("\\blnbc[a-z0-9]+\\b")
+
+  private val translators =
+    object : LruCache<TranslatorOptions, Translator>(10) {
+      override fun create(options: TranslatorOptions): Translator {
+        return Translation.getClient(options)
+      }
+
+      override fun entryRemoved(
+        evicted: Boolean,
+        key: TranslatorOptions,
+        oldValue: Translator,
+        newValue: Translator?
+      ) {
+        oldValue.close()
+      }
+    }
+
+  fun identifyLanguage(text: String): Task<String> {
+    return languageIdentification.identifyLanguage(text)
+  }
+
+  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()
+    }
+
+    val options = TranslatorOptions.Builder()
+      .setSourceLanguage(sourceLangCode)
+      .setTargetLanguage(targetLangCode)
+      .build()
+
+    val translator = translators[options]
+
+    return translator.downloadModelIfNeeded().onSuccessTask {
+      val tasks = mutableListOf<Task<String>>()
+
+      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) {
+          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) {
+        Tasks.forCanceled()
+      } else if (it != "und" && !dontTranslateFrom.contains(it)) {
+        translate(text, it, translateTo)
+      } else {
+        Tasks.forCanceled()
+      }
+    }
+  }
+}

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

@@ -0,0 +1,163 @@
+package com.vitorpamplona.amethyst.service.lnurl
+
+import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
+import java.net.URLEncoder
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import nostr.postr.Bech32
+import okhttp3.Call
+import okhttp3.Callback
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import okhttp3.Response
+
+class LightningAddressResolver {
+  val client = OkHttpClient.Builder().build()
+
+  fun assembleUrl(lnaddress: String): String? {
+    val parts = lnaddress.split("@")
+
+    if (parts.size == 2) {
+      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) {
+    val scope = CoroutineScope(Job() + Dispatchers.IO)
+    scope.launch {
+      fetchLightningAddressJsonSuspend(lnaddress, onSuccess, onError)
+    }
+  }
+
+  private suspend fun fetchLightningAddressJsonSuspend(lnaddress: String, onSuccess: (String) -> Unit, onError: (String) -> Unit) {
+    val url = assembleUrl(lnaddress)
+
+    if (url == null) {
+      onError("Could not assemble LNUrl from Lightning Address \"${lnaddress}\". Check the user's setup")
+      return
+    }
+
+    withContext(Dispatchers.IO) {
+      val request: Request = Request.Builder().url(url).build()
+
+      client.newCall(request).enqueue(object : Callback {
+        override fun onResponse(call: Call, response: Response) {
+          response.use {
+            if (it.isSuccessful)
+              onSuccess(it.body.string())
+            else
+              onError("Could not resolve ${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 ${url}. Check if the server up and if the lightning address ${lnaddress} is correct")
+          e.printStackTrace()
+        }
+      })
+    }
+  }
+
+  fun fetchLightningInvoice(lnCallback: String, milliSats: Long, message: String, nostrRequest: String? = null, onSuccess: (String) -> Unit, onError: (String) -> Unit) {
+    val scope = CoroutineScope(Job() + Dispatchers.IO)
+    scope.launch {
+      fetchLightningInvoiceSuspend(lnCallback, milliSats, message, nostrRequest, onSuccess, onError)
+    }
+  }
+
+  private suspend fun fetchLightningInvoiceSuspend(lnCallback: String, milliSats: Long, message: String, nostrRequest: String? = null, onSuccess: (String) -> Unit, onError: (String) -> Unit) {
+    withContext(Dispatchers.IO) {
+      val encodedMessage = URLEncoder.encode(message, "utf-8")
+
+      val urlBinder = if (lnCallback.contains("?")) "&" else "?"
+      var url = "$lnCallback${urlBinder}amount=$milliSats&comment=$encodedMessage"
+
+      if (nostrRequest != null) {
+        val encodedNostrRequest = URLEncoder.encode(nostrRequest, "utf-8")
+        url += "&nostr=$encodedNostrRequest"
+      }
+
+      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(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}")
+          e.printStackTrace()
+        }
+      })
+    }
+  }
+
+  fun lnAddressToLnUrl(lnaddress: String, onSuccess: (String) -> Unit, onError: (String) -> Unit) {
+    fetchLightningAddressJson(lnaddress,
+      onSuccess = {
+        onSuccess(Bech32.encodeBytes("lnurl",it.toByteArray(), Bech32.Encoding.Bech32))
+      },
+      onError = onError
+    )
+  }
+
+  fun lnAddressInvoice(lnaddress: String, milliSats: Long, message: String, nostrRequest: String? = null, onSuccess: (String) -> Unit, onError: (String) -> Unit) {
+    val mapper = jacksonObjectMapper()
+
+    fetchLightningAddressJson(lnaddress,
+      onSuccess = {
+        val lnurlp = try {
+          mapper.readTree(it)
+        } catch (t: Throwable) {
+          onError("Error Parsing JSON from Lightning Address. Check the user's lightning setup")
+          null
+        }
+
+        val callback = lnurlp?.get("callback")?.asText()
+
+        if (callback == null) {
+          onError("Callback URL not found in the User's lightning address server configuration")
+        }
+
+        val allowsNostr = lnurlp?.get("allowsNostr")?.asBoolean() ?: false
+
+        callback?.let { callback ->
+          fetchLightningInvoice(callback, milliSats, message, if (allowsNostr) nostrRequest else null,
+            onSuccess = {
+              val lnInvoice = try {
+                mapper.readTree(it)
+              } catch (t: Throwable) {
+                onError("Error Parsing JSON from Lightning Address's invoice fetch. Check the user's lightning setup")
+                null
+              }
+
+              lnInvoice?.get("pr")?.asText()?.let { pr ->
+                onSuccess(pr)
+              } ?: onError("Invoice Not Created (element pr not found in the resulting JSON)")
+            },
+            onError = onError
+          )
+        }
+      },
+      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/ChannelCreateEvent.kt

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

app/src/main/java/com/vitorpamplona/amethyst/service/model/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

@@ -1,11 +1,10 @@
 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,
@@ -20,21 +19,24 @@ class ChannelMetadataEvent (
 
   init {
     channel = tags.firstOrNull { it.firstOrNull() == "e" }?.getOrNull(1)
-    try {
-      channelInfo = MetadataEvent.gson.fromJson(content, ChannelCreateEvent.ChannelData::class.java)
-    } catch (e: Exception) {
-      throw Error("can't parse $content", e)
-    }
+    channelInfo =
+      try {
+        MetadataEvent.gson.fromJson(content, ChannelCreateEvent.ChannelData::class.java)
+      } catch (e: Exception) {
+        Log.e("ChannelMetadataEvent", "Can't parse channel info $content", e)
+        ChannelCreateEvent.ChannelData(null, null, null)
+      }
   }
 
   companion object {
     const val kind = 41
 
     fun create(newChannelInfo: ChannelCreateEvent.ChannelData?, originalChannelIdHex: String, privateKey: ByteArray, createdAt: Long = Date().time / 1000): ChannelMetadataEvent {
-      val content = if (newChannelInfo != null)
-        gson.toJson(newChannelInfo)
-      else
-        ""
+      val content =
+        if (newChannelInfo != null)
+          gson.toJson(newChannelInfo)
+        else
+          ""
 
       val pubKey = Utils.pubkeyCreate(privateKey)
       val tags = listOf( listOf("e", originalChannelIdHex, "", "root") )

app/src/main/java/com/vitorpamplona/amethyst/service/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

@@ -0,0 +1,47 @@
+package com.vitorpamplona.amethyst.service.model
+
+import com.vitorpamplona.amethyst.service.lnurl.LnInvoiceUtil
+import com.vitorpamplona.amethyst.service.relays.Client
+import java.math.BigDecimal
+import nostr.postr.events.Event
+
+class LnZapEvent (
+  id: ByteArray,
+  pubKey: ByteArray,
+  createdAt: Long,
+  tags: List<List<String>>,
+  content: String,
+  sig: ByteArray
+): Event(id, pubKey, createdAt, kind, tags, content, sig) {
+
+  @Transient val zappedPost: List<String>
+  @Transient val zappedAuthor: List<String>
+  @Transient val containedPost: Event?
+  @Transient val lnInvoice: String?
+  @Transient val preimage: String?
+  @Transient val amount: BigDecimal?
+
+  init {
+    zappedPost = tags.filter { it.firstOrNull() == "e" }.mapNotNull { it.getOrNull(1) }
+    zappedAuthor = tags.filter { it.firstOrNull() == "p" }.mapNotNull { it.getOrNull(1) }
+
+    lnInvoice = tags.filter { it.firstOrNull() == "bolt11" }.mapNotNull { it.getOrNull(1) }.firstOrNull()
+    amount = lnInvoice?.let { LnInvoiceUtil.getAmountInSats(lnInvoice) }
+    preimage = tags.filter { it.firstOrNull() == "preimage" }.mapNotNull { it.getOrNull(1) }.firstOrNull()
+
+    val description = tags.filter { it.firstOrNull() == "description" }.mapNotNull { it.getOrNull(1) }.firstOrNull()
+
+    containedPost = try {
+      if (description == null)
+        null
+      else
+        fromJson(description, Client.lenient)
+    } catch (e: Exception) {
+      null
+    }
+  }
+
+  companion object {
+    const val kind = 9735
+  }
+}

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

@@ -0,0 +1,87 @@
+package com.vitorpamplona.amethyst.service.model
+
+import java.util.Date
+import nostr.postr.Utils
+import nostr.postr.events.Event
+import nostr.postr.toHex
+
+class LnZapRequestEvent (
+  id: ByteArray,
+  pubKey: ByteArray,
+  createdAt: Long,
+  tags: List<List<String>>,
+  content: String,
+  sig: ByteArray
+): Event(id, pubKey, createdAt, kind, tags, content, sig) {
+
+  @Transient val zappedPost: List<String>
+  @Transient val zappedAuthor: List<String>
+
+  init {
+    zappedPost = tags.filter { it.firstOrNull() == "e" }.mapNotNull { it.getOrNull(1) }
+    zappedAuthor = tags.filter { it.firstOrNull() == "p" }.mapNotNull { it.getOrNull(1) }
+  }
+
+  companion object {
+    const val kind = 9734
+
+    fun create(originalNote: Event, relays: Set<String>, privateKey: ByteArray, createdAt: Long = Date().time / 1000): LnZapRequestEvent {
+      val content = ""
+      val pubKey = Utils.pubkeyCreate(privateKey)
+      val tags = listOf(
+        listOf("e", originalNote.id.toHex()),
+        listOf("p", originalNote.pubKey.toHex()),
+        listOf("relays") + relays
+      )
+      val id = generateId(pubKey, createdAt, kind, tags, content)
+      val sig = Utils.sign(id, privateKey)
+      return LnZapRequestEvent(id, pubKey, createdAt, tags, content, sig)
+    }
+
+    fun create(userHex: String, relays: Set<String>, privateKey: ByteArray, createdAt: Long = Date().time / 1000): LnZapRequestEvent {
+      val content = ""
+      val pubKey = Utils.pubkeyCreate(privateKey)
+      val tags = listOf(
+        listOf("p", userHex),
+        listOf("relays") + relays
+      )
+      val id = generateId(pubKey, createdAt, kind, tags, content)
+      val sig = Utils.sign(id, privateKey)
+      return LnZapRequestEvent(id, pubKey, createdAt, tags, content, sig)
+    }
+  }
+}
+
+/*
+{
+  "pubkey": "32e1827635450ebb3c5a7d12c1f8e7b2b514439ac10a67eef3d9fd9c5c68e245",
+  "content": "",
+  "id": "d9cc14d50fcb8c27539aacf776882942c1a11ea4472f8cdec1dea82fab66279d",
+  "created_at": 1674164539,
+  "sig": "77127f636577e9029276be060332ea565deaf89ff215a494ccff16ae3f757065e2bc59b2e8c113dd407917a010b3abd36c8d7ad84c0e3ab7dab3a0b0caa9835d",
+  "kind": 9734,
+  "tags": [
+  [
+    "e",
+    "3624762a1274dd9636e0c552b53086d70bc88c165bc4dc0f9e836a1eaf86c3b8"
+  ],
+  [
+    "p",
+    "32e1827635450ebb3c5a7d12c1f8e7b2b514439ac10a67eef3d9fd9c5c68e245"
+  ],
+  [
+    "relays",
+    "wss://relay.damus.io",
+    "wss://nostr-relay.wlvs.space",
+    "wss://nostr.fmt.wiz.biz",
+    "wss://relay.nostr.bg",
+    "wss://nostr.oxtr.dev",
+    "wss://nostr.v0l.io",
+    "wss://brb.io",
+    "wss://nostr.bitcoiner.social",
+    "ws://monad.jb55.com:8080",
+    "wss://relay.snort.social"
+  ]
+  ]
+}
+*/

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

@@ -1,6 +1,5 @@
 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

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

@@ -1,10 +1,9 @@
 package com.vitorpamplona.amethyst.service.relays
 
-import com.vitorpamplona.amethyst.service.Constants
-import java.util.Collections
 import java.util.UUID
-import java.util.concurrent.ConcurrentHashMap
-import nostr.postr.JsonFilter
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
 import nostr.postr.events.Event
 
 /**
@@ -24,29 +23,44 @@ object Client: RelayPool.Listener {
      **/
     var lenient: Boolean = false
     private var listeners = setOf<Listener>()
-    private var relays = Constants.defaultRelays
-    private val subscriptions = mutableMapOf<String, List<JsonFilter>>()
+    private var relays = Constants.convertDefaultRelays()
+    private var subscriptions = mapOf<String, List<TypedFilter>>()
 
-    fun connect(relays: Array<Relay> = Constants.defaultRelays) {
+    @Synchronized
+    fun connect(relays: Array<Relay>) {
         RelayPool.register(this)
         RelayPool.unloadRelays()
         RelayPool.loadRelays(relays.toList())
         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<JsonFilter> = listOf(JsonFilter())
+        filters: List<TypedFilter> = listOf()
     ) {
-        subscriptions[subscriptionId] = filters
+        subscriptions = subscriptions + Pair(subscriptionId, filters)
         RelayPool.sendFilter(subscriptionId)
     }
 
     fun sendFilterOnlyIfDisconnected(
         subscriptionId: String = UUID.randomUUID().toString().substring(0..10),
-        filters: List<JsonFilter> = listOf(JsonFilter())
+        filters: List<TypedFilter> = listOf()
     ) {
-        subscriptions[subscriptionId] = filters
+        subscriptions = subscriptions + Pair(subscriptionId, filters)
         RelayPool.sendFilterOnlyIfDisconnected()
     }
 
@@ -54,8 +68,9 @@ object Client: RelayPool.Listener {
         RelayPool.send(signedEvent)
     }
 
-    fun close(subscriptionId: String){
+    fun close(subscriptionId: String) {
         RelayPool.close(subscriptionId)
+        subscriptions = subscriptions.minus(subscriptionId)
     }
 
     fun disconnect() {
@@ -65,19 +80,35 @@ object Client: RelayPool.Listener {
     }
 
     override fun onEvent(event: Event, subscriptionId: String, relay: Relay) {
-        listeners.forEach { it.onEvent(event, subscriptionId, relay) }
+        // Releases the Web thread for the new payload.
+        // May need to add a processing queue if processing new events become too costly.
+        GlobalScope.launch(Dispatchers.Default) {
+            listeners.forEach { it.onEvent(event, subscriptionId, relay) }
+        }
     }
 
     override fun onError(error: Error, subscriptionId: String, relay: Relay) {
-        listeners.forEach { it.onError(error, subscriptionId, relay) }
+        // Releases the Web thread for the new payload.
+        // May need to add a processing queue if processing new events become too costly.
+        GlobalScope.launch(Dispatchers.Default) {
+            listeners.forEach { it.onError(error, subscriptionId, relay) }
+        }
     }
 
-    override fun onRelayStateChange(type: Relay.Type, relay: Relay) {
-        listeners.forEach { it.onRelayStateChange(type, relay) }
+    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(Dispatchers.Default) {
+            listeners.forEach { it.onRelayStateChange(type, relay, channel) }
+        }
     }
 
     override fun onSendResponse(eventId: String, success: Boolean, message: String, relay: Relay) {
-        listeners.forEach { it.onSendResponse(eventId, success, message, relay) }
+        // Releases the Web thread for the new payload.
+        // May need to add a processing queue if processing new events become too costly.
+        GlobalScope.launch(Dispatchers.Default) {
+            listeners.forEach { it.onSendResponse(eventId, success, message, relay) }
+        }
     }
 
     fun subscribe(listener: Listener) {
@@ -89,12 +120,10 @@ object Client: RelayPool.Listener {
     }
 
     fun allSubscriptions(): List<String> {
-        return synchronized(subscriptions) {
-            subscriptions.keys.toList()
-        }
+        return subscriptions.keys.toList()
     }
 
-    fun getSubscriptionFilters(subId: String): List<JsonFilter> {
+    fun getSubscriptionFilters(subId: String): List<TypedFilter> {
         return subscriptions[subId] ?: emptyList()
     }
 
@@ -112,7 +141,7 @@ object Client: RelayPool.Listener {
         /**
          * Connected to or disconnected from a relay
          */
-        open fun onRelayStateChange(type: Relay.Type, relay: Relay) = Unit
+        open fun onRelayStateChange(type: Relay.Type, relay: Relay, channel: String?) = Unit
 
         /**
          * When an relay saves or rejects a new event.

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

@@ -0,0 +1,48 @@
+package com.vitorpamplona.amethyst.service.relays
+
+import com.vitorpamplona.amethyst.model.RelaySetupInfo
+
+object Constants {
+  val activeTypes = setOf(FeedType.FOLLOWS, FeedType.PRIVATE_DMS)
+  val activeTypesGlobalChats = setOf(FeedType.FOLLOWS, FeedType.PUBLIC_CHATS, FeedType.PRIVATE_DMS, FeedType.GLOBAL)
+
+  fun convertDefaultRelays(): Array<Relay> {
+    return defaultRelays.map {
+      Relay(it.url, it.read, it.write, it.feedTypes)
+    }.toTypedArray()
+  }
+
+  val defaultRelays = arrayOf(
+    // Free relays
+    RelaySetupInfo("wss://nostr.bitcoiner.social", read = true, write = true, feedTypes = activeTypes),
+    RelaySetupInfo("wss://relay.nostr.bg", read = true, write = true, feedTypes = activeTypes),
+    RelaySetupInfo("wss://relay.snort.social", read = true, write = true, feedTypes = activeTypes),
+    RelaySetupInfo("wss://relay.damus.io", read = true, write = true, feedTypes = activeTypes),
+    RelaySetupInfo("wss://nostr.oxtr.dev", read = true, write = true, feedTypes = activeTypes),
+    RelaySetupInfo("wss://nostr-pub.wellorder.net", read = true, write = true, feedTypes = activeTypes),
+    RelaySetupInfo("wss://nostr.mom", read = true, write = true, feedTypes = activeTypes),
+    RelaySetupInfo("wss://no.str.cr", read = true, write = true, feedTypes = activeTypes),
+    RelaySetupInfo("wss://nos.lol", read = true, write = true, feedTypes = activeTypes),
+
+    // Less Reliable
+    //NewRelayListViewModel.Relay("wss://nostr.orangepill.dev", read = true, write = true, feedTypes = activeTypes),
+    //NewRelayListViewModel.Relay("wss://nostr.onsats.org", read = true, write = true, feedTypes = activeTypes),
+    //NewRelayListViewModel.Relay("wss://nostr.sandwich.farm", read = true, write = true, feedTypes = activeTypes),
+    //NewRelayListViewModel.Relay("wss://relay.nostr.ch", read = true, write = true, feedTypes = activeTypes),
+    //NewRelayListViewModel.Relay("wss://nostr.zebedee.cloud", read = true, write = true, feedTypes = activeTypes),
+    //NewRelayListViewModel.Relay("wss://nostr.rocks", read = true, write = true, feedTypes = activeTypes),
+    //NewRelayListViewModel.Relay("wss://nostr.fmt.wiz.biz", read = true, write = true, feedTypes = activeTypes),
+    //NewRelayListViewModel.Relay("wss://brb.io", read = true, write = true, feedTypes = activeTypes),
+
+    // Paid relays
+    RelaySetupInfo("wss://relay.nostr.com.au", read = true, write = false, feedTypes = activeTypesGlobalChats),
+    RelaySetupInfo("wss://eden.nostr.land", read = true, write = false, feedTypes = activeTypesGlobalChats),
+    RelaySetupInfo("wss://nostr.milou.lol", read = true, write = false, feedTypes = activeTypesGlobalChats),
+    RelaySetupInfo("wss://puravida.nostr.land", read = true, write = false, feedTypes = activeTypesGlobalChats),
+    RelaySetupInfo("wss://nostr.wine", read = true, write = false, feedTypes = activeTypesGlobalChats),
+    RelaySetupInfo("wss://nostr.inosta.cc", read = true, write = false, feedTypes = activeTypesGlobalChats),
+    RelaySetupInfo("wss://atlas.nostr.land", read = true, write = false, feedTypes = activeTypesGlobalChats),
+    RelaySetupInfo("wss://relay.orangepill.dev", read = true, write = false, feedTypes = activeTypesGlobalChats),
+    RelaySetupInfo("wss://relay.nostrati.com", read = true, write = false, feedTypes = activeTypesGlobalChats),
+  )
+}

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

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

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

@@ -2,29 +2,38 @@ package com.vitorpamplona.amethyst.service.relays
 
 import android.util.Log
 import com.google.gson.JsonElement
-import com.vitorpamplona.amethyst.model.LocalCache
 import java.util.Date
-import nostr.postr.events.ContactListEvent
 import nostr.postr.events.Event
-import nostr.postr.toNpub
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
 import okhttp3.WebSocket
 import okhttp3.WebSocketListener
 
+enum class FeedType {
+    FOLLOWS, PUBLIC_CHATS, PRIVATE_DMS, GLOBAL
+}
+
 class Relay(
-  var url: String,
-  var read: Boolean = true,
-  var write: Boolean = true
+    var url: String,
+    var read: Boolean = true,
+    var write: Boolean = true,
+    var activeTypes: Set<FeedType> = FeedType.values().toSet(),
 ) {
-    private val httpClient = OkHttpClient()
+    private val httpClient = OkHttpClient.Builder()
+        .followRedirects(true)
+        .followSslRedirects(true)
+        .build();
+
     private var listeners = setOf<Listener>()
     private var socket: WebSocket? = null
+    private var isReady: Boolean = false
 
     var eventDownloadCounter = 0
+    var spamCounter = 0
     var eventUploadCounter = 0
     var errorCounter = 0
+    var ping: Long? = null
 
     var closingTime = 0L
 
@@ -40,17 +49,24 @@ class Relay(
         return socket != null
     }
 
+    @Synchronized
     fun requestAndWatch() {
+        if (socket != null) return
+
         try {
             val request = Request.Builder().url(url.trim()).build()
             val listener = object : WebSocketListener() {
 
                 override fun onOpen(webSocket: WebSocket, response: Response) {
+                    isReady = true
+                    ping = response.receivedResponseAtMillis - response.sentRequestAtMillis
+
+                    // Log.w("Relay", "Relay OnOpen, Loading All subscriptions $url")
                     // Sends everything.
                     Client.allSubscriptions().forEach {
                         sendFilter(requestId = it)
                     }
-                    listeners.forEach { it.onRelayStateChange(this@Relay, Type.CONNECT) }
+                    listeners.forEach { it.onRelayStateChange(this@Relay, Type.CONNECT, null) }
                 }
 
                 override fun onMessage(webSocket: WebSocket, text: String) {
@@ -60,21 +76,26 @@ class Relay(
                         val channel = msg[1].asString
                         when (type) {
                             "EVENT" -> {
+                                //Log.w("Relay", "Relay onEVENT $url, $channel")
                                 eventDownloadCounter++
                                 val event = Event.fromJson(msg[2], Client.lenient)
                                 listeners.forEach { it.onEvent(this@Relay, channel, event) }
                             }
                             "EOSE" -> listeners.forEach {
-                                it.onRelayStateChange(this@Relay, Type.EOSE)
+                                //Log.w("Relay", "Relay onEOSE $url, $channel")
+                                it.onRelayStateChange(this@Relay, Type.EOSE, channel)
                             }
                             "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"))
                             }
                             "OK" -> listeners.forEach {
+                                //Log.w("Relay", "Relay onOK $url, $channel")
                                 it.onSendResponse(this@Relay, msg[1].asString, msg[2].asBoolean, msg[3].asString)
                             }
                             else -> listeners.forEach {
+                                //Log.w("Relay", "Relay something else $url, $channel")
                                 it.onError(
                                     this@Relay,
                                     channel,
@@ -91,13 +112,18 @@ class Relay(
                 }
 
                 override fun onClosing(webSocket: WebSocket, code: Int, reason: String) {
-                    listeners.forEach { it.onRelayStateChange(this@Relay, Type.DISCONNECTING) }
+                    listeners.forEach { it.onRelayStateChange(
+                        this@Relay,
+                        Type.DISCONNECTING,
+                        null
+                    ) }
                 }
 
                 override fun onClosed(webSocket: WebSocket, code: Int, reason: String) {
                     socket = null
+                    isReady = false
                     closingTime = Date().time / 1000
-                    listeners.forEach { it.onRelayStateChange(this@Relay, Type.DISCONNECT) }
+                    listeners.forEach { it.onRelayStateChange(this@Relay, Type.DISCONNECT, null) }
                 }
 
                 override fun onFailure(webSocket: WebSocket, t: Throwable, response: Response?) {
@@ -106,10 +132,11 @@ class Relay(
                     socket?.close(1000, "Normal close")
                     // Failures disconnect the relay.
                     socket = null
+                    isReady = false
                     closingTime = Date().time / 1000
 
-                    Log.w("Relay", "Relay onFailure ${url}, ${response?.message}")
-                    //t.printStackTrace()
+                    Log.w("Relay", "Relay onFailure $url, ${response?.message} ${response}")
+                    t.printStackTrace()
                     listeners.forEach {
                         it.onError(this@Relay, "", Error("WebSocket Failure. Response: ${response}. Exception: ${t.message}", t))
                     }
@@ -118,8 +145,10 @@ class Relay(
 
             socket = httpClient.newWebSocket(request, listener)
         } catch (e: Exception) {
+            errorCounter++
+            isReady = false
             closingTime = Date().time / 1000
-            Log.e("Relay", "Relay Invalid ${url}")
+            Log.e("Relay", "Relay Invalid $url")
             e.printStackTrace()
         }
     }
@@ -129,22 +158,26 @@ class Relay(
         closingTime = Date().time / 1000
         socket?.close(1000, "Normal close")
         socket = null
+        isReady = false
     }
 
     fun sendFilter(requestId: String) {
         if (read) {
-            if (socket == null) {
-                // waits 10 seconds
-                if (Date().time / 1000 > closingTime + 10) {
-                    requestAndWatch()
+            if (isConnected()) {
+                if (isReady) {
+                    val filters = Client.getSubscriptionFilters(requestId).filter { activeTypes.intersect(it.types).isNotEmpty() }
+                    if (filters.isNotEmpty()) {
+                        val request =
+                            """["REQ","$requestId",${filters.take(10).joinToString(",") { it.filter.toJson() }}]"""
+                        //println("FILTERSSENT ${url} ${request}")
+                        socket?.send(request)
+                    }
                 }
             } else {
-                val filters = Client.getSubscriptionFilters(requestId)
-                if (filters.isNotEmpty()) {
-                    val request =
-                        """["REQ","$requestId",${filters.joinToString(",") { it.toJson() }}]"""
-                    //println("FILTERSSENT ${url} " + """["REQ","$requestId",${filters.joinToString(",") { it.toJson() }}]""")
-                    socket?.send(request)
+                // waits 60 seconds to reconnect after disconnected.
+                if (Date().time / 1000 > closingTime + 60) {
+                    // sends all filters after connection is successful.
+                    requestAndWatch()
                 }
             }
         }
@@ -152,7 +185,11 @@ class Relay(
 
     fun sendFilterOnlyIfDisconnected() {
         if (socket == null) {
-            requestAndWatch()
+            // waits 60 seconds to reconnect after disconnected.
+            if (Date().time / 1000 > closingTime + 60) {
+                //println("sendfilter Only if Disconnected ${url} ")
+                requestAndWatch()
+            }
         }
     }
 
@@ -167,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,
@@ -192,6 +236,6 @@ class Relay(
          *
          * @param type is 0 for disconnect and 1 for connect
          */
-        fun onRelayStateChange(relay: Relay, type: Type)
+        fun onRelayStateChange(relay: Relay, type: Type, channel: String?)
     }
 }

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

@@ -1,8 +1,6 @@
 package com.vitorpamplona.amethyst.service.relays
 
 import androidx.lifecycle.LiveData
-import com.vitorpamplona.amethyst.service.Constants
-import java.util.Collections
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
@@ -13,6 +11,9 @@ import nostr.postr.events.Event
  * RelayPool manages the connection to multiple Relays and lets consumers deal with simple events.
  */
 object RelayPool: Relay.Listener {
+
+    val scope = CoroutineScope(Job() + Dispatchers.IO)
+
     private var relays = listOf<Relay>()
     private var listeners = setOf<Listener>()
 
@@ -28,11 +29,11 @@ object RelayPool: Relay.Listener {
         return relays.firstOrNull() { it.url == url }
     }
 
-    fun loadRelays(relayList: List<Relay>? = null){
+    fun loadRelays(relayList: List<Relay>){
         if (!relayList.isNullOrEmpty()){
             relayList.forEach { addRelay(it) }
         } else {
-            Constants.defaultRelays.forEach { addRelay(it) }
+            Constants.convertDefaultRelays().forEach { addRelay(it) }
         }
     }
 
@@ -88,7 +89,7 @@ object RelayPool: Relay.Listener {
 
         fun onError(error: Error, subscriptionId: String, relay: Relay)
 
-        fun onRelayStateChange(type: Relay.Type, relay: Relay)
+        fun onRelayStateChange(type: Relay.Type, relay: Relay, channel: String?)
 
         fun onSendResponse(eventId: String, success: Boolean, message: String, relay: Relay)
     }
@@ -103,8 +104,8 @@ object RelayPool: Relay.Listener {
         refreshObservers()
     }
 
-    override fun onRelayStateChange(relay: Relay, type: Relay.Type) {
-        listeners.forEach { it.onRelayStateChange(type, relay) }
+    override fun onRelayStateChange(relay: Relay, type: Relay.Type, channel: String?) {
+        listeners.forEach { it.onRelayStateChange(type, relay, channel) }
         refreshObservers()
     }
 
@@ -116,7 +117,6 @@ object RelayPool: Relay.Listener {
     val live: RelayPoolLiveData = RelayPoolLiveData(this)
 
     private fun refreshObservers() {
-        val scope = CoroutineScope(Job() + Dispatchers.Main)
         scope.launch {
             live.refresh()
         }

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

@@ -0,0 +1,30 @@
+package com.vitorpamplona.amethyst.service.relays
+
+import com.google.gson.GsonBuilder
+import com.google.gson.JsonArray
+import com.google.gson.JsonObject
+import java.util.UUID
+
+data class Subscription (
+  val id: String = UUID.randomUUID().toString().substring(0,4),
+  val onEOSE: ((Long) -> Unit)? = null
+) {
+  var typedFilters: List<TypedFilter>? = null // Inactive when null
+
+  fun updateEOSE(l: Long) {
+    onEOSE?.let { it(l) }
+  }
+
+  fun toJson(): String {
+    return GsonBuilder().create().toJson(toJsonObject())
+  }
+
+  fun toJsonObject(): JsonObject {
+    val jsonObject = JsonObject()
+    jsonObject.addProperty("id", id)
+    typedFilters?.run {
+      jsonObject.add("typedFilters", JsonArray().apply { typedFilters?.forEach { add(it.toJsonObject()) } })
+    }
+    return jsonObject
+  }
+}

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

@@ -0,0 +1,55 @@
+package com.vitorpamplona.amethyst.service.relays
+
+import com.google.gson.GsonBuilder
+import com.google.gson.JsonArray
+import com.google.gson.JsonObject
+import nostr.postr.JsonFilter
+
+class TypedFilter(
+  val types: Set<FeedType>,
+  val filter: JsonFilter
+) {
+
+  fun toJson(): String {
+    return GsonBuilder().create().toJson(toJsonObject())
+  }
+
+  fun toJsonObject(): JsonObject {
+    val jsonObject = JsonObject()
+    jsonObject.add("types", typesToJson(types))
+    jsonObject.add("filter", filterToJson(filter))
+    return jsonObject
+  }
+
+  fun typesToJson(types: Set<FeedType>): JsonArray {
+    return JsonArray().apply { types.forEach { add(it.name.toLowerCase()) } }
+  }
+
+  fun filterToJson(filter: JsonFilter): JsonObject {
+    val jsonObject = JsonObject()
+    filter.ids?.run {
+      jsonObject.add("ids", JsonArray().apply { filter.ids?.forEach { add(it) } })
+    }
+    filter.authors?.run {
+      jsonObject.add("authors", JsonArray().apply { filter.authors?.forEach { add(it) } })
+    }
+    filter.kinds?.run {
+      jsonObject.add("kinds", JsonArray().apply { filter.kinds?.forEach { add(it) } })
+    }
+    filter.tags?.run {
+      entries.forEach { kv ->
+        jsonObject.add("#${kv.key}", JsonArray().apply { kv.value.forEach { add(it) } })
+      }
+    }
+    filter.since?.run {
+      jsonObject.addProperty("since", filter.since)
+    }
+    filter.until?.run {
+      jsonObject.addProperty("until", filter.until)
+    }
+    filter.limit?.run {
+      jsonObject.addProperty("limit", filter.limit)
+    }
+    return 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,21 +14,13 @@ import coil.ImageLoader
 import coil.decode.GifDecoder
 import coil.decode.ImageDecoderDecoder
 import coil.decode.SvgDecoder
-import coil.memory.MemoryCache
-import coil.request.CachePolicy
-import com.vitorpamplona.amethyst.EncryptedStorage
 import com.vitorpamplona.amethyst.LocalPreferences
 import com.vitorpamplona.amethyst.ServiceManager
-import com.vitorpamplona.amethyst.model.decodePublicKey
-import com.vitorpamplona.amethyst.model.toHexKey
 import com.vitorpamplona.amethyst.service.Nip19
 import com.vitorpamplona.amethyst.service.relays.Client
 import com.vitorpamplona.amethyst.ui.screen.AccountScreen
 import com.vitorpamplona.amethyst.ui.screen.AccountStateViewModel
 import com.vitorpamplona.amethyst.ui.theme.AmethystTheme
-import fr.acinq.secp256k1.Hex
-import nostr.postr.Persona
-import nostr.postr.bechToBytes
 
 class MainActivity : ComponentActivity() {
   override fun onCreate(savedInstanceState: Bundle?) {
@@ -50,7 +41,7 @@ class MainActivity : ComponentActivity() {
           add(GifDecoder.Factory())
         }
         add(SvgDecoder.Factory())
-      }
+      } //.logger(DebugLogger())
         .respectCacheHeaders(false)
         .build()
     }
@@ -60,11 +51,11 @@ class MainActivity : ComponentActivity() {
         // A surface container using the 'background' color from the theme
         Surface(modifier = Modifier.fillMaxSize(), color = MaterialTheme.colors.background) {
 
-          val accountViewModel: AccountStateViewModel = viewModel {
+          val accountStateViewModel: AccountStateViewModel = viewModel {
             AccountStateViewModel(LocalPreferences(applicationContext))
           }
 
-          AccountScreen(accountViewModel, startingPage)
+          AccountScreen(accountStateViewModel, startingPage)
         }
       }
     }
@@ -74,7 +65,8 @@ class MainActivity : ComponentActivity() {
 
   override fun onResume() {
     super.onResume()
-
+    
+    // Only starts after login
     ServiceManager.start()
   }
 
@@ -83,4 +75,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

@@ -0,0 +1,147 @@
+package com.vitorpamplona.amethyst.ui.actions
+
+import android.content.ContentResolver
+import android.content.ContentValues
+import android.content.Context
+import android.content.Intent
+import android.os.Build
+import android.os.Environment
+import android.provider.MediaStore
+import androidx.annotation.RequiresApi
+import androidx.core.net.toUri
+import java.io.File
+import okhttp3.*
+import okio.BufferedSource
+import okio.IOException
+import okio.sink
+
+
+object ImageSaver {
+    /**
+     * Saves the image to the gallery.
+     * May require a storage permission.
+     *
+     * @see PICTURES_SUBDIRECTORY
+     */
+    fun saveImage(
+        url: String,
+        context: Context,
+        onSuccess: () -> Any?,
+        onError: (Throwable) -> Any?,
+    ) {
+        val client = OkHttpClient.Builder().build()
+
+        val request = Request.Builder()
+            .get()
+            .url(url)
+            .build()
+
+        client.newCall(request).enqueue(object : Callback {
+            override fun onFailure(call: Call, e: IOException) {
+                e.printStackTrace()
+                onError(e)
+            }
+
+            override fun onResponse(call: Call, response: Response) {
+                try {
+                    check(response.isSuccessful)
+
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+                        val contentType = response.header("Content-Type")
+                        checkNotNull(contentType) {
+                            "Can't find out the content type"
+                        }
+
+                        saveContentQ(
+                            displayName = File(url).nameWithoutExtension,
+                            contentType = contentType,
+                            contentSource = response.body.source(),
+                            contentResolver = context.contentResolver,
+                        )
+                    } else {
+                        saveContentDefault(
+                            fileName = File(url).name,
+                            contentSource = response.body.source(),
+                            context = context,
+                        )
+                    }
+                    onSuccess()
+                } catch (e: Exception) {
+                    e.printStackTrace()
+                    onError(e)
+                }
+            }
+        })
+    }
+
+    @RequiresApi(Build.VERSION_CODES.Q)
+    private fun saveContentQ(
+        displayName: String,
+        contentType: String,
+        contentSource: BufferedSource,
+        contentResolver: ContentResolver,
+    ) {
+        val contentValues = ContentValues().apply {
+            put(MediaStore.MediaColumns.DISPLAY_NAME, displayName)
+            put(MediaStore.MediaColumns.MIME_TYPE, contentType)
+            put(
+                MediaStore.MediaColumns.RELATIVE_PATH,
+                Environment.DIRECTORY_PICTURES + File.separatorChar + PICTURES_SUBDIRECTORY
+            )
+        }
+
+        val uri =
+            contentResolver.insert(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, contentValues)
+        checkNotNull(uri) {
+            "Can't insert the new content"
+        }
+
+        try {
+            val outputStream = contentResolver.openOutputStream(uri)
+            checkNotNull(outputStream) {
+                "Can't open the content output stream"
+            }
+
+            outputStream.use {
+                contentSource.readAll(it.sink())
+            }
+        } catch (e: Exception) {
+            contentResolver.delete(uri, null, null)
+            throw e
+        }
+    }
+
+    private fun saveContentDefault(
+        fileName: String,
+        contentSource: BufferedSource,
+        context: Context,
+    ) {
+        val subdirectory = File(
+            Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_PICTURES),
+            PICTURES_SUBDIRECTORY
+        )
+
+        if (!subdirectory.exists()) {
+            subdirectory.mkdirs()
+        }
+
+        val outputFile = File(subdirectory, fileName)
+
+        outputFile
+            .outputStream()
+            .use {
+                contentSource.readAll(it.sink())
+            }
+
+        // Call the media scanner manually, so the image
+        // appears in the gallery faster.
+        context.sendBroadcast(
+            Intent(
+                Intent.ACTION_MEDIA_SCANNER_SCAN_FILE,
+                outputFile.toUri()
+            )
+        )
+    }
+
+    private const val PICTURES_SUBDIRECTORY = "Amethyst"
+}

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

@@ -1,56 +1,82 @@
 package com.vitorpamplona.amethyst.ui.actions
 
-import android.graphics.Bitmap
+import android.content.ContentResolver
+import android.net.Uri
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
-import java.io.ByteArrayOutputStream
 import java.io.IOException
 import java.util.UUID
 import okhttp3.Call
 import okhttp3.Callback
+import okhttp3.MediaType
 import okhttp3.MediaType.Companion.toMediaType
 import okhttp3.MultipartBody
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.RequestBody
-import okhttp3.RequestBody.Companion.toRequestBody
 import okhttp3.Response
+import okio.BufferedSink
+import okio.source
 
 object ImageUploader {
-  private fun encodeImage(bitmap: Bitmap): ByteArray {
-    val byteArrayOutPutStream = ByteArrayOutputStream()
-    bitmap.compress(Bitmap.CompressFormat.JPEG, 100, byteArrayOutPutStream)
-    return byteArrayOutPutStream.toByteArray()
-  }
+  fun uploadImage(
+    uri: Uri,
+    contentResolver: ContentResolver,
+    onSuccess: (String) -> Unit,
+    onError: (Throwable) -> Unit,
+) {
+    val contentType = contentResolver.getType(uri)
 
-  fun uploadImage(bitmap: Bitmap, onSuccess: (String) -> Unit) {
     val client = OkHttpClient.Builder().build()
 
-    val body: RequestBody = MultipartBody.Builder()
+    val requestBody: RequestBody = MultipartBody.Builder()
       .setType(MultipartBody.FORM)
       .addFormDataPart(
         "image",
-        "${UUID.randomUUID()}.png",
-        encodeImage(bitmap).toRequestBody("image/png".toMediaType())
+        "${UUID.randomUUID()}",
+        object : RequestBody() {
+          override fun contentType(): MediaType? =
+            contentType?.toMediaType()
+
+          override fun writeTo(sink: BufferedSink) {
+            val imageInputStream = contentResolver.openInputStream(uri)
+            checkNotNull(imageInputStream) {
+              "Can't open the image input stream"
+            }
+
+            imageInputStream.source().use(sink::writeAll)
+          }
+        }
       )
       .build()
 
     val request: Request = Request.Builder()
       .url("https://api.imgur.com/3/image")
       .header("Authorization", "Client-ID e6aea87296f3f96")
-      .post(body)
+      .post(requestBody)
       .build()
 
     client.newCall(request).enqueue(object : Callback {
       override fun onResponse(call: Call, response: Response) {
-        response.use {
-          val tree = jacksonObjectMapper().readTree(response.body!!.string())
-          val url = tree.get("data").get("link").asText()
-          onSuccess(url)
+        try {
+          check(response.isSuccessful)
+          response.body.use { body ->
+            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"
+            }
+
+            onSuccess(url)
+          }
+        } catch (e: Exception) {
+          e.printStackTrace()
+          onError(e)
         }
       }
 
       override fun onFailure(call: Call, e: IOException) {
         e.printStackTrace()
+        onError(e)
       }
     })
   }

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

@@ -17,18 +17,14 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.input.KeyboardCapitalization
 import androidx.compose.ui.text.style.TextDirection
 import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
 import androidx.compose.ui.window.Dialog
 import androidx.compose.ui.window.DialogProperties
 import androidx.lifecycle.viewmodel.compose.viewModel
 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) {

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

@@ -1,27 +1,15 @@
 package com.vitorpamplona.amethyst.ui.actions
 
+import android.widget.Toast
 import androidx.compose.foundation.border
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.PaddingValues
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.fillMaxHeight
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.itemsIndexed
+import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.text.KeyboardOptions
-import androidx.compose.material.Button
-import androidx.compose.material.ButtonDefaults
-import androidx.compose.material.Icon
-import androidx.compose.material.LocalTextStyle
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.OutlinedTextField
-import androidx.compose.material.Surface
-import androidx.compose.material.Text
-import androidx.compose.material.TextFieldDefaults
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material.*
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.remember
@@ -37,11 +25,9 @@ import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalSoftwareKeyboardController
 import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.input.KeyboardCapitalization
 import androidx.compose.ui.text.style.TextDirection
 import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
 import androidx.compose.ui.window.Dialog
 import androidx.compose.ui.window.DialogProperties
 import androidx.lifecycle.viewmodel.compose.viewModel
@@ -49,161 +35,172 @@ import coil.compose.AsyncImage
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.Note
-import com.vitorpamplona.amethyst.ui.components.UrlPreview
-import com.vitorpamplona.amethyst.ui.components.VideoView
-import com.vitorpamplona.amethyst.ui.components.imageExtension
-import com.vitorpamplona.amethyst.ui.components.isValidURL
-import com.vitorpamplona.amethyst.ui.components.noProtocolUrlValidator
-import com.vitorpamplona.amethyst.ui.components.videoExtension
+import com.vitorpamplona.amethyst.ui.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
     val focusRequester = remember { FocusRequester() }
     val keyboardController = LocalSoftwareKeyboardController.current
 
+    val scroolState = rememberScrollState()
+
     LaunchedEffect(Unit) {
+        postViewModel.load(account, baseReplyTo, quote)
         delay(100)
         focusRequester.requestFocus()
+
+        postViewModel.imageUploadingError.collect { error ->
+            Toast.makeText(context, error, Toast.LENGTH_SHORT).show()
+        }
     }
 
     Dialog(
         onDismissRequest = { onClose() },
         properties = DialogProperties(
             usePlatformDefaultWidth = false,
-            dismissOnClickOutside = false
+            dismissOnClickOutside = false,
+            decorFitsSystemWindows = false
         )
     ) {
-        Surface(
-            modifier = Modifier
-                .fillMaxWidth()
-                .fillMaxHeight()
-        ) {
-            Column(
-                modifier = Modifier.padding(10.dp)
-            ) {
-                Row(
-                    modifier = Modifier
-                        .fillMaxWidth(),
-                    horizontalArrangement = Arrangement.SpaceBetween,
-                    verticalAlignment = Alignment.CenterVertically
-                ) {
-                    CloseButton(onCancel = {
-                        postViewModel.cancel()
-                        onClose()
-                    })
-
-                    UploadFromGallery {
-                        postViewModel.upload(it, context)
-                    }
-
-                    PostButton(
-                        onPost = {
-                            postViewModel.sendPost()
-                            onClose()
-                        },
-                        postViewModel.message.text.isNotBlank()
-                    )
-                }
-
-                if (postViewModel.replyTos != null && baseReplyTo?.event is TextNoteEvent) {
-                    ReplyInformation(postViewModel.replyTos, postViewModel.mentions, "✖ ") {
-                        postViewModel.removeFromReplyList(it)
-                    }
-                }
-
-                OutlinedTextField(
-                    value = postViewModel.message,
-                    onValueChange = {
-                        postViewModel.updateMessage(it)
-                    },
-                    keyboardOptions = KeyboardOptions.Default.copy(
-                        capitalization = KeyboardCapitalization.Sentences
-                    ),
-                    modifier = Modifier
-                        .fillMaxWidth()
-                        .border(
-                            width = 1.dp,
-                            color = MaterialTheme.colors.surface,
-                            shape = RoundedCornerShape(8.dp)
-                        )
-                        .focusRequester(focusRequester)
-                        .onFocusChanged {
-                            if (it.isFocused) {
-                                keyboardController?.show()
-                            }
-                        },
-                    placeholder = {
-                        Text(
-                            text = "What's on your mind?",
-                            color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
-                        )
-                    },
-                    colors = TextFieldDefaults
-                        .outlinedTextFieldColors(
-                            unfocusedBorderColor = Color.Transparent,
-                            focusedBorderColor = Color.Transparent
-                        ),
-                    visualTransformation = UrlUserTagTransformation(MaterialTheme.colors.primary),
-                    textStyle = LocalTextStyle.current.copy(textDirection = TextDirection.Content)
-                )
-
-                val userSuggestions = postViewModel.userSuggestions
-                if (userSuggestions.isNotEmpty()) {
-                    LazyColumn(
-                        contentPadding = PaddingValues(
-                            top = 10.dp,
-                            bottom = 10.dp
-                        )
+        Surface(modifier = Modifier.fillMaxWidth().fillMaxHeight()) {
+            Column(modifier = Modifier.fillMaxWidth().fillMaxHeight()) {
+                Column(modifier = Modifier.padding(10.dp).imePadding().weight(1f)) {
+                    Row(
+                        modifier = Modifier.fillMaxWidth(),
+                        horizontalArrangement = Arrangement.SpaceBetween,
+                        verticalAlignment = Alignment.CenterVertically
                     ) {
-                        itemsIndexed(userSuggestions, key = { _, item -> item.pubkeyHex }) { index, item ->
-                            UserLine(item, account) {
-                                postViewModel.autocompleteWithUser(item)
+                        CloseButton(onCancel = {
+                            postViewModel.cancel()
+                            onClose()
+                        })
+
+                        UploadFromGallery(
+                            isUploading = postViewModel.isUploadingImage,
+                        ) {
+                            postViewModel.upload(it, context)
+                        }
+
+                        PostButton(
+                            onPost = {
+                                postViewModel.sendPost()
+                                onClose()
+                            },
+                            isActive = postViewModel.message.text.isNotBlank()
+                              && !postViewModel.isUploadingImage
+                        )
+                    }
+
+                    Row(
+                        modifier = Modifier.fillMaxWidth().weight(1f)
+                    ) {
+                        Column(modifier = Modifier.fillMaxWidth().verticalScroll(scroolState)) {
+                            if (postViewModel.replyTos != null && baseReplyTo?.event is TextNoteEvent) {
+                                ReplyInformation(postViewModel.replyTos, postViewModel.mentions, account, "✖ ") {
+                                    postViewModel.removeFromReplyList(it)
+                                }
+                            }
+
+                            OutlinedTextField(
+                                value = postViewModel.message,
+                                onValueChange = {
+                                    postViewModel.updateMessage(it)
+                                },
+                                keyboardOptions = KeyboardOptions.Default.copy(
+                                    capitalization = KeyboardCapitalization.Sentences
+                                ),
+                                modifier = Modifier
+                                    .fillMaxWidth()
+                                    .border(
+                                        width = 1.dp,
+                                        color = MaterialTheme.colors.surface,
+                                        shape = RoundedCornerShape(8.dp)
+                                    )
+                                    .focusRequester(focusRequester)
+                                    .onFocusChanged {
+                                        if (it.isFocused) {
+                                            keyboardController?.show()
+                                        }
+                                    },
+                                placeholder = {
+                                    Text(
+                                        text = "What's on your mind?",
+                                        color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                                    )
+                                },
+                                colors = TextFieldDefaults
+                                    .outlinedTextFieldColors(
+                                        unfocusedBorderColor = Color.Transparent,
+                                        focusedBorderColor = Color.Transparent
+                                    ),
+                                visualTransformation = UrlUserTagTransformation(MaterialTheme.colors.primary),
+                                textStyle = LocalTextStyle.current.copy(textDirection = TextDirection.Content)
+                            )
+
+                            val myUrlPreview = postViewModel.urlPreview
+                            if (myUrlPreview != null) {
+                                Row(modifier = Modifier.padding(top = 5.dp)) {
+                                    if (isValidURL(myUrlPreview)) {
+                                        val removedParamsFromUrl =
+                                            myUrlPreview.split("?")[0].toLowerCase()
+                                        if (imageExtension.matcher(removedParamsFromUrl).matches()) {
+                                            AsyncImage(
+                                                model = myUrlPreview,
+                                                contentDescription = myUrlPreview,
+                                                contentScale = ContentScale.FillWidth,
+                                                modifier = Modifier
+                                                    .padding(top = 4.dp)
+                                                    .fillMaxWidth()
+                                                    .clip(shape = RoundedCornerShape(15.dp))
+                                                    .border(
+                                                        1.dp,
+                                                        MaterialTheme.colors.onSurface.copy(alpha = 0.12f),
+                                                        RoundedCornerShape(15.dp)
+                                                    )
+                                            )
+                                        } else if (videoExtension.matcher(removedParamsFromUrl)
+                                                .matches()
+                                        ) {
+                                            VideoView(myUrlPreview)
+                                        } else {
+                                            UrlPreview(myUrlPreview, myUrlPreview)
+                                        }
+                                    } else if (noProtocolUrlValidator.matcher(myUrlPreview).matches()) {
+                                        UrlPreview("https://$myUrlPreview", myUrlPreview)
+                                    }
+                                }
                             }
                         }
-                    }
-                }
 
-                val myUrlPreview = postViewModel.urlPreview
-                if (myUrlPreview != null) {
-                    Column(modifier = Modifier.padding(top = 5.dp)) {
-                        if (isValidURL(myUrlPreview)) {
-                            val removedParamsFromUrl = myUrlPreview.split("?")[0].toLowerCase()
-                            if (imageExtension.matcher(removedParamsFromUrl).matches()) {
-                                AsyncImage(
-                                    model = myUrlPreview,
-                                    contentDescription = myUrlPreview,
-                                    contentScale = ContentScale.FillWidth,
-                                    modifier = Modifier
-                                        .padding(top = 4.dp)
-                                        .fillMaxWidth()
-                                        .clip(shape = RoundedCornerShape(15.dp))
-                                        .border(
-                                            1.dp,
-                                            MaterialTheme.colors.onSurface.copy(alpha = 0.12f),
-                                            RoundedCornerShape(15.dp)
-                                        )
-                                )
-                            } else if (videoExtension.matcher(removedParamsFromUrl).matches()) {
-                                VideoView(myUrlPreview)
-                            } else {
-                                UrlPreview(myUrlPreview, myUrlPreview)
+                    }
+
+                    val userSuggestions = postViewModel.userSuggestions
+                    if (userSuggestions.isNotEmpty()) {
+                        LazyColumn(
+                            contentPadding = PaddingValues(
+                                top = 10.dp
+                            ),
+                            modifier = Modifier.heightIn(0.dp, 300.dp)
+                        ) {
+                            itemsIndexed(
+                                userSuggestions,
+                                key = { _, item -> item.pubkeyHex }) { index, item ->
+                                UserLine(item, account) {
+                                    postViewModel.autocompleteWithUser(item)
+                                }
                             }
-                        } else if (noProtocolUrlValidator.matcher(myUrlPreview).matches()) {
-                            UrlPreview("https://$myUrlPreview", myUrlPreview)
                         }
                     }
                 }
@@ -247,6 +244,25 @@ fun PostButton(onPost: () -> Unit = {}, isActive: Boolean, modifier: Modifier =
     }
 }
 
+@Composable
+fun SaveButton(onPost: () -> Unit = {}, isActive: Boolean, modifier: Modifier = Modifier) {
+    Button(
+        modifier = modifier,
+        onClick = {
+            if (isActive) {
+                onPost()
+            }
+        },
+        shape = RoundedCornerShape(20.dp),
+        colors = ButtonDefaults
+            .buttonColors(
+                backgroundColor = if (isActive) MaterialTheme.colors.primary else Color.Gray
+            )
+    ) {
+        Text(text = "Save", color = Color.White)
+    }
+}
+
 @Composable
 fun CreateButton(onPost: () -> Unit = {}, isActive: Boolean, modifier: Modifier = Modifier) {
     Button(

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

@@ -1,42 +1,43 @@
 package com.vitorpamplona.amethyst.ui.actions
 
 import android.content.Context
-import android.graphics.ImageDecoder
 import android.net.Uri
-import android.os.Build
-import android.provider.MediaStore
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.text.TextRange
 import androidx.compose.ui.text.input.TextFieldValue
 import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.model.User
-import com.vitorpamplona.amethyst.model.decodePublicKey
+import com.vitorpamplona.amethyst.model.parseDirtyWordForKey
 import com.vitorpamplona.amethyst.ui.components.isValidURL
 import com.vitorpamplona.amethyst.ui.components.noProtocolUrlValidator
-import nostr.postr.toNpub
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.launch
 
 class NewPostViewModel: ViewModel() {
     private var account: Account? = null
     private var originalNote: Note? = null
 
     var mentions by mutableStateOf<List<User>?>(null)
-    var replyTos by mutableStateOf<MutableList<Note>?>(null)
+    var replyTos by mutableStateOf<List<Note>?>(null)
 
     var message by mutableStateOf(TextFieldValue(""))
     var urlPreview by mutableStateOf<String?>(null)
+    var isUploadingImage by mutableStateOf(false)
+    val imageUploadingError = MutableSharedFlow<String?>()
 
     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 ?: mutableListOf()).plus(replyNote).toMutableList()
+            this.replyTos = (replyNote.replyTo ?: emptyList()).plus(replyNote)
             replyNote.author?.let { replyUser ->
                 val currentMentions = replyNote.mentions ?: emptyList()
                 if (currentMentions.contains(replyUser)) {
@@ -47,49 +48,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)
+                    "#[${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(" ")
@@ -103,26 +115,35 @@ class NewPostViewModel: ViewModel() {
 
         message = TextFieldValue("")
         urlPreview = null
+        isUploadingImage = false
+        mentions = null
     }
 
     fun upload(it: Uri, context: Context) {
-        val img = if (Build.VERSION.SDK_INT < 28) {
-            MediaStore.Images.Media.getBitmap(context.contentResolver, it)
-        } else {
-            ImageDecoder.decodeBitmap(ImageDecoder.createSource(context.contentResolver, it))
-        }
+        isUploadingImage = true
 
-        img?.let {
-            ImageUploader.uploadImage(img) {
-                message = TextFieldValue(message.text + "\n\n" + it)
+        ImageUploader.uploadImage(
+            uri = it,
+            contentResolver = context.contentResolver,
+            onSuccess = { imageUrl ->
+                isUploadingImage = false
+                message = TextFieldValue(message.text + "\n\n" + imageUrl)
                 urlPreview = findUrlInMessage()
+            },
+            onError = {
+                isUploadingImage = false
+                viewModelScope.launch {
+                    imageUploadingError.emit("Failed to upload the image")
+                }
             }
-        }
+        )
     }
 
     fun cancel() {
         message = TextFieldValue("")
         urlPreview = null
+        isUploadingImage = false
+        mentions = null
     }
 
     fun findUrlInMessage(): String? {
@@ -156,7 +177,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

@@ -1,25 +1,19 @@
 package com.vitorpamplona.amethyst.ui.actions
 
-import androidx.compose.foundation.border
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material.Button
 import androidx.compose.material.ButtonDefaults
-import androidx.compose.material.Checkbox
-import androidx.compose.material.Colors
 import androidx.compose.material.Divider
 import androidx.compose.material.Icon
 import androidx.compose.material.IconButton
@@ -28,15 +22,13 @@ import androidx.compose.material.OutlinedTextField
 import androidx.compose.material.Surface
 import androidx.compose.material.Text
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Add
 import androidx.compose.material.icons.filled.Cancel
-import androidx.compose.material.icons.filled.Delete
+import androidx.compose.material.icons.filled.DeleteSweep
 import androidx.compose.material.icons.filled.Download
-import androidx.compose.material.icons.filled.DownloadDone
+import androidx.compose.material.icons.filled.Groups
+import androidx.compose.material.icons.filled.Public
 import androidx.compose.material.icons.filled.SyncProblem
 import androidx.compose.material.icons.filled.Upload
-import androidx.compose.material.icons.outlined.BarChart
-import androidx.compose.material.icons.outlined.Delete
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
@@ -45,28 +37,32 @@ 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.graphics.Color
-import androidx.compose.ui.text.input.KeyboardCapitalization
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.style.TextOverflow
 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.RelaySetupInfo
+import com.vitorpamplona.amethyst.service.relays.FeedType
 import java.lang.Math.round
 
-@OptIn(ExperimentalComposeUiApi::class)
+
 @Composable
 fun NewRelayListView(onClose: () -> Unit, account: Account, relayToAdd: String = "") {
     val postViewModel: NewRelayListViewModel = viewModel()
+    val ctx = LocalContext.current.applicationContext
 
     val feedState by postViewModel.relays.collectAsState()
 
     LaunchedEffect(Unit) {
-        postViewModel.load(account)
+        postViewModel.load(account, ctx)
     }
 
     Dialog(
@@ -82,19 +78,18 @@ fun NewRelayListView(onClose: () -> Unit, account: Account, relayToAdd: String =
                 modifier = Modifier.padding(10.dp)
             ) {
                 Row(
-                    modifier = Modifier
-                        .fillMaxWidth(),
+                    modifier = Modifier.fillMaxWidth(),
                     horizontalArrangement = Arrangement.SpaceBetween,
                     verticalAlignment = Alignment.CenterVertically
                 ) {
                     CloseButton(onCancel = {
-                        postViewModel.clear()
+                        postViewModel.clear(ctx)
                         onClose()
                     })
 
                     PostButton(
                         onPost = {
-                            postViewModel.create()
+                            postViewModel.create(ctx)
                             onClose()
                         },
                         true
@@ -103,7 +98,7 @@ fun NewRelayListView(onClose: () -> Unit, account: Account, relayToAdd: String =
 
                 Spacer(modifier = Modifier.height(10.dp))
 
-                Row(modifier = Modifier.fillMaxWidth(1f), verticalAlignment = Alignment.CenterVertically) {
+                Row(modifier = Modifier.weight(1f), verticalAlignment = Alignment.CenterVertically) {
                     LazyColumn(
                         contentPadding = PaddingValues(
                             top = 10.dp,
@@ -114,15 +109,15 @@ fun NewRelayListView(onClose: () -> Unit, account: Account, relayToAdd: String =
                             if (index == 0)
                                 ServerConfigHeader()
                             ServerConfig(item,
-                                onToggleDownload = {
-                                    postViewModel.toggleDownload(it)
-                                },
-                                onToggleUpload = {
-                                    postViewModel.toggleUpload(it)
-                                },
-                                onDelete = {
-                                    postViewModel.deleteRelay(it)
-                                }
+                                onToggleDownload = { postViewModel.toggleDownload(it) },
+                                onToggleUpload = { postViewModel.toggleUpload(it)  },
+
+                                onToggleFollows = { postViewModel.toggleFollows(it) },
+                                onTogglePrivateDMs = { postViewModel.toggleMessages(it)  },
+                                onTogglePublicChats = { postViewModel.togglePublicChats(it) },
+                                onToggleGlobal = { postViewModel.toggleGlobal(it)  },
+
+                                onDelete = { postViewModel.deleteRelay(it) }
                             )
                         }
                     }
@@ -154,9 +149,9 @@ fun ServerConfigHeader() {
                 }
             }
 
-            Column(Modifier.weight(1f)) {
+            Column(Modifier.weight(1.4f)) {
                 Row(verticalAlignment = Alignment.CenterVertically) {
-                    Spacer(modifier = Modifier.size(20.dp))
+                    Spacer(modifier = Modifier.size(25.dp))
 
                     Text(
                         text = "Posts",
@@ -186,7 +181,17 @@ fun ServerConfigHeader() {
                         color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f),
                     )
 
-                    Spacer(modifier = Modifier.size(20.dp))
+                    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))
                 }
             }
         }
@@ -199,12 +204,35 @@ fun ServerConfigHeader() {
 
 @Composable
 fun ServerConfig(
-    item: NewRelayListViewModel.Relay,
-    onToggleDownload: (NewRelayListViewModel.Relay) -> Unit,
-    onToggleUpload: (NewRelayListViewModel.Relay) -> Unit,
-    onDelete: (NewRelayListViewModel.Relay) -> Unit) {
+    item: RelaySetupInfo,
+    onToggleDownload: (RelaySetupInfo) -> Unit,
+    onToggleUpload: (RelaySetupInfo) -> Unit,
+
+    onToggleFollows: (RelaySetupInfo) -> Unit,
+    onTogglePrivateDMs: (RelaySetupInfo) -> Unit,
+    onTogglePublicChats: (RelaySetupInfo) -> Unit,
+    onToggleGlobal: (RelaySetupInfo) -> Unit,
+
+    onDelete: (RelaySetupInfo) -> Unit) {
     Column(Modifier.fillMaxWidth()) {
-        Row(verticalAlignment = Alignment.CenterVertically) {
+        Row(
+            verticalAlignment = Alignment.CenterVertically,
+            modifier = Modifier.padding(vertical = 5.dp)
+        ) {
+            Column() {
+                IconButton(
+                    modifier = Modifier.size(30.dp),
+                    onClick = { onDelete(item) }
+                ) {
+                    Icon(
+                        imageVector = Icons.Default.Cancel,
+                        null,
+                        modifier = Modifier.padding(end = 5.dp).size(15.dp),
+                        tint = Color.Red
+                    )
+                }
+            }
+
             Column(Modifier.weight(1f)) {
                 Row(verticalAlignment = Alignment.CenterVertically) {
                     Text(
@@ -214,75 +242,141 @@ fun ServerConfig(
                         overflow = TextOverflow.Ellipsis
                     )
                 }
-            }
 
-            Column(Modifier.weight(1f)) {
                 Row(verticalAlignment = Alignment.CenterVertically) {
-                    IconButton(
-                        modifier = Modifier.size(30.dp),
-                        onClick = { onToggleDownload(item) }
-                    ) {
-                        Icon(
-                            imageVector = Icons.Default.Download,
-                            null,
-                            modifier = Modifier.padding(horizontal = 5.dp).size(15.dp),
-                            tint = if (item.read) Color.Green else Color.Red
-                        )
+                    Column(Modifier.weight(1f)) {
+                        Row(verticalAlignment = Alignment.CenterVertically) {
+                            IconButton(
+                                modifier = Modifier.size(30.dp),
+                                onClick = { onToggleFollows(item) }
+                            ) {
+                                Icon(
+                                    painterResource(R.drawable.ic_home),
+                                    "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
+                                    )
+                                )
+                            }
+                            IconButton(
+                                modifier = Modifier.size(30.dp),
+                                onClick = { onTogglePrivateDMs(item) }
+                            ) {
+                                Icon(
+                                    painterResource(R.drawable.ic_dm),
+                                    "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
+                                    )
+                                )
+                            }
+                            IconButton(
+                                modifier = Modifier.size(30.dp),
+                                onClick = { onTogglePublicChats(item) }
+                            ) {
+                                Icon(
+                                    imageVector = Icons.Default.Groups,
+                                    "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
+                                    )
+                                )
+                            }
+                            IconButton(
+                                modifier = Modifier.size(30.dp),
+                                onClick = { onToggleGlobal(item) }
+                            ) {
+                                Icon(
+                                    imageVector = Icons.Default.Public,
+                                    "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
+                                    )
+                                )
+                            }
+                        }
                     }
 
-                    Text(
-                        text = "${countToHumanReadable(item.downloadCount)}",
-                        maxLines = 1,
-                        fontSize = 14.sp,
-                        modifier = Modifier.weight(1f),
-                        color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f),
-                    )
+                    Column(Modifier.weight(1.4f)) {
+                        Row(verticalAlignment = Alignment.CenterVertically) {
+                            IconButton(
+                                modifier = Modifier.size(30.dp),
+                                onClick = { onToggleDownload(item) }
+                            ) {
+                                Icon(
+                                    imageVector = Icons.Default.Download,
+                                    null,
+                                    modifier = Modifier.padding(horizontal = 5.dp).size(15.dp),
+                                    tint = if (item.read) Color.Green else MaterialTheme.colors.onSurface.copy(
+                                        alpha = 0.32f
+                                    )
+                                )
+                            }
 
-                    IconButton(
-                        modifier = Modifier.size(30.dp),
-                        onClick = { onToggleUpload(item) }
-                    ) {
-                        Icon(
-                            imageVector = Icons.Default.Upload,
-                            null,
-                            modifier = Modifier.padding(horizontal = 5.dp).size(15.dp),
-                            tint = if (item.write) Color.Green else Color.Red
-                        )
-                    }
+                            Text(
+                                text = "${countToHumanReadable(item.downloadCount)}",
+                                maxLines = 1,
+                                fontSize = 14.sp,
+                                modifier = Modifier.weight(1f),
+                                color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f),
+                            )
 
-                    Text(
-                        text = "${countToHumanReadable(item.uploadCount)}",
-                        maxLines = 1,
-                        fontSize = 14.sp,
-                        modifier = Modifier.weight(1f),
-                        color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f),
-                    )
+                            IconButton(
+                                modifier = Modifier.size(30.dp),
+                                onClick = { onToggleUpload(item) }
+                            ) {
+                                Icon(
+                                    imageVector = Icons.Default.Upload,
+                                    null,
+                                    modifier = Modifier.padding(horizontal = 5.dp).size(15.dp),
+                                    tint = if (item.write) Color.Green else MaterialTheme.colors.onSurface.copy(
+                                        alpha = 0.32f
+                                    )
+                                )
+                            }
 
-                    Icon(
-                        imageVector = Icons.Default.SyncProblem,
-                        null,
-                        modifier = Modifier.padding(horizontal = 5.dp).size(15.dp),
-                        tint = if (item.errorCount > 0) Color.Yellow else Color.Green
-                    )
+                            Text(
+                                text = "${countToHumanReadable(item.uploadCount)}",
+                                maxLines = 1,
+                                fontSize = 14.sp,
+                                modifier = Modifier.weight(1f),
+                                color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f),
+                            )
 
-                    Text(
-                        text = "${countToHumanReadable(item.errorCount)}",
-                        maxLines = 1,
-                        fontSize = 14.sp,
-                        modifier = Modifier.weight(1f),
-                        color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f),
-                    )
+                            Icon(
+                                imageVector = Icons.Default.SyncProblem,
+                                null,
+                                modifier = Modifier.padding(horizontal = 5.dp).size(15.dp),
+                                tint = if (item.errorCount > 0) Color.Yellow else Color.Green
+                            )
 
-                    IconButton(
-                        modifier = Modifier.size(30.dp),
-                        onClick = { onDelete(item) }
-                    ) {
-                        Icon(
-                            imageVector = Icons.Default.Cancel,
-                            null,
-                            modifier = Modifier.padding(horizontal = 5.dp).size(15.dp),
-                            tint = Color.Red
-                        )
+                            Text(
+                                text = "${countToHumanReadable(item.errorCount)}",
+                                maxLines = 1,
+                                fontSize = 14.sp,
+                                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),
+                            )
+                        }
                     }
                 }
             }
@@ -295,7 +389,7 @@ fun ServerConfig(
 }
 
 @Composable
-fun EditableServerConfig(relayToAdd: String, onNewRelay: (NewRelayListViewModel.Relay) -> Unit) {
+fun EditableServerConfig(relayToAdd: String, onNewRelay: (RelaySetupInfo) -> Unit) {
     var url by remember { mutableStateOf<String>(relayToAdd) }
     var read by remember { mutableStateOf(true) }
     var write by remember { mutableStateOf(true) }
@@ -323,7 +417,7 @@ fun EditableServerConfig(relayToAdd: String, onNewRelay: (NewRelayListViewModel.
                 modifier = Modifier
                     .size(35.dp)
                     .padding(horizontal = 5.dp),
-                tint = if (read) Color.Green else Color.Red
+                tint = if (read) Color.Green else MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
             )
         }
 
@@ -334,15 +428,16 @@ fun EditableServerConfig(relayToAdd: String, onNewRelay: (NewRelayListViewModel.
                 modifier = Modifier
                     .size(35.dp)
                     .padding(horizontal = 5.dp),
-                tint = if (write) Color.Green else Color.Red
+                tint = if (write) Color.Green else MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
             )
         }
 
         Button(
             onClick = {
-                if (url.isNotBlank()) {
-                    val addedWSS = if (!url.startsWith("wss://")) "wss://$url" else url
-                    onNewRelay(NewRelayListViewModel.Relay(addedWSS, read, write))
+                if (url.isNotBlank() && url != "/") {
+                    var addedWSS = if (!url.startsWith("wss://") && !url.startsWith("ws://")) "wss://$url" else url
+                    if (url.endsWith("/")) addedWSS = addedWSS.dropLast(1)
+                    onNewRelay(RelaySetupInfo(addedWSS, read, write, feedTypes = FeedType.values().toSet()))
                     url = ""
                     write = true
                     read = true
@@ -351,7 +446,7 @@ fun EditableServerConfig(relayToAdd: String, onNewRelay: (NewRelayListViewModel.
             shape = RoundedCornerShape(20.dp),
             colors = ButtonDefaults
                 .buttonColors(
-                    backgroundColor = if (url.isNotBlank()) MaterialTheme.colors.primary else Color.Gray
+                    backgroundColor = if (url.isNotBlank()) MaterialTheme.colors.primary else MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
                 )
         ) {
             Text(text = "Add", color = Color.White)

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

@@ -1,94 +1,121 @@
 package com.vitorpamplona.amethyst.ui.actions
 
+import android.content.Context
 import androidx.lifecycle.ViewModel
 import com.vitorpamplona.amethyst.model.Account
-import com.vitorpamplona.amethyst.service.Constants
+import com.vitorpamplona.amethyst.model.RelaySetupInfo
+import com.vitorpamplona.amethyst.service.relays.FeedType
 import com.vitorpamplona.amethyst.service.relays.RelayPool
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.update
-import nostr.postr.events.ContactListEvent
 
 class NewRelayListViewModel: ViewModel() {
     private lateinit var account: Account
 
-    data class Relay(
-        val url: String,
-        val read: Boolean,
-        val write: Boolean,
-        val errorCount: Int = 0,
-        val downloadCount: Int = 0,
-        val uploadCount: Int = 0
-    )
-
-    private val _relays = MutableStateFlow<List<Relay>>(emptyList())
+    private val _relays = MutableStateFlow<List<RelaySetupInfo>>(emptyList())
     val relays = _relays.asStateFlow()
 
-    fun load(account: Account) {
+    fun load(account: Account, ctx: Context) {
         this.account = account
-        clear()
+        clear(ctx)
     }
 
-    fun create() {
+    fun create(ctx: Context) {
         relays.let {
-            account.sendNewRelayList(it.value.associate { it.url to ContactListEvent.ReadWrite(it.read, it.write) } )
+            account.saveRelayList(it.value)
         }
 
-        clear()
+        clear(ctx)
     }
 
-    fun clear() {
+    fun clear(ctx: Context) {
         _relays.update {
             val relayFile = account.userProfile().relays
 
             if (relayFile != null)
                 relayFile.map {
                     val liveRelay = RelayPool.getRelay(it.key)
+                    val localInfoFeedTypes = account.localRelays.filter { localRelay -> localRelay.url == it.key }.firstOrNull()?.feedTypes ?: FeedType.values().toSet()
 
                     val errorCounter = liveRelay?.errorCounter ?: 0
                     val eventDownloadCounter = liveRelay?.eventDownloadCounter ?: 0
                     val eventUploadCounter = liveRelay?.eventUploadCounter ?: 0
+                    val spamCounter = liveRelay?.spamCounter ?: 0
 
-                    Relay(it.key, it.value.read, it.value.write, errorCounter, eventDownloadCounter, eventUploadCounter)
+                    RelaySetupInfo(it.key, it.value.read, it.value.write, errorCounter, eventDownloadCounter, eventUploadCounter, spamCounter, localInfoFeedTypes)
                 }.sortedBy { it.downloadCount }.reversed()
             else
-                Constants.defaultRelays.map {
+                account.localRelays.map {
                     val liveRelay = RelayPool.getRelay(it.url)
 
                     val errorCounter = liveRelay?.errorCounter ?: 0
                     val eventDownloadCounter = liveRelay?.eventDownloadCounter ?: 0
                     val eventUploadCounter = liveRelay?.eventUploadCounter ?: 0
+                    val spamCounter = liveRelay?.spamCounter ?: 0
 
-                    Relay(it.url, it.read, it.write, errorCounter, eventDownloadCounter, eventUploadCounter)
+                    RelaySetupInfo(it.url, it.read, it.write, errorCounter, eventDownloadCounter, eventUploadCounter, spamCounter, it.feedTypes)
                 }.sortedBy { it.downloadCount }.reversed()
         }
     }
 
-    fun addRelay(relay: Relay) {
-        if (relays.value.filter { it.url == relay.url }.isNotEmpty()) return
+    fun addRelay(relay: RelaySetupInfo) {
+        if (relays.value.any { it.url == relay.url }) return
 
         _relays.update {
             it.plus(relay)
         }
     }
 
-    fun deleteRelay(relay: Relay) {
+    fun deleteRelay(relay: RelaySetupInfo) {
         _relays.update {
             it.minus(relay)
         }
     }
 
-    fun toggleDownload(relay: Relay) {
+    fun toggleDownload(relay: RelaySetupInfo) {
         _relays.update {
             it.updated(relay, relay.copy(read = !relay.read))
         }
     }
 
-    fun toggleUpload(relay: Relay) {
+    fun toggleUpload(relay: RelaySetupInfo) {
         _relays.update {
             it.updated(relay, relay.copy(write = !relay.write))
         }
     }
+
+    fun toggleFollows(relay: RelaySetupInfo) {
+        val newTypes = togglePresenceInSet(relay.feedTypes, FeedType.FOLLOWS)
+        _relays.update {
+            it.updated(relay, relay.copy(feedTypes = newTypes))
+        }
+    }
+
+    fun toggleMessages(relay: RelaySetupInfo) {
+        val newTypes = togglePresenceInSet(relay.feedTypes, FeedType.PRIVATE_DMS)
+        _relays.update {
+            it.updated(relay, relay.copy(feedTypes = newTypes))
+        }
+    }
+
+    fun togglePublicChats(relay: RelaySetupInfo) {
+        val newTypes = togglePresenceInSet(relay.feedTypes, FeedType.PUBLIC_CHATS)
+        _relays.update {
+            it.updated(relay, relay.copy(feedTypes = newTypes))
+        }
+    }
+
+    fun toggleGlobal(relay: RelaySetupInfo) {
+        val newTypes = togglePresenceInSet(relay.feedTypes, FeedType.GLOBAL)
+        _relays.update {
+            it.updated(relay, relay.copy( feedTypes = newTypes ))
+        }
+    }
 }
 
-fun <T> Iterable<T>.updated(old: T, new: T): List<T> = map { if (it == old) new else it }
+fun <T> Iterable<T>.updated(old: T, new: T): List<T> = map { if (it == old) new else it }
+
+fun <T> togglePresenceInSet(set: Set<T>, item: T): Set<T> {
+    return if (set.contains(item)) set.minus(item) else set.plus(item)
+}

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

@@ -23,9 +23,6 @@ import androidx.compose.ui.window.Dialog
 import androidx.compose.ui.window.DialogProperties
 import androidx.lifecycle.viewmodel.compose.viewModel
 import com.vitorpamplona.amethyst.model.Account
-import com.vitorpamplona.amethyst.model.Channel
-import com.vitorpamplona.amethyst.ui.screen.AccountStateViewModel
-import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 
 @OptIn(ExperimentalComposeUiApi::class)
 @Composable
@@ -64,7 +61,7 @@ fun NewUserMetadataView(onClose: () -> Unit, account: Account) {
                             postViewModel.create()
                             onClose()
                         },
-                        postViewModel.userName.value.isNotBlank()
+                        true
                     )
                 }
 
@@ -205,6 +202,22 @@ fun NewUserMetadataView(onClose: () -> Unit, account: Account) {
                     singleLine = true
                 )
 
+                Spacer(modifier = Modifier.height(10.dp))
+
+                OutlinedTextField(
+                    label = { Text(text = "LN URL (outdated)") },
+                    modifier = Modifier.fillMaxWidth(),
+                    value = postViewModel.lnURL.value,
+                    onValueChange = { postViewModel.lnURL.value = it },
+                    placeholder = {
+                        Text(
+                            text = "LNURL...",
+                            color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                        )
+                    },
+                    singleLine = true
+                )
+
             }
         }
     }

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

@@ -21,6 +21,7 @@ class NewUserMetadataViewModel: ViewModel() {
     val website = mutableStateOf("")
     val nip05 = mutableStateOf("")
     val lnAddress = mutableStateOf("")
+    val lnURL = mutableStateOf("")
 
     fun load(account: Account) {
         this.account = account
@@ -28,18 +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 ?: ""
+            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))
@@ -47,16 +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("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)
@@ -75,5 +78,6 @@ class NewUserMetadataViewModel: ViewModel() {
         website.value = ""
         nip05.value = ""
         lnAddress.value = ""
+        lnURL.value = ""
     }
 }

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

@@ -0,0 +1,83 @@
+package com.vitorpamplona.amethyst.ui.actions
+
+import android.Manifest
+import android.os.Build
+import android.widget.Toast
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.Button
+import androidx.compose.material.ButtonDefaults
+import androidx.compose.material.Text
+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.unit.dp
+import com.google.accompanist.permissions.ExperimentalPermissionsApi
+import com.google.accompanist.permissions.isGranted
+import com.google.accompanist.permissions.rememberPermissionState
+import kotlinx.coroutines.launch
+
+/**
+ * A button to save the remote image to the gallery.
+ * May require a storage permission.
+ *
+ * @param url URL of the image
+ */
+@OptIn(ExperimentalPermissionsApi::class)
+@Composable
+fun SaveToGallery(url: String) {
+    val localContext = LocalContext.current
+    val scope = rememberCoroutineScope()
+
+    fun saveImage() {
+        ImageSaver.saveImage(
+            context = localContext,
+            url = url,
+            onSuccess = {
+                scope.launch {
+                    Toast.makeText(
+                        localContext,
+                        "Image saved to the gallery",
+                        Toast.LENGTH_SHORT
+                    )
+                        .show()
+                }
+            },
+            onError = {
+                scope.launch {
+                    Toast.makeText(
+                        localContext,
+                        "Failed to save the image",
+                        Toast.LENGTH_SHORT
+                    )
+                        .show()
+                }
+            }
+        )
+    }
+
+    val writeStoragePermissionState = rememberPermissionState(
+        Manifest.permission.WRITE_EXTERNAL_STORAGE
+    ) { isGranted ->
+        if (isGranted) {
+            saveImage()
+        }
+    }
+
+    Button(
+        onClick = {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q || writeStoragePermissionState.status.isGranted) {
+                saveImage()
+            } else {
+                writeStoragePermissionState.launchPermissionRequest()
+            }
+        },
+        shape = RoundedCornerShape(20.dp),
+        colors = ButtonDefaults
+            .buttonColors(
+                backgroundColor = Color.Gray
+            )
+    ) {
+        Text(text = "Save", color = Color.White)
+    }
+}

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

@@ -1,6 +1,7 @@
 package com.vitorpamplona.amethyst.ui.navigation
 
 import android.net.Uri
+import android.os.Build
 import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.compose.foundation.layout.Box
@@ -8,12 +9,7 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material.Button
 import androidx.compose.material.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.SideEffect
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
+import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
@@ -23,10 +19,18 @@ import com.google.accompanist.permissions.rememberPermissionState
 
 @OptIn(ExperimentalPermissionsApi::class)
 @Composable
-fun UploadFromGallery(onImageChosen: (Uri) -> Unit) {
-    val cameraPermissionState = rememberPermissionState(
-        android.Manifest.permission.READ_MEDIA_IMAGES
-    )
+fun UploadFromGallery(
+    isUploading: Boolean,
+    onImageChosen: (Uri) -> Unit,
+) {
+    val cameraPermissionState =
+        rememberPermissionState(
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+                android.Manifest.permission.READ_MEDIA_IMAGES
+            } else {
+                android.Manifest.permission.READ_EXTERNAL_STORAGE
+            }
+        )
 
     if (cameraPermissionState.status.isGranted) {
         var showGallerySelect by remember { mutableStateOf(false) }
@@ -44,18 +48,30 @@ fun UploadFromGallery(onImageChosen: (Uri) -> Unit) {
                     modifier = Modifier
                         .align(Alignment.TopCenter)
                         .padding(4.dp),
+                    enabled = !isUploading,
                     onClick = {
                         showGallerySelect = true
                     }
                 ) {
-                    Text("Upload Image")
+                    if (!isUploading) {
+                        Text("Upload Image")
+                    } else {
+                        Text("Uploading…")
+                    }
                 }
             }
         }
     } else {
         Column {
-            Button(onClick = { cameraPermissionState.launchPermissionRequest() }) {
-                Text("Upload Image")
+            Button(
+                onClick = { cameraPermissionState.launchPermissionRequest() },
+                enabled = !isUploading,
+            ) {
+                if (!isUploading) {
+                    Text("Upload Image")
+                } else {
+                    Text("Uploading…")
+                }
             }
         }
     }

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

@@ -12,6 +12,7 @@ import androidx.compose.ui.text.input.VisualTransformation
 import androidx.compose.ui.text.style.TextDecoration
 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.decodePublicKey
+import com.vitorpamplona.amethyst.model.toHexKey
 import kotlin.math.roundToInt
 
 data class RangesChanges(val original: TextRange, val modified: TextRange)
@@ -43,7 +44,7 @@ fun buildAnnotatedStringWithUrlHighlighting(text: AnnotatedString, color: Color)
                 val endIndex = startIndex + keyB32.length
 
                 val key = decodePublicKey(keyB32.removePrefix("@"))
-                val user = LocalCache.getOrCreateUser(key)
+                val user = LocalCache.getOrCreateUser(key.toHexKey())
 
                 val newWord = "@${user.toBestDisplayName()}"
                 val startNew = builderAfter.toString().length

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,9 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.unit.dp
-import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.ui.actions.NewChannelView
-import com.vitorpamplona.amethyst.ui.actions.NewPostView
-import com.vitorpamplona.amethyst.ui.screen.AccountStateViewModel
-import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 
 @Composable
 fun NewChannelButton(account: Account) {

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

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

app/src/main/java/com/vitorpamplona/amethyst/ui/components/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(
@@ -23,8 +18,9 @@ fun ClickableRoute(
   navController: NavController
 ) {
   if (nip19.type == Nip19.Type.USER) {
-    val userBase = LocalCache.getOrCreateUser(nip19.hex.toByteArray())
-    val userState by userBase.live.observeAsState()
+    val userBase = LocalCache.getOrCreateUser(nip19.hex)
+
+    val userState by userBase.live().metadata.observeAsState()
     val user = userState?.user ?: return
 
     val route = "User/${nip19.hex}"
@@ -37,24 +33,24 @@ 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)
       )
     } else if (note.channel != null) {
       ClickableText(
-        text = AnnotatedString("@${note.channel} "),
-        onClick = { navController.navigate("Channel/${nip19.hex}") },
+        text = AnnotatedString("@${note.channel?.toBestDisplayName()} "),
+        onClick = { navController.navigate("Channel/${note.channel?.idHex}") },
         style = LocalTextStyle.current.copy(color = MaterialTheme.colors.primary)
       )
     } 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.live.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

@@ -0,0 +1,75 @@
+package com.vitorpamplona.amethyst.ui.components
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.Button
+import androidx.compose.material.ButtonDefaults
+import androidx.compose.material.MaterialTheme
+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.graphics.Brush
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.compositeOver
+import androidx.compose.ui.unit.dp
+import androidx.navigation.NavController
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
+
+@Composable
+fun ExpandableRichTextViewer(
+  content: String,
+  canPreview: Boolean,
+  modifier: Modifier = Modifier,
+  tags: List<List<String>>?,
+  backgroundColor: Color,
+  accountViewModel: AccountViewModel,
+  navController: NavController
+) {
+  var showFullText by remember { mutableStateOf(false) }
+
+  val text = if (showFullText) content else content.take(350)
+
+  Box(contentAlignment = Alignment.BottomCenter) {
+    RichTextViewer(text, canPreview, modifier, tags, backgroundColor, accountViewModel, navController)
+
+    if (content.length > 350 && !showFullText) {
+      Row(
+        verticalAlignment = Alignment.CenterVertically,
+        horizontalArrangement = Arrangement.Center,
+        modifier = Modifier
+          .fillMaxWidth()
+          .background(
+            brush = Brush.verticalGradient(
+              colors = listOf(
+                backgroundColor.copy(alpha = 0f),
+                backgroundColor
+              )
+            )
+          )
+      ) {
+        Button(
+          modifier = Modifier.padding(top = 10.dp),
+          onClick = { showFullText = !showFullText },
+          shape = RoundedCornerShape(20.dp),
+          colors = ButtonDefaults.buttonColors(
+            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)
+        }
+      }
+    }
+  }
+}

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

@@ -27,7 +27,8 @@ 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
 fun InvoicePreview(lnInvoice: String) {
@@ -78,20 +79,21 @@ fun InvoicePreview(lnInvoice: String) {
 
       amount?.let {
         Text(
-          text = "${amount.toInt()} sats",
+          text = "${NumberFormat.getInstance().format(amount)} sats",
           fontSize = 25.sp,
           fontWeight = FontWeight.W500,
           modifier = Modifier
             .fillMaxWidth()
             .padding(vertical = 10.dp),
         )
-      } 
+      }
+
 
       Button(
         modifier = Modifier.fillMaxWidth().padding(vertical = 10.dp),
         onClick = {
           runCatching {
-            val intent = Intent(Intent.ACTION_VIEW, Uri.parse("lightning://$lnInvoice"))
+            val intent = Intent(Intent.ACTION_VIEW, Uri.parse("lightning:$lnInvoice"))
             startActivity(context, intent, null)
           }
         },

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

@@ -0,0 +1,159 @@
+package com.vitorpamplona.amethyst.ui.components
+
+import android.content.Intent
+import android.net.Uri
+import android.widget.Toast
+import androidx.compose.foundation.border
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.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.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.rememberCoroutineScope
+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.text.font.FontWeight
+import androidx.compose.ui.text.input.KeyboardCapitalization
+import androidx.compose.ui.text.input.KeyboardType
+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.service.lnurl.LightningAddressResolver
+import com.vitorpamplona.amethyst.model.Account
+import kotlinx.coroutines.launch
+
+@Composable
+fun InvoiceRequest(lud16: String, toUserPubKeyHex: String, account: Account, onClose: () -> Unit ) {
+  val context = LocalContext.current
+  val scope = rememberCoroutineScope()
+
+  Column(modifier = Modifier
+    .fillMaxWidth()
+    .padding(start = 30.dp, end = 30.dp)
+    .clip(shape = RoundedCornerShape(10.dp))
+    .border(1.dp, MaterialTheme.colors.onSurface.copy(alpha = 0.12f), RoundedCornerShape(15.dp))
+  ) {
+
+    Column(
+      modifier = Modifier
+        .fillMaxWidth()
+        .padding(30.dp)
+    ) {
+
+      Row(
+        verticalAlignment = Alignment.CenterVertically,
+        modifier = Modifier
+          .fillMaxWidth()
+          .padding(bottom = 10.dp)
+      ) {
+        Icon(
+          painter = painterResource(R.drawable.lightning),
+          null,
+          modifier = Modifier.size(20.dp),
+          tint = Color.Unspecified
+        )
+
+        Text(
+          text = "Lightning Tips",
+          fontSize = 20.sp,
+          fontWeight = FontWeight.W500,
+          modifier = Modifier.padding(start = 10.dp)
+        )
+      }
+
+      Divider()
+
+      var message by remember { mutableStateOf("") }
+      var amount by remember { mutableStateOf(1000L) }
+
+      OutlinedTextField(
+        label = { Text(text = "Note to Receiver") },
+        modifier = Modifier.fillMaxWidth(),
+        value = message,
+        onValueChange = { message = it },
+        placeholder = {
+          Text(
+            text = "Thank you so much!",
+            color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+          )
+        },
+        keyboardOptions = KeyboardOptions.Default.copy(
+          capitalization = KeyboardCapitalization.Sentences
+        ),
+        singleLine = true
+      )
+
+      OutlinedTextField(
+        label = { Text(text = "Amount in Sats") },
+        modifier = Modifier.fillMaxWidth(),
+        value = amount.toString(),
+        onValueChange = {
+          runCatching {
+            if (it.isEmpty())
+              amount = 0
+            else
+              amount = it.toLong()
+          }
+        },
+        placeholder = {
+          Text(
+            text = "1000",
+            color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+          )
+        },
+        keyboardOptions = KeyboardOptions.Default.copy(
+          keyboardType = KeyboardType.Number
+        ),
+        singleLine = true
+      )
+
+      Button(
+        modifier = Modifier.fillMaxWidth().padding(vertical = 10.dp),
+        onClick = {
+          val zapRequest = account.createZapRequestFor(toUserPubKeyHex)
+
+          LightningAddressResolver().lnAddressInvoice(lud16, amount * 1000, message, zapRequest?.toJson(),
+            onSuccess = {
+              runCatching {
+                val intent = Intent(Intent.ACTION_VIEW, Uri.parse("lightning:$it"))
+                startActivity(context, intent, null)
+              }
+              onClose()
+            },
+            onError = {
+              scope.launch {
+                Toast.makeText(context, it, Toast.LENGTH_SHORT).show()
+                onClose()
+              }
+            }
+          )
+        },
+        shape = RoundedCornerShape(15.dp),
+        colors = ButtonDefaults.buttonColors(
+          backgroundColor = MaterialTheme.colors.primary
+        )
+      ) {
+        Text(text = "Send Sats", color = Color.White, fontSize = 20.sp)
+      }
+    }
+  }
+}

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

@@ -1,32 +1,34 @@
 package com.vitorpamplona.amethyst.ui.components
 
 import android.util.Patterns
+import androidx.compose.animation.animateContentSize
+import androidx.compose.foundation.border
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.LocalTextStyle
+import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.livedata.observeAsState
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.compositeOver
 import androidx.compose.ui.text.style.TextDirection
 import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
 import androidx.navigation.NavController
 import com.google.accompanist.flowlayout.FlowRow
-import com.vitorpamplona.amethyst.lnurl.LnInvoiceUtil
+import com.vitorpamplona.amethyst.service.lnurl.LnInvoiceUtil
 import com.vitorpamplona.amethyst.model.LocalCache
-import com.vitorpamplona.amethyst.model.Note
-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 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
 import java.util.regex.Pattern
-import nostr.postr.toNpub
 
 val imageExtension = Pattern.compile("(.*/)*.+\\.(png|jpg|gif|bmp|jpeg|webp|svg)$")
 val videoExtension = Pattern.compile("(.*/)*.+\\.(mp4|avi|wmv|mpg|amv|webm)$")
@@ -49,50 +51,79 @@ fun isValidURL(url: String?): Boolean {
 }
 
 @Composable
-fun RichTextViewer(content: String, tags: List<List<String>>?, navController: NavController) {
-  Column(modifier = Modifier.padding(top = 5.dp)) {
-
+fun RichTextViewer(
+  content: String,
+  canPreview: Boolean,
+  modifier: Modifier = Modifier,
+  tags: List<List<String>>?,
+  backgroundColor: Color,
+  accountViewModel: AccountViewModel,
+  navController: NavController,
+) {
+  Column(modifier = 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 ->
-          // 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 (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),
-            )
+            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),
+              )
+            }
           }
         }
       }
-
     }
   }
 }
 
+
 fun isBechLink(word: String): Boolean {
   return word.startsWith("nostr:", true)
     || word.startsWith("npub1", true)
@@ -130,7 +161,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 {
@@ -147,21 +178,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

@@ -0,0 +1,233 @@
+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
+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.graphics.Color
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.text.SpanStyle
+import androidx.compose.ui.text.buildAnnotatedString
+import androidx.compose.ui.text.style.TextOverflow
+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.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
+) {
+  val translatedTextState = remember {
+    mutableStateOf(ResultOrError(content, null, null, null))
+  }
+
+  var showOriginal by remember { mutableStateOf(false) }
+  var langSettingsPopupExpanded by remember { mutableStateOf(false) }
+
+  val context = LocalContext.current
+
+  val accountState by accountViewModel.accountLanguagesLiveData.observeAsState()
+  val account = accountState?.account ?: return
+
+  LaunchedEffect(accountState) {
+    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
+
+  Column(modifier = Modifier.padding(top = 5.dp)) {
+    ExpandableRichTextViewer(
+      toBeViewed,
+      canPreview,
+      modifier,
+      tags,
+      backgroundColor,
+      accountViewModel,
+      navController,
+    )
+
+    val target = translatedTextState.value.targetLang
+    val source = translatedTextState.value.sourceLang
+
+    if (source != null && target != null) {
+      if (source != target) {
+        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("-translated from ")
+
+            withStyle(clickableTextStyle) {
+              pushStringAnnotation("showOriginal", true.toString())
+              append(Locale(source).displayName)
+            }
+
+            append(" to ")
+
+            withStyle(clickableTextStyle) {
+              pushStringAnnotation("showOriginal", false.toString())
+              append(Locale(target).displayName)
+            }
+          }
+
+          ClickableText(
+            text = annotatedTranslationString,
+            style = LocalTextStyle.current.copy(color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)),
+            overflow = TextOverflow.Visible,
+            maxLines = 3
+          ) { spanOffset ->
+            annotatedTranslationString.getStringAnnotations(spanOffset, spanOffset)
+              .firstOrNull()
+              ?.also { span ->
+                if (span.tag == "showOriginal")
+                  showOriginal = span.item.toBoolean()
+                else
+                  langSettingsPopupExpanded = !langSettingsPopupExpanded
+              }
+          }
+
+          DropdownMenu(
+            expanded = langSettingsPopupExpanded,
+            onDismissRequest = { langSettingsPopupExpanded = false }
+          ) {
+            DropdownMenuItem(onClick = {
+              accountViewModel.dontTranslateFrom(source, context)
+              langSettingsPopupExpanded = false
+            }) {
+              if (source in account.dontTranslateFrom)
+                Icon(
+                  imageVector = Icons.Default.Check,
+                  contentDescription = null,
+                  modifier = Modifier.size(24.dp)
+                )
+              else
+                Spacer(modifier = Modifier.size(24.dp))
+
+              Spacer(modifier = Modifier.size(10.dp))
+
+              Text("Never translate from ${Locale(source).displayName}")
+            }
+            Divider()
+            DropdownMenuItem(onClick = {
+              accountViewModel.prefer(source, target, source)
+              langSettingsPopupExpanded = false
+            }) {
+              if (account.preferenceBetween(source, target) == source)
+                Icon(
+                  imageVector = Icons.Default.Check,
+                  contentDescription = null,
+                  modifier = Modifier.size(24.dp)
+                )
+              else
+                Spacer(modifier = Modifier.size(24.dp))
+
+              Spacer(modifier = Modifier.size(10.dp))
+
+              Text("Show in ${Locale(source).displayName} first")
+            }
+            DropdownMenuItem(onClick = {
+              accountViewModel.prefer(source, target, target)
+              langSettingsPopupExpanded = false
+            }) {
+              if (account.preferenceBetween(source, target) == target)
+                Icon(
+                  imageVector = Icons.Default.Check,
+                  contentDescription = null,
+                  modifier = Modifier.size(24.dp)
+                )
+              else
+                Spacer(modifier = Modifier.size(24.dp))
+
+              Spacer(modifier = Modifier.size(10.dp))
+
+              Text("Show in ${Locale(target).displayName} first")
+            }
+            Divider()
+
+            val languageList =
+              ConfigurationCompat.getLocales(Resources.getSystem().getConfiguration())
+            for (i in 0 until languageList.size()) {
+              languageList.get(i)?.let { lang ->
+                DropdownMenuItem(onClick = {
+                  accountViewModel.translateTo(lang, context)
+                  langSettingsPopupExpanded = false
+                }) {
+                  if (lang.language in account.translateTo)
+                    Icon(
+                      imageVector = Icons.Default.Check,
+                      contentDescription = null,
+                      modifier = Modifier.size(24.dp)
+                    )
+                  else
+                    Spacer(modifier = Modifier.size(24.dp))
+
+                  Spacer(modifier = Modifier.size(10.dp))
+                  
+                  Text("Always translate to ${lang.displayName}")
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}

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

@@ -1,6 +1,7 @@
 package com.vitorpamplona.amethyst.ui.components
 
 import androidx.compose.animation.Crossfade
+import androidx.compose.animation.core.tween
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
@@ -10,6 +11,8 @@ import androidx.compose.runtime.setValue
 import com.baha.url.preview.IUrlPreviewCallback
 import com.baha.url.preview.UrlInfoItem
 import com.vitorpamplona.amethyst.model.UrlCachedPreviewer
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
 
 
 @Composable
@@ -18,21 +21,23 @@ fun UrlPreview(url: String, urlText: String, showUrlIfError: Boolean = true) {
 
   // 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
-      }
+    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("Error parsing preview for ${url}: ${throwable.message}")
+        }
+      })
+    }
   }
 
-  Crossfade(targetState = urlPreviewState) { state ->
+  Crossfade(targetState = urlPreviewState, animationSpec = tween(durationMillis = 100)) { state ->
     when (state) {
       is UrlPreviewState.Loaded -> {
         UrlPreviewCard(url, state.previewInfo)

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

@@ -36,7 +36,7 @@ fun UrlPreviewCard(
     Column {
       AsyncImage(
         model = previewInfo.image,
-        contentDescription = "Profile Image",
+        contentDescription = "Preview Card Image for ${url}",
         contentScale = ContentScale.FillWidth,
         modifier = Modifier.fillMaxWidth()
       )

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

@@ -5,6 +5,7 @@ import android.widget.FrameLayout
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.viewinterop.AndroidView
@@ -12,29 +13,34 @@ import com.google.android.exoplayer2.C
 import com.google.android.exoplayer2.ExoPlayer
 import com.google.android.exoplayer2.MediaItem
 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.vitorpamplona.amethyst.VideoCache
 
 @Composable
 fun VideoView(videoUri: String) {
   val context = LocalContext.current
 
-  val exoPlayer = ExoPlayer.Builder(LocalContext.current).build().apply {
-    repeatMode = Player.REPEAT_MODE_ALL
-    videoScalingMode = C.VIDEO_SCALING_MODE_SCALE_TO_FIT_WITH_CROPPING
-    setMediaItem(MediaItem.fromUri(videoUri))
-    prepare()
+  val exoPlayer = remember {
+    ExoPlayer.Builder(context).build().apply {
+      repeatMode = Player.REPEAT_MODE_ALL
+      videoScalingMode = C.VIDEO_SCALING_MODE_SCALE_TO_FIT_WITH_CROPPING
+    }
   }
 
   DisposableEffect(exoPlayer) {
+    exoPlayer.setMediaSource(
+      ProgressiveMediaSource.Factory(VideoCache.get(context.applicationContext)).createMediaSource(MediaItem.fromUri(videoUri))
+    )
+    exoPlayer.prepare()
     onDispose {
       exoPlayer.release()
     }
   }
 
   AndroidView(
-    modifier = Modifier
-      .fillMaxWidth(),
+    modifier = Modifier.fillMaxWidth(),
     factory = {
       StyledPlayerView(context).apply {
         player = exoPlayer

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

@@ -2,7 +2,6 @@ package com.vitorpamplona.amethyst.ui.components
 
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.border
-import androidx.compose.foundation.clickable
 import androidx.compose.foundation.combinedClickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
@@ -30,7 +29,7 @@ import androidx.compose.ui.window.Dialog
 import androidx.compose.ui.window.DialogProperties
 import coil.compose.AsyncImage
 import com.vitorpamplona.amethyst.ui.actions.CloseButton
-import nostr.postr.toNpub
+import com.vitorpamplona.amethyst.ui.actions.SaveToGallery
 
 @Composable
 @OptIn(ExperimentalComposeUiApi::class, ExperimentalFoundationApi::class)
@@ -75,6 +74,8 @@ fun ZoomableImageView(word: String) {
             CloseButton(onCancel = {
               dialogOpen = false
             })
+
+            SaveToGallery(url = word)
           }
 
           ZoomableAsyncImage(word)

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 { account.isAcceptable(it) }
+    .filter {
+      (it.event is TextNoteEvent && (it.event as TextNoteEvent).replyTos.isEmpty()) ||
+      (it.event is ChannelMessageEvent && (it.event as ChannelMessageEvent).replyTos.isEmpty())
+    }
+    .sortedBy { it.event?.createdAt }
+    .reversed()
+
+}

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

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

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

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