v0.16.2

Fix issue #121

README.md

@@ -17,14 +17,16 @@ Amethyst brings the best social network to your Android phone. Just insert your
 - [x] Private Messages (NIP-04)
 - [x] User Profiles (follow/unfollow)
 - [x] Public Chats (NIP-28)
-- [ ] Notification Bubbles
+- [x] Notification Bubbles
+- [x] Reporting and Hide User capability
+- [x] Profile Edit
+- [x] Relay Edit (separate relay sets for home, dms, public chats, global)
+- [x] Dropdown to Link Users when writing
+- [x] Lightning Tips
+- [ ] Zaps 
 - [ ] 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
+- [ ] Event Deletion (NIP-09)
 - [ ] Account Creation / Backup Guidance
 - [ ] Message Sent feedback
 
@@ -123,4 +125,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 28
-        versionName "0.11.2"
+        versionCode 55
+        versionName "0.16.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 {
@@ -85,7 +91,10 @@ 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'
@@ -110,6 +119,23 @@ dependencies {
     implementation "com.google.accompanist:accompanist-pager:$accompanist_version" // Pager
     implementation "com.google.accompanist:accompanist-pager-indicators:$accompanist_version"
 
+    // For QR generation
+    implementation 'com.google.zxing:core:3.5.1'
+    implementation "androidx.camera:camera-camera2:1.2.1"
+    implementation 'androidx.camera:camera-lifecycle:1.2.1'
+    implementation 'androidx.camera:camera-view:1.2.1'
+
+    // For QR Scanning
+    implementation 'com.google.mlkit:vision-common:17.3.0'
+
+    // Local Barcode Scanning model
+    implementation 'com.google.android.gms:play-services-mlkit-barcode-scanning:18.1.0'
+
+    // Use this dependency to use the translate text
+    implementation 'com.google.mlkit:translate:17.0.1'
+    implementation 'com.google.mlkit:language-id:17.0.4'
+    implementation 'com.google.android.gms:play-services-mlkit-language-id:17.0.0'
+
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'

app/proguard-rules.pro

@@ -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/UrlUserTagTransformationTest.kt

@@ -6,6 +6,7 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.decodePublicKey
+import com.vitorpamplona.amethyst.model.toHexKey
 import com.vitorpamplona.amethyst.ui.actions.buildAnnotatedStringWithUrlHighlighting
 import org.junit.Assert.*
 import org.junit.Test
@@ -22,12 +23,12 @@ 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"))
+    val user = LocalCache.getOrCreateUser(decodePublicKey("npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z").toHexKey())
     user.info.displayName = "Vitor Pamplona"
 
     var transformedText = buildAnnotatedStringWithUrlHighlighting(
@@ -61,7 +62,7 @@ class EUrlUserTagTransformationTest {
 
   @Test
   fun transformationTextTwoKeys() {
-    val user = LocalCache.getOrCreateUser(decodePublicKey("npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z"))
+    val user = LocalCache.getOrCreateUser(decodePublicKey("npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z").toHexKey())
     user.info.displayName = "Vitor Pamplona"
 
     var transformedText = buildAnnotatedStringWithUrlHighlighting(

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,9 +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"
@@ -15,17 +21,21 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.Amethyst"
         android:largeHeap="true"
-        tools:targetApi="31">
+        android:usesCleartextTraffic="true"
+        tools:targetApi="33">
         <activity
+            android:label="@string/app_name"
             android:name=".ui.MainActivity"
             android:exported="true"
+            android:windowSoftInputMode="adjustResize"
             android:theme="@style/Theme.Amethyst">
-            <intent-filter>
+
+            <intent-filter android:label="Amethyst">
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
 
-            <intent-filter>
+            <intent-filter android:label="Amethyst">
                 <action android:name="android.intent.action.VIEW" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
@@ -36,6 +46,10 @@
                 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,18 @@
 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.toByteArray
-import com.vitorpamplona.amethyst.ui.navigation.Route
+import com.vitorpamplona.amethyst.model.RelaySetupInfo
+import java.util.Locale
 import nostr.postr.Persona
 import nostr.postr.toHex
 
 class LocalPreferences(context: Context) {
   val encryptedPreferences = EncryptedStorage().preferences(context)
+  val gson = GsonBuilder().create()
 
   fun clearEncryptedStorage() {
     encryptedPreferences.edit().apply {
@@ -19,6 +20,9 @@ class LocalPreferences(context: Context) {
       remove("nostr_pubkey")
       remove("following_channels")
       remove("hidden_users")
+      remove("relays")
+      remove("dontTranslateFrom")
+      remove("translateTo")
     }.apply()
   }
 
@@ -28,6 +32,9 @@ 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.translateTo.let { putString("translateTo", it) }
     }.apply()
   }
 
@@ -35,14 +42,24 @@ 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
 
       if (pubKey != null) {
         return Account(
           Persona(privKey = privKey?.toByteArray(), pubKey = pubKey.toByteArray()),
           followingChannels,
-          hiddenUsers
+          hiddenUsers,
+          localRelays,
+          dontTranslateFrom,
+          translateTo
         )
       } else {
         return null

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

@@ -0,0 +1,29 @@
+package com.vitorpamplona.amethyst
+
+import android.content.Context
+import android.graphics.Bitmap
+import android.util.LruCache
+import androidx.compose.ui.graphics.ImageBitmap
+import androidx.compose.ui.graphics.asImageBitmap
+import java.util.UUID
+import name.neuhalfen.projects.android.robohash.RoboHash
+
+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,7 +1,7 @@
 package com.vitorpamplona.amethyst
 
 import com.vitorpamplona.amethyst.model.Account
-import com.vitorpamplona.amethyst.service.Constants
+import com.vitorpamplona.amethyst.service.relays.Constants
 import com.vitorpamplona.amethyst.service.NostrAccountDataSource
 import com.vitorpamplona.amethyst.service.NostrChannelDataSource
 import com.vitorpamplona.amethyst.service.NostrChatroomListDataSource
@@ -29,7 +29,7 @@ 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
@@ -45,17 +45,17 @@ object ServiceManager {
       NostrUserProfileFollowersDataSource.account = myAccount
 
       NostrAccountDataSource.start()
-      NostrGlobalDataSource.start()
+      //NostrGlobalDataSource.start()
       NostrHomeDataSource.start()
       NostrNotificationDataSource.start()
       NostrSingleEventDataSource.start()
       NostrSingleChannelDataSource.start()
       NostrSingleUserDataSource.start()
-      NostrThreadDataSource.start()
+      //NostrThreadDataSource.start()
       NostrChatroomListDataSource.start()
     } else {
       // if not logged in yet, start a basic service wit default relays
-      Client.connect()
+      Client.connect(Constants.convertDefaultRelays())
     }
   }
 

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/lnurl/LightningAddressResolver.kt

@@ -0,0 +1,148 @@
+package com.vitorpamplona.amethyst.lnurl
+
+import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
+import java.net.URLEncoder
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import nostr.postr.Bech32
+import okhttp3.Call
+import okhttp3.Callback
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import okhttp3.Response
+
+class LightningAddressResolver {
+  val client = OkHttpClient.Builder().build()
+
+  fun assembleUrl(lnaddress: String): String? {
+    val parts = lnaddress.split("@")
+
+    if (parts.size != 2) {
+      return null
+    }
+
+    return "https://${parts[1]}/.well-known/lnurlp/${parts[0]}"
+  }
+
+  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 {
+            onSuccess(response.body.string())
+          }
+        }
+
+        override fun onFailure(call: Call, e: java.io.IOException) {
+          onError("Could not resolve User's LNURL address from ${url}. Check if the server up and if the lightning address ${lnaddress} is correct")
+          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 {
+            onSuccess(response.body.string())
+          }
+        }
+
+        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 = onError
+          )
+        }
+      },
+      onError = onError
+    )
+  }
+}

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

@@ -1,18 +1,26 @@
 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.relays.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.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.delay
 import kotlinx.coroutines.launch
@@ -31,14 +39,25 @@ 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 translateTo: String = Locale.getDefault().language
 ) {
-
   fun userProfile(): User {
-    return LocalCache.getOrCreateUser(loggedIn.pubKey)
+    return LocalCache.getOrCreateUser(loggedIn.pubKey.toHexKey())
   }
 
   fun followingChannels(): List<Channel> {
@@ -46,7 +65,7 @@ class Account(
   }
 
   fun hiddenUsers(): List<User> {
-    return hiddenUsers.map { LocalCache.getOrCreateUser(it.toByteArray()) }
+    return hiddenUsers.map { LocalCache.getOrCreateUser(it) }
   }
 
   fun isWriteable(): Boolean {
@@ -90,7 +109,7 @@ class Account(
   fun reactTo(note: Note) {
     if (!isWriteable()) return
 
-    if (note.reactions.firstOrNull { it.author == userProfile() && it.event?.content == "+" } != null) {
+    if (note.hasReacted(userProfile(), "+")) {
       // has already liked this note
       return
     }
@@ -102,12 +121,34 @@ class Account(
     }
   }
 
-  fun report(note: Note) {
+  fun createZapRequestFor(note: Note): LnZapRequestEvent? {
+    if (!isWriteable()) return null
+
+    if (note.hasZapped(userProfile())) {
+      // has already liked this note
+      return null
+    }
+
+    note.event?.let {
+      return LnZapRequestEvent.create(it, userProfile().relays?.keys ?: localRelays.map { it.url }.toSet(), loggedIn.privKey!!)
+    }
+
+    return 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 ?: 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
     }
@@ -117,16 +158,31 @@ class Account(
       Client.send(event)
       LocalCache.consume(event)
     }
+
+    note.event?.let {
+      val event = ReportEvent.create(it, type, loggedIn.privKey!!)
+      Client.send(event)
+      LocalCache.consume(event)
+    }
+  }
+
+  fun report(user: User, type: ReportEvent.ReportType) {
+    if (!isWriteable()) return
+
+    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)
   }
 
   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.hasBoosted(userProfile())) {
       // has already bosted in the past 5mins 
       return
     }
@@ -210,7 +266,7 @@ class Account(
       privateKey = loggedIn.privKey!!
     )
     Client.send(signedEvent)
-    LocalCache.consume(signedEvent)
+    LocalCache.consume(signedEvent, null)
   }
 
   fun sendPrivateMeesage(message: String, toUser: String, replyingTo: Note? = null) {
@@ -225,7 +281,7 @@ class Account(
       advertiseNip18 = false
     )
     Client.send(signedEvent)
-    LocalCache.consume(signedEvent)
+    LocalCache.consume(signedEvent, null)
   }
 
   fun sendCreateNewChannel(name: String, about: String, picture: String) {
@@ -247,23 +303,23 @@ class Account(
   }
 
   fun joinChannel(idHex: String) {
-    followingChannels.add(idHex)
-    invalidateData()
+    followingChannels = followingChannels + idHex
+    invalidateData(live)
   }
 
   fun leaveChannel(idHex: String) {
-    followingChannels.remove(idHex)
-    invalidateData()
+    followingChannels = followingChannels - idHex
+    invalidateData(live)
   }
 
   fun hideUser(pubkeyHex: String) {
-    hiddenUsers.add(pubkeyHex)
-    invalidateData()
+    hiddenUsers = hiddenUsers + pubkeyHex
+    invalidateData(live)
   }
 
   fun showUser(pubkeyHex: String) {
-    hiddenUsers.remove(pubkeyHex)
-    invalidateData()
+    hiddenUsers = hiddenUsers - pubkeyHex
+    invalidateData(live)
   }
 
   fun sendChangeChannel(name: String, about: String, picture: String, channel: Channel) {
@@ -282,7 +338,7 @@ class Account(
     Client.send(event)
     LocalCache.consume(event)
 
-    followingChannels.add(event.id.toHex())
+    joinChannel(event.id.toHex())
   }
 
   fun decryptContent(note: Note): String? {
@@ -315,55 +371,97 @@ class Account(
     }
   }
 
+  fun addDontTranslateFrom(languageCode: String) {
+    dontTranslateFrom = dontTranslateFrom.plus(languageCode)
+    invalidateData(liveLanguages)
+  }
+
+  fun updateTranslateTo(languageCode: String) {
+    translateTo = languageCode
+    invalidateData(liveLanguages)
+  }
+
   fun activeRelays(): Array<Relay>? {
-    return userProfile().relays?.map { Relay(it.key, it.value.read, it.value.write) }?.toTypedArray()
+    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()
   }
 
   init {
-    userProfile().subscribe(object: User.Listener() {
-      override fun onRelayChange() {
+    userProfile().liveRelays.observeForever {
+      GlobalScope.launch(Dispatchers.IO) {
         Client.disconnect()
-        Client.connect(activeRelays() ?: Constants.defaultRelays)
+        Client.connect(activeRelays() ?: convertLocalRelays())
         RelayPool.requestAndWatch()
       }
-    })
+    }
   }
 
   // Observers line up here.
   val live: AccountLiveData = AccountLiveData(this)
+  val liveLanguages: AccountLiveData = AccountLiveData(this)
+
+  var handlerWaiting = AtomicBoolean()
 
-  // Refreshes observers in batches.
-  var handlerWaiting = false
   @Synchronized
-  fun invalidateData() {
-    if (handlerWaiting) return
+  private fun invalidateData(live: AccountLiveData) {
+    if (handlerWaiting.getAndSet(true)) return
 
-    handlerWaiting = true
+    handlerWaiting.set(true)
     val scope = CoroutineScope(Job() + Dispatchers.Default)
     scope.launch {
       delay(100)
       live.refresh()
-      handlerWaiting = false
+      handlerWaiting.set(false)
     }
   }
 
+  fun isHidden(user: User) = user in hiddenUsers()
 
   fun isAcceptable(user: User): Boolean {
     return user !in hiddenUsers()  // if user hasn't hided this author
+        && user.reportsBy( userProfile() ).isEmpty() // if user has not reported this post
+        && user.reportAuthorsBy( userProfile().follows ).size < 5
   }
 
   fun isAcceptableDirect(note: Note): Boolean {
-    return note.reports.firstOrNull { it.author == userProfile() } == null // if user has not reported this post
-        && note.reports.filter { it.author in userProfile().follows }.size < 5 // if it has 5 reports by reliable users
+    return note.reportsBy( userProfile() ).isEmpty()  // if user has not reported this post
+        && 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) } )
+  }
 }
 
 class AccountLiveData(private val account: Account): LiveData<AccountState>(AccountState(account)) {

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

@@ -17,6 +17,10 @@ class Channel(val id: ByteArray) {
 
     val notes = ConcurrentHashMap<HexKey, Note>()
 
+    fun toBestDisplayName(): String {
+        return info.name ?: idDisplayHex
+    }
+
     @Synchronized
     fun addNote(note: Note) {
         notes[note.idHex] = note
@@ -30,9 +34,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 {

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

@@ -11,6 +11,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 {

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

@@ -10,7 +10,10 @@ 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 java.io.ByteArrayInputStream
 import java.time.Instant
@@ -18,6 +21,13 @@ 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.delay
+import kotlinx.coroutines.launch
 import nostr.postr.events.ContactListEvent
 import nostr.postr.events.DeletionEvent
 import nostr.postr.events.Event
@@ -39,10 +49,9 @@ object LocalCache {
   val channels = ConcurrentHashMap<HexKey, Channel>()
 
   @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
     }
@@ -69,10 +78,8 @@ object LocalCache {
 
   fun consume(event: MetadataEvent) {
     // new event
-    val oldUser = getOrCreateUser(event.pubKey)
+    val oldUser = getOrCreateUser(event.pubKey.toHexKey())
     if (event.createdAt > oldUser.updatedMetadataAt) {
-      //Log.d("MT", "New User ${users.size} ${event.contactMetaData.name}")
-
       val newUser = try {
         metadataParser.readValue<UserMetadata>(ByteArrayInputStream(event.content.toByteArray(Charsets.UTF_8)), UserMetadata::class.java)
       } catch (e: Exception) {
@@ -83,6 +90,8 @@ object LocalCache {
 
       oldUser.updateUserInfo(newUser, event.createdAt)
       oldUser.latestMetadata = 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)}")
     }
@@ -93,22 +102,28 @@ object LocalCache {
       .format(DateTimeFormatter.ofPattern("uuuu MMM d hh:mm a"))
   }
 
-  fun consume(event: TextNoteEvent) {
+  fun consume(event: TextNoteEvent, relay: Relay? = null) {
     val note = getOrCreateNote(event.id.toHex())
 
+    val author = getOrCreateUser(event.pubKey.toHexKey())
+
+    if (relay != null) {
+      author.addRelay(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) }.toMutableList())
+    val mentions = event.mentions.map { getOrCreateUser(it) }
+    val replyTo = event.replyTos.map { getOrCreateNote(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 {
@@ -131,15 +146,15 @@ object LocalCache {
   }
 
   fun consume(event: ContactListEvent) {
-    val user = getOrCreateUser(event.pubKey)
+    val user = getOrCreateUser(event.pubKey.toHexKey())
 
     if (event.createdAt > user.updatedFollowsAt) {
-      //Log.d("CL", "AAA ${user.toBestDisplayName()} ${event.follows.size}")
+      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())
@@ -157,6 +172,7 @@ object LocalCache {
               event.content,
               object : TypeToken<Map<String, ContactListEvent.ReadWrite>>() {}.type
             )
+
           user.updateRelays(relays)
         }
       } catch (e: Exception) {
@@ -167,19 +183,24 @@ object LocalCache {
     }
   }
 
-  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.addRelay(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) }.map { getOrCreateNote(it) }
+    val mentions = event.tags.filter { it.firstOrNull() == "p" }.mapNotNull { it.getOrNull(1) }.map { getOrCreateUser(it) }
 
     note.loadEvent(event, author, mentions, repliesTo)
 
@@ -203,14 +224,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.map { getOrCreateUser(it) }
+    val repliesTo = event.boostedPost.map { getOrCreateNote(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 {
@@ -229,14 +250,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.map { getOrCreateUser(it) }
+    val repliesTo = event.originalPost.map { getOrCreateNote(it) }
 
     note.loadEvent(event, author, mentions, repliesTo)
 
@@ -273,11 +294,35 @@ object LocalCache {
     }
   }
 
+  fun consume(event: ReportEvent) {
+    val note = getOrCreateNote(event.id.toHex())
+
+    // Already processed this event.
+    if (note.event != null) return
+
+    val author = getOrCreateUser(event.pubKey.toHexKey())
+    val mentions = event.reportedAuthor.map { getOrCreateUser(it) }
+    val repliesTo = event.reportedPost.map { getOrCreateNote(it) }
+
+    note.loadEvent(event, author, mentions, repliesTo)
+
+    //Log.d("RP", "New Report ${event.content} by ${note.author?.toBestDisplayName()} ${formattedDateTime(event.createdAt)}")
+    // Adds notifications to users.
+    if (repliesTo.isEmpty()) {
+      mentions.forEach {
+        it.addReport(note)
+      }
+    }
+    repliesTo.forEach {
+      it.addReport(note)
+    }
+  }
+
   fun consume(event: ChannelCreateEvent) {
     //Log.d("MT", "New Event ${event.content} ${event.id.toHex()}")
     // new event
     val oldChannel = getOrCreateChannel(event.id.toHex())
-    val author = getOrCreateUser(event.pubKey)
+    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)
@@ -285,7 +330,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()
       }
@@ -299,7 +344,7 @@ object LocalCache {
 
     // new event
     val oldChannel = getOrCreateChannel(event.channel)
-    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)
@@ -307,7 +352,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()
       }
@@ -316,7 +361,7 @@ object LocalCache {
     }
   }
 
-  fun consume(event: ChannelMessageEvent) {
+  fun consume(event: ChannelMessageEvent, relay: Relay?) {
     if (event.channel.isNullOrBlank()) return
 
     val channel = getOrCreateChannel(event.channel)
@@ -324,17 +369,20 @@ object LocalCache {
     val note = getOrCreateNote(event.id.toHex())
     channel.addNote(note)
 
+    val author = getOrCreateUser(event.pubKey.toHexKey())
+
+    if (relay != null) {
+      author.addRelay(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.map { getOrCreateUser(it) }
+    val replyTo = event.replyTos
+      .map { getOrCreateNote(it) }
+      .filter { it.event !is ChannelCreateEvent }
 
     note.channel = channel
     note.loadEvent(event, author, mentions, replyTo)
@@ -365,6 +413,72 @@ 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.map { getOrCreateUser(it) }
+    val repliesTo = event.zappedPost.map { getOrCreateNote(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.map { getOrCreateUser(it) }
+    val repliesTo = event.zappedPost.map { getOrCreateNote(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)
@@ -394,12 +508,30 @@ object LocalCache {
   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 {
+      delay(100)
+      refresh()
+      handlerWaiting.set(false)
+    }
+  }
+
+  private fun refresh() {
     postValue(LocalCacheState(cache))
   }
 }

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

@@ -1,52 +1,71 @@
 package com.vitorpamplona.amethyst.model
 
-import android.os.Handler
-import android.os.Looper
 import androidx.lifecycle.LiveData
+import com.vitorpamplona.amethyst.lnurl.LnInvoiceUtil
 import com.vitorpamplona.amethyst.service.NostrSingleEventDataSource
+import com.vitorpamplona.amethyst.service.model.LnZapEvent
+import com.vitorpamplona.amethyst.service.model.ReactionEvent
+import com.vitorpamplona.amethyst.service.model.RepostEvent
 import com.vitorpamplona.amethyst.ui.note.toShortenHex
 import fr.acinq.secp256k1.Hex
 import java.time.Instant
 import java.time.ZoneId
 import java.time.format.DateTimeFormatter
 import java.util.Collections
-import java.util.Date
 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 java.math.BigDecimal
+import java.util.Date
+import java.util.concurrent.atomic.AtomicBoolean
+import java.util.regex.Matcher
+import java.util.regex.Pattern
 import nostr.postr.events.Event
 
+val tagSearch = Pattern.compile("(?:\\s|\\A)\\#\\[([0-9]+)\\]")
+
 class Note(val idHex: String) {
     // These fields are always available.
     // They are immutable
     val id = Hex.decode(idHex)
-    val idDisplayHex = id.toShortenHex()
+    val idDisplayNote = id.toNote().toShortenHex()
 
     // These fields are only available after the Text Note event is received.
     // They are immutable after that.
     var event: Event? = null
     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>())
+    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
 
-    val reports = Collections.synchronizedSet(mutableSetOf<Note>())
+    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 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)
+        live.invalidateData()
     }
 
     fun formattedDateTime(timestamp: Long): String {
@@ -77,35 +96,136 @@ class Note(val idHex: String) {
     }
 
     fun addReply(note: Note) {
-        if (replies.add(note))
-            invalidateData(liveReplies)
+        if (note !in replies) {
+            replies = replies + note
+            liveReplies.invalidateData()
+        }
     }
 
     fun addBoost(note: Note) {
-        if (boosts.add(note))
-            invalidateData(liveBoosts)
+        if (note !in boosts) {
+            boosts = boosts + note
+            liveBoosts.invalidateData()
+        }
+    }
+
+    fun addZap(zapRequest: Note, zap: Note?) {
+        if (zapRequest !in zaps.keys) {
+            zaps = zaps + Pair(zapRequest, zap)
+            liveZaps.invalidateData()
+        } else if (zapRequest in zaps.keys && zaps[zapRequest] == null) {
+            zaps = zaps + Pair(zapRequest, zap)
+            liveZaps.invalidateData()
+        }
     }
 
     fun addReaction(note: Note) {
-        if (reactions.add(note))
-            invalidateData(liveReactions)
+        if (note !in reactions) {
+            reactions = reactions + note
+            liveReactions.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))
+            liveReports.invalidateData()
+        } else if (reports[author]?.contains(note) == false) {
+            reports = reports + Pair(author, (reports[author] ?: emptySet()) + note)
+            liveReports.invalidateData()
+        }
+    }
+
+    fun addRelay(relay: Relay) {
+        if (relay.url !in relays) {
+            relays = relays + relay.url
+            liveRelays.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): 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 reportAuthorsBy(users).mapNotNull {
+            reports[it]
+        }.flatten()
+    }
+
+    fun zappedAmount(): BigDecimal {
+        return zaps.mapNotNull { it.value?.event }
+            .filterIsInstance<LnZapEvent>()
+            .mapNotNull {
+                it.amount
+            }.sumOf { it }
+    }
+
+    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)
+    }
+
+    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") {
+                    returningList.add(LocalCache.getOrCreateUser(tag[1]))
+                }
+            } catch (e: Exception) {
+
+            }
         }
+        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 reactions.firstOrNull { it.author == loggedIn && it.event?.content == content } != null
+    }
+
+    fun hasBoosted(loggedIn: User): Boolean {
+        val currentTime = Date().time / 1000
+        return boosts.firstOrNull { it.author == loggedIn && (it.event?.createdAt ?: 0) > currentTime - (60 * 5)} != null // 5 minute protection
     }
 
     // Observers line up here.
@@ -115,24 +235,28 @@ class Note(val idHex: String) {
     val liveBoosts: NoteLiveData = NoteLiveData(this)
     val liveReplies: NoteLiveData = NoteLiveData(this)
     val liveReports: NoteLiveData = NoteLiveData(this)
-
-    // Refreshes observers in batches.
-    var handlerWaiting = false
-    @Synchronized
-    fun invalidateData(live: NoteLiveData) {
-        if (handlerWaiting) return
-
-        handlerWaiting = true
-        val scope = CoroutineScope(Job() + Dispatchers.Default)
-        scope.launch {
-            delay(100)
-            live.refresh()
-            handlerWaiting = false
-        }
-    }
+    val liveRelays: NoteLiveData = NoteLiveData(this)
+    val liveZaps: NoteLiveData = NoteLiveData(this)
 }
 
 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,13 @@
+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 feedTypes: Set<FeedType>
+)

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

@@ -14,8 +14,10 @@ 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 +34,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,23 +2,25 @@ 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 kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import nostr.postr.events.ContactListEvent
-import nostr.postr.events.Event
 import nostr.postr.events.MetadataEvent
+import nostr.postr.toNpub
 
-class User(val pubkey: ByteArray) {
-    val pubkeyHex = pubkey.toHexKey()
-    val pubkeyDisplayHex = pubkey.toShortenHex()
+class User(val pubkeyHex: String) {
+    val pubkey = Hex.decode(pubkeyHex)
+    val pubkeyDisplayHex = pubkey.toNpub().toShortenHex()
 
     var info = UserMetadata()
 
@@ -28,15 +30,34 @@ class User(val pubkey: ByteArray) {
     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 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
+
+    data class Chatroom(var roomMessages: Set<Note>)
+
+    var privateChatrooms = mapOf<User, Chatroom>()
+        private set
+
+    var latestReportRequestEOSE: Long? = null
 
     fun toBestDisplayName(): String {
         return bestDisplayName() ?: bestUsername() ?: pubkeyDisplayHex
@@ -50,67 +71,151 @@ class User(val pubkey: ByteArray) {
         return info.displayName?.ifBlank { null } ?: info.display_name?.ifBlank { null }
     }
 
-    fun profilePicture(): String {
+    fun profilePicture(): String? {
         if (info.picture.isNullOrBlank()) info.picture = null
-        return info.picture ?: "https://robohash.org/${pubkeyHex}.png"
+        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()
-        }
+        liveFollows.invalidateData()
+        user.liveFollows.invalidateData()
     }
+
     fun unfollow(user: User) {
-        follows.remove(user)
-        user.followers.remove(this)
+        follows = follows - user
+        user.followers = user.followers - this
 
-        invalidateData()
-        user.invalidateData()
+        liveFollows.invalidateData()
+        user.liveFollows.invalidateData()
+    }
 
-        updateSubscribers {
-            it.onFollowsChange()
+    fun follow(users: Set<User>, followedAt: Long) {
+        follows = follows + users
+        users.forEach {
+            if (this !in it.followers) {
+                it.followers = it.followers + this
+                it.liveFollows.invalidateData()
+            }
         }
+
+        liveFollows.invalidateData()
+    }
+
+    fun unfollow(users: Set<User>) {
+        follows = follows - users
+        users.forEach {
+            if (this in it.followers) {
+                it.followers = it.followers - this
+                it.liveFollows.invalidateData()
+            }
+        }
+        liveFollows.invalidateData()
     }
 
     fun addTaggedPost(note: Note) {
-        taggedPosts.add(note)
-        updateSubscribers { it.onNewPosts() }
+        if (note !in taggedPosts) {
+            taggedPosts = taggedPosts + note
+            // No need for Listener yet
+        }
+    }
+
+    fun addNote(note: Note) {
+        if (note !in notes) {
+            notes = notes + note
+            // No need for Listener yet
+        }
+    }
+
+    fun addReport(note: Note) {
+        val author = note.author ?: return
+
+        if (author !in reports.keys) {
+            reports = reports + Pair(author, setOf(note))
+            liveReports.invalidateData()
+        } else if (reports[author]?.contains(note) == false) {
+            reports = reports + Pair(author, (reports[author] ?: emptySet()) + note)
+            liveReports.invalidateData()
+        }
+    }
+
+    fun addZap(zapRequest: Note, zap: Note?) {
+        if (zapRequest !in zaps.keys) {
+            zaps = zaps + Pair(zapRequest, zap)
+            liveZaps.invalidateData()
+        } else if (zapRequest in zaps.keys && zaps[zapRequest] == null) {
+            zaps = zaps + Pair(zapRequest, zap)
+            liveZaps.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 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)
-        live.refresh()
-        updateSubscribers { it.onNewMessage() }
+        val privateChatroom = getOrCreatePrivateChatroom(user)
+        if (msg !in privateChatroom.roomMessages) {
+            privateChatroom.roomMessages = privateChatroom.roomMessages + msg
+            liveMessages.invalidateData()
+        }
     }
 
+    data class RelayInfo (
+        val url: String,
+        var lastEvent: Long,
+        var counter: Long
+    )
+
+    fun addRelay(relay: Relay, eventTime: Long) {
+        val here = relaysBeingUsed[relay.url]
+        if (here == null) {
+            relaysBeingUsed = relaysBeingUsed + Pair(relay.url, RelayInfo(relay.url, eventTime, 1))
+        } else {
+            if (eventTime > here.lastEvent) {
+                here.lastEvent = eventTime
+            }
+            here.counter++
+        }
+
+        liveRelayInfo.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
     }
@@ -118,9 +223,7 @@ class User(val pubkey: ByteArray) {
     fun updateRelays(relayUse: Map<String, ContactListEvent.ReadWrite>) {
         if (relays != relayUse) {
             relays = relayUse
-            listeners.forEach {
-                it.onRelayChange()
-            }
+            liveRelays.invalidateData()
         }
     }
 
@@ -128,83 +231,33 @@ class User(val pubkey: ByteArray) {
         info = newUserInfo
         updatedMetadataAt = updateAt
 
-        if (info.picture?.startsWith( "http://") == true) {
-            info.picture = info.picture?.replaceFirst("http://", "https://")
-        }
-
-        if (info.banner?.startsWith( "http://") == true) {
-            info.banner = info.banner?.replaceFirst("http://", "https://")
-        }
-
-        invalidateData()
+        liveMetadata.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 }
     }
 
-    // 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
-    }
-
-    // Refreshes observers in batches.
-    var modelHandlerWaiting = false
-    @Synchronized
-    fun updateSubscribers(on: (Listener) -> Unit) {
-        if (modelHandlerWaiting) return
-
-        modelHandlerWaiting = true
-        val scope = CoroutineScope(Job() + Dispatchers.Main)
-        scope.launch {
-            delay(100)
-            listeners.forEach {
-                on(it)
-            }
-            modelHandlerWaiting = false
-        }
+    fun hasReport(loggedIn: User, type: ReportEvent.ReportType): Boolean {
+        return reports[loggedIn]?.firstOrNull() {
+              it.event is ReportEvent && (it.event as ReportEvent).reportType.contains(type)
+        } != null
     }
 
     // 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
-        }
-    }
+    val liveFollows: UserLiveData = UserLiveData(this)
+    val liveReports: UserLiveData = UserLiveData(this)
+    val liveMessages: UserLiveData = UserLiveData(this)
+    val liveRelays: UserLiveData = UserLiveData(this)
+    val liveRelayInfo: UserLiveData = UserLiveData(this)
+    val liveMetadata: UserLiveData = UserLiveData(this)
+    val liveZaps: UserLiveData = UserLiveData(this)
 }
 
 class UserMetadata {
@@ -233,7 +286,25 @@ class UserMetadata {
 }
 
 class UserLiveData(val user: User): LiveData<UserState>(UserState(user)) {
-    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 {
+            delay(100)
+            refresh()
+            handlerWaiting.set(false)
+        }
+    }
+
+    private fun refresh() {
         postValue(UserState(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/Nip19.kt

@@ -36,13 +36,14 @@ class Nip19 {
         }
       }
     } catch (e: Throwable) {
+      println("Trying to Decode NIP19: ${uri}")
       e.printStackTrace()
     }
 
     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

@@ -3,8 +3,13 @@ package com.vitorpamplona.amethyst.service
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.Note
-import com.vitorpamplona.amethyst.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
@@ -13,46 +18,67 @@ import nostr.postr.events.TextNoteEvent
 object NostrAccountDataSource: NostrDataSource<Note>("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()
+  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 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 { (it.event is TextNoteEvent || it.event is RepostEvent) && it.author in user.follows }
       .sortedBy { it.event?.createdAt }
       .reversed()
   }
 
   override fun updateChannelFilters() {
     // gets everthing about the user logged in
-    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

@@ -4,6 +4,8 @@ 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
 
 object NostrChannelDataSource: NostrDataSource<Note>("ChatroomFeed") {
@@ -11,16 +13,19 @@ object NostrChannelDataSource: NostrDataSource<Note>("ChatroomFeed") {
   var channel: com.vitorpamplona.amethyst.model.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
@@ -34,6 +39,6 @@ object NostrChannelDataSource: NostrDataSource<Note>("ChatroomFeed") {
   }
 
   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

@@ -4,6 +4,8 @@ import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.model.User
+import com.vitorpamplona.amethyst.service.relays.FeedType
+import com.vitorpamplona.amethyst.service.relays.TypedFilter
 import nostr.postr.JsonFilter
 import nostr.postr.events.PrivateDmEvent
 
@@ -16,34 +18,50 @@ object NostrChatRoomDataSource: NostrDataSource<Note>("ChatroomFeed") {
     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 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() = JsonFilter(
-    kinds = listOf(PrivateDmEvent.kind),
-    authors = listOf(account.userProfile().pubkeyHex),
-    tags = withUser?.let { mapOf("p" to listOf(it.pubkeyHex)) }
-  )
+  fun createMessagesFromMeFilter(): TypedFilter? {
+    val myPeer = withUser
+    
+    return if (myPeer != null) {
+      TypedFilter(
+        types = setOf(FeedType.PUBLIC_CHATS),
+        filter = JsonFilter(
+          kinds = listOf(PrivateDmEvent.kind),
+          authors = listOf(account.userProfile().pubkeyHex),
+          tags = mapOf("p" to listOf(myPeer.pubkeyHex))
+        )
+      )
+    } else {
+      null
+    }
+  }
 
-  val incomingChannel = requestNewChannel()
-  val outgoingChannel = requestNewChannel()
+  val inandoutChannel = requestNewChannel()
 
   // returns the last Note of each user.
   override fun feed(): List<Note> {
-    val messages = account.userProfile().messages[withUser] ?: return emptyList()
+    val messages = account.userProfile().privateChatrooms[withUser] ?: return emptyList()
 
-    val filteredMessages = synchronized(messages) {
-      messages.filter { account.isAcceptable(it) }
-    }
-
-    return filteredMessages.sortedBy { it.event?.createdAt }.reversed()
+    return messages.roomMessages.filter { account.isAcceptable(it) }.sortedBy { it.event?.createdAt }.reversed()
   }
 
   override fun updateChannelFilters() {
-    incomingChannel.filter = listOf(createMessagesToMeFilter()).ifEmpty { null }
-    outgoingChannel.filter = listOf(createMessagesFromMeFilter()).ifEmpty { null }
+    inandoutChannel.typedFilters = listOfNotNull(createMessagesToMeFilter(), createMessagesFromMeFilter()).ifEmpty { null }
   }
 }

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

@@ -1,80 +1,85 @@
 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") {
   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 = setOf(FeedType.PUBLIC_CHATS),
+      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 = setOf(FeedType.PUBLIC_CHATS),
+        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 = 1
+        )
       )
     }
   }
 
-  val incomingChannel = requestNewChannel()
-  val outgoingChannel = requestNewChannel()
-
-  val myChannelsChannel = requestNewChannel()
-  val myChannelsInfoChannel = requestNewChannel()
-  val myChannelsMessagesChannel = requestNewChannel()
-
-  val myChannelsCreatedbyMeChannel = requestNewChannel()
+  val chatroomListChannel = 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 privateChatrooms = account.userProfile().privateChatrooms
+    val messagingWith = privateChatrooms.keys.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
-      }
+      privateChatrooms[it]?.roomMessages?.sortedBy { it.event?.createdAt }?.lastOrNull { it.event != null }
     }
 
     val publicChannels = account.followingChannels().map {
@@ -85,12 +90,16 @@ object NostrChatroomListDataSource: NostrDataSource<Note>("MailBoxFeed") {
   }
 
   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,23 +1,25 @@
 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.model.toHexKey
 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,44 +34,60 @@ 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>())
+  private var subscriptions = mapOf<String, Subscription>()
 
-  private val eventCounter = mutableMapOf<String, Int>()
+  data class Counter(var counter:Int)
+
+  private var eventCounter = mapOf<String, Counter>()
 
   fun printCounter() {
     eventCounter.forEach {
-      println("AAA Count ${it.key}: ${it.value}")
+      println("AAA Count ${it.key}: ${it.value.counter}")
     }
   }
 
   private val clientListener = object : Client.Listener() {
     override fun onEvent(event: Event, subscriptionId: String, relay: Relay) {
-      if (subscriptionId in 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 {
           when (event) {
             is MetadataEvent -> LocalCache.consume(event)
-            is TextNoteEvent -> LocalCache.consume(event)
+            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)
-            is RepostEvent -> LocalCache.consume(event)
-            is ReactionEvent -> LocalCache.consume(event)
             else -> when (event.kind) {
-              RepostEvent.kind -> LocalCache.consume(RepostEvent(event.id, event.pubKey, event.createdAt, event.tags, event.content, event.sig))
+              RepostEvent.kind -> {
+                val repostEvent = RepostEvent(event.id, event.pubKey, event.createdAt, event.tags, event.content, event.sig)
+
+                repostEvent.containedPost?.let { onEvent(it, subscriptionId, relay) }
+                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))
+
+              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))
             }
@@ -85,7 +103,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."
@@ -93,11 +111,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) {
@@ -114,14 +131,16 @@ abstract class NostrDataSource<T>(val debugName: String) {
   }
 
   open fun stop() {
-    channels.forEach { channel ->
-      if (channel.filter != null) // if it is active, close
+    subscriptions.values.forEach { channel ->
+      if (channel.typedFilters != null) {// if it is active, close
         Client.close(channel.id)
+        channel.typedFilters = null
+      }
     }
   }
 
   fun loadTop(): List<T> {
-    val returningList = feed().take(100)
+    val returningList = feed().take(1000)
 
     // prepare previews
     val scope = CoroutineScope(Job() + Dispatchers.IO)
@@ -140,17 +159,15 @@ abstract class NostrDataSource<T>(val debugName: String) {
     }
   }
 
-  fun requestNewChannel(): Channel {
-    val newChannel = Channel(debugName+UUID.randomUUID().toString().substring(0,4))
-    channels.add(newChannel)
-    channelIds.add(newChannel.id)
-    return newChannel
+  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 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
@@ -176,37 +193,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)
           }
         }
       }

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

@@ -4,14 +4,19 @@ import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
+import com.vitorpamplona.amethyst.service.relays.FeedType
+import com.vitorpamplona.amethyst.service.relays.TypedFilter
 import nostr.postr.JsonFilter
 import nostr.postr.events.TextNoteEvent
 
 object NostrGlobalDataSource: NostrDataSource<Note>("GlobalFeed") {
   lateinit var account: Account
-  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()
@@ -26,6 +31,6 @@ object NostrGlobalDataSource: NostrDataSource<Note>("GlobalFeed") {
     .reversed()
 
   override fun updateChannelFilters() {
-    globalFeedChannel.filter = listOf(createGlobalFilter()).ifEmpty { null }
+    globalFeedChannel.typedFilters = listOf(createGlobalFilter()).ifEmpty { null }
   }
 }

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

@@ -2,13 +2,16 @@ package com.vitorpamplona.amethyst.service
 
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.model.LocalCacheState
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.model.User
 import com.vitorpamplona.amethyst.model.UserState
 import com.vitorpamplona.amethyst.service.model.RepostEvent
-import com.vitorpamplona.amethyst.service.relays.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
@@ -16,82 +19,60 @@ import nostr.postr.toHex
 object NostrHomeDataSource: NostrDataSource<Note>("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().liveFollows.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().liveFollows.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.pubkey.toHex().substring(0, 6)
     }
 
     val followSet = followKeys.plus(account.userProfile().pubkeyHex.substring(0, 6))
 
-    return JsonFilter(
-      kinds = listOf(TextNoteEvent.kind, RepostEvent.kind),
-      authors = followSet,
-      limit = 200
+    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 { (it.event is TextNoteEvent || it.event is RepostEvent) && it.author in user.follows }
       .filter { account.isAcceptable(it) }
       .sortedBy { it.event?.createdAt }
       .reversed()
   }
 
   override fun updateChannelFilters() {
-    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

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

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

@@ -1,31 +1,38 @@
 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.model.ChannelMessageEvent
+import com.vitorpamplona.amethyst.service.relays.FeedType
+import com.vitorpamplona.amethyst.service.relays.TypedFilter
 import nostr.postr.JsonFilter
 import nostr.postr.bechToBytes
+import nostr.postr.events.MetadataEvent
 import nostr.postr.events.TextNoteEvent
 import nostr.postr.toHex
 
 object NostrSearchEventOrUserDataSource: NostrDataSource<Note>("SingleEventFeed") {
   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)
+        )
       )
     )
   }
@@ -37,7 +44,7 @@ object NostrSearchEventOrUserDataSource: NostrDataSource<Note>("SingleEventFeed"
   }
 
   override fun updateChannelFilters() {
-    searchChannel.filter = createAnythingWithIDFilter()
+    searchChannel.typedFilters = createAnythingWithIDFilter()
   }
 
   fun search(eventId: String) {

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

@@ -3,18 +3,15 @@ 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") {
   private var channelsToWatch = setOf<String>()
 
-  private fun createRepliesAndReactionsFilter(): JsonFilter? {
+  private fun createRepliesAndReactionsFilter(): TypedFilter? {
     val reactionsToWatch = channelsToWatch.map { it }
 
     if (reactionsToWatch.isEmpty()) {
@@ -22,13 +19,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,14 +40,16 @@ 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()
+  val singleChannelChannel = requestNewChannel()
 
   override fun feed(): List<Note> {
     return emptyList()
@@ -57,8 +59,7 @@ object NostrSingleChannelDataSource: NostrDataSource<Note>("SingleChannelFeed")
     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

@@ -5,32 +5,46 @@ 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.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") {
   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
-      ),
-      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
+          ),
+          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 }
@@ -50,17 +64,28 @@ 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,
+            ChannelMessageEvent.kind, ChannelCreateEvent.kind, ChannelMetadataEvent.kind
+          ),
+          ids = interestedEvents.toList()
+        )
+      )
     )
   }
 
-  val repliesAndReactionsChannel = requestNewChannel()
-  val loadEventsChannel = requestNewChannel()
+  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 feed(): List<Note> {
     return synchronized(eventsToWatch) {
@@ -74,8 +99,7 @@ object NostrSingleEventDataSource: NostrDataSource<Note>("SingleEventFeed") {
     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,28 +1,50 @@
 package com.vitorpamplona.amethyst.service
 
 import com.vitorpamplona.amethyst.model.LocalCache
-import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.model.User
-import java.util.Collections
+import com.vitorpamplona.amethyst.service.model.ReportEvent
+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>()
 
-  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 { LocalCache.getOrCreateUser(it).latestMetadata == null }.map {
+      TypedFilter(
+        types = FeedType.values().toSet(),
+        filter = JsonFilter(
+          kinds = listOf(MetadataEvent.kind),
+          authors = listOf(it),
+          limit = 1
+        )
       )
     }
   }
 
-  val userChannel = requestNewChannel()
+  fun createUserReportFilter(): List<TypedFilter>? {
+    if (usersToWatch.isEmpty()) return null
+
+    return usersToWatch.map {
+      TypedFilter(
+        types = FeedType.values().toSet(),
+        filter = JsonFilter(
+          kinds = listOf(ReportEvent.kind),
+          tags = mapOf("p" to listOf(it))
+        )
+      )
+    }
+  }
+
+  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()
+  }
 
   override fun feed(): List<User> {
     return synchronized(usersToWatch) {
@@ -33,7 +55,7 @@ object NostrSingleUserDataSource: NostrDataSource<User>("SingleUserFeed") {
   }
 
   override fun updateChannelFilters() {
-    userChannel.filter = createUserFilter()
+    userChannel.typedFilters = listOfNotNull(createUserFilter(), createUserReportFilter()).flatten()
   }
 
   fun add(userId: String) {

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

@@ -4,33 +4,32 @@ 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.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>())
+  private var eventsToWatch = setOf<String>()
 
-  fun createRepliesAndReactionsFilter(): JsonFilter? {
-    val reactionsToWatch = eventsToWatch.map { it }
-
-    if (reactionsToWatch.isEmpty()) {
+  fun createRepliesAndReactionsFilter(): TypedFilter? {
+    if (eventsToWatch.isEmpty()) {
       return null
     }
 
-    return JsonFilter(
-      kinds = listOf(TextNoteEvent.kind, ReactionEvent.kind, RepostEvent.kind),
-      tags = mapOf("e" to reactionsToWatch)
+    return TypedFilter(
+      types = FeedType.values().toSet(),
+      filter = JsonFilter(
+        kinds = listOf(TextNoteEvent.kind, ReactionEvent.kind, RepostEvent.kind),
+        tags = mapOf("e" to eventsToWatch.toList())
+      )
     )
   }
 
-  fun createLoadEventsIfNotLoadedFilter(): JsonFilter? {
-    val nodes = synchronized(eventsToWatch) {
-      eventsToWatch.map { LocalCache.notes[it] }
-    }
+  fun createLoadEventsIfNotLoadedFilter(): TypedFilter? {
+    val nodes = eventsToWatch.map { LocalCache.getOrCreateNote(it) }
 
     val eventsToLoad = nodes
-      .filterNotNull()
       .filter { it.event == null }
       .map { it.idHex.substring(0, 8) }
 
@@ -38,25 +37,27 @@ object NostrThreadDataSource: NostrDataSource<Note>("SingleThreadFeed") {
       return null
     }
 
-    return JsonFilter(
-      ids = eventsToLoad
+    return TypedFilter(
+      types = FeedType.values().toSet(),
+      filter = JsonFilter(
+        ids = eventsToLoad
+      )
     )
   }
 
-  val repliesAndReactionsChannel = requestNewChannel()
   val loadEventsChannel = requestNewChannel()
 
   override fun feed(): List<Note> {
-    return synchronized(eventsToWatch) {
-      eventsToWatch.map {
-        LocalCache.notes[it]
-      }.filterNotNull()
-    }
+    // Currently orders by date of each event, descending, at each level of the reply stack
+    val order = compareByDescending<Note> { it.replyLevelSignature() }
+
+    return eventsToWatch.map {
+      LocalCache.getOrCreateNote(it)
+    }.sortedWith(order)
   }
 
   override fun updateChannelFilters() {
-    repliesAndReactionsChannel.filter = listOfNotNull(createRepliesAndReactionsFilter()).ifEmpty { null }
-    loadEventsChannel.filter = listOfNotNull(createLoadEventsIfNotLoadedFilter()).ifEmpty { null }
+    loadEventsChannel.typedFilters = listOfNotNull(createLoadEventsIfNotLoadedFilter(), createRepliesAndReactionsFilter()).ifEmpty { null }
   }
 
   fun searchRoot(note: Note, testedNotes: MutableSet<Note> = mutableSetOf()): Note? {
@@ -86,9 +87,9 @@ object NostrThreadDataSource: NostrDataSource<Note>("SingleThreadFeed") {
   }
 
   fun loadThread(noteId: String) {
-    val note = LocalCache.notes[noteId]
+    val note = LocalCache.getOrCreateNote(noteId)
 
-    if (note != null) {
+    if (note.event != null) {
       val thread = mutableListOf<Note>()
       val threadSet = mutableSetOf<Note>()
 
@@ -96,17 +97,12 @@ object NostrThreadDataSource: NostrDataSource<Note>("SingleThreadFeed") {
 
       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 })
+      eventsToWatch = thread.map { it.idHex }.toSet()
     } else {
-      eventsToWatch.clear()
-      eventsToWatch.add(noteId)
+      eventsToWatch = setOf(noteId)
     }
 
-    resetFilters()
+    invalidateFilters()
   }
 
   fun loadDown(note: Note, thread: MutableList<Note>, threadSet: MutableSet<Note>) {
@@ -114,9 +110,7 @@ object NostrThreadDataSource: NostrDataSource<Note>("SingleThreadFeed") {
       thread.add(note)
       threadSet.add(note)
 
-      synchronized(note.replies) {
-        note.replies.toList()
-      }.forEach {
+      note.replies.forEach {
         loadDown(it, thread, threadSet)
       }
     }

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

@@ -4,8 +4,11 @@ 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
 
@@ -14,39 +17,77 @@ object NostrUserProfileDataSource: NostrDataSource<Note>("UserProfileFeed") {
   var user: User? = null
 
   fun loadUserProfile(userId: String) {
-    user = LocalCache.getOrCreateUser(userId.toByteArray())
-    resetFilters()
+    user = LocalCache.getOrCreateUser(userId)
   }
 
-  fun createUserInfoFilter(): JsonFilter {
-    return JsonFilter(
-      kinds = listOf(MetadataEvent.kind),
-      authors = listOf(user!!.pubkeyHex),
-      limit = 1
+  fun createUserInfoFilter(): TypedFilter {
+    return TypedFilter(
+      types = FeedType.values().toSet(),
+      filter = JsonFilter(
+        kinds = listOf(MetadataEvent.kind),
+        authors = listOf(user!!.pubkeyHex),
+        limit = 1
+      )
     )
   }
 
-  fun createUserPostsFilter(): JsonFilter {
-    return JsonFilter(
-      kinds = listOf(TextNoteEvent.kind),
-      authors = listOf(user!!.pubkeyHex),
-      limit = 100
+  fun createUserPostsFilter(): TypedFilter {
+    return TypedFilter(
+      types = FeedType.values().toSet(),
+      filter = JsonFilter(
+        kinds = listOf(TextNoteEvent.kind),
+        authors = listOf(user!!.pubkeyHex),
+        limit = 100
+      )
     )
   }
 
+  fun createUserReceivedZapsFilter(): TypedFilter {
+    return TypedFilter(
+      types = FeedType.values().toSet(),
+      filter = JsonFilter(
+        kinds = listOf(LnZapEvent.kind),
+        tags = mapOf("p" to listOf(user!!.pubkeyHex))
+      )
+    )
+  }
+
+  fun createFollowFilter(): TypedFilter {
+    return TypedFilter(
+      types = FeedType.values().toSet(),
+      filter = JsonFilter(
+        kinds = listOf(ContactListEvent.kind),
+        authors = listOf(user!!.pubkeyHex),
+        limit = 1
+      )
+    )
+  }
+
+  fun createFollowersFilter() = TypedFilter(
+    types = FeedType.values().toSet(),
+    filter = JsonFilter(
+      kinds = listOf(ContactListEvent.kind),
+      tags = mapOf("p" to listOf(user!!.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()
+    return user?.notes
+      ?.filter { account.isAcceptable(it) }
+      ?.sortedBy { it.event?.createdAt }
+      ?.reversed()
+      ?: emptyList()
   }
 
   override fun updateChannelFilters() {
-    userInfoChannel.filter = listOf(createUserInfoFilter()).ifEmpty { null }
-    notesChannel.filter = listOf(createUserPostsFilter()).ifEmpty { null }
+    userInfoChannel.typedFilters = listOf(
+      createUserInfoFilter(),
+      createUserPostsFilter(),
+      createFollowFilter(),
+      createFollowersFilter(),
+      createUserReceivedZapsFilter()
+    ).ifEmpty { null }
   }
 }

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

@@ -15,22 +15,9 @@ object NostrUserProfileFollowersDataSource: NostrDataSource<User>("UserProfileFo
     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()
-    }
+    return user?.followers?.filter { account.isAcceptable(it) } ?: emptyList()
   }
 
-  override fun updateChannelFilters() {
-    followerChannel.filter = listOf(createFollowersFilter()).ifEmpty { null }
-  }
+  override fun updateChannelFilters() {}
 }

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

@@ -15,25 +15,9 @@ object NostrUserProfileFollowsDataSource: NostrDataSource<User>("UserProfileFoll
     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()
-    }
+    return user?.follows?.filter { account.isAcceptable(it) } ?: emptyList()
   }
 
-  override fun updateChannelFilters() {
-    followChannel.filter = listOf(createFollowFilter()).ifEmpty { null }
-  }
+  override fun updateChannelFilters() {}
 }

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

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

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

@@ -0,0 +1,84 @@
+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 java.util.ArrayList
+
+class ResultOrError(
+  var result: String?,
+  var sourceLang: String?,
+  var targetLang: String?,
+  var error: Exception?
+)
+
+object LanguageTranslatorService {
+  private val languageIdentification = LanguageIdentification.getClient()
+
+  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>>()
+      for (paragraph in text.split("\n")) {
+        tasks.add(translator.translate(paragraph))
+      }
+
+      Tasks.whenAll(tasks).continueWith {
+        val results: MutableList<String> = ArrayList()
+        for (task in tasks) {
+          results.add(task.result)
+        }
+        ResultOrError(results.joinToString("\n"), source, target, null)
+      }
+    }
+  }
+
+  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/model/ChannelCreateEvent.kt

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

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

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

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

@@ -0,0 +1,50 @@
+package com.vitorpamplona.amethyst.service.model
+
+import com.vitorpamplona.amethyst.lnurl.LnInvoiceUtil
+import com.vitorpamplona.amethyst.service.relays.Client
+import java.math.BigDecimal
+import java.util.Date
+import nostr.postr.Utils
+import nostr.postr.events.Event
+import nostr.postr.toHex
+
+class LnZapEvent (
+  id: ByteArray,
+  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,89 @@
+package com.vitorpamplona.amethyst.service.model
+
+import com.vitorpamplona.amethyst.service.relays.Client
+import java.util.Date
+import nostr.postr.Utils
+import nostr.postr.events.ContactListEvent
+import nostr.postr.events.Event
+import nostr.postr.toHex
+
+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

@@ -0,0 +1,66 @@
+package com.vitorpamplona.amethyst.service.model
+
+import androidx.compose.ui.text.toUpperCase
+import java.util.Date
+import nostr.postr.Utils
+import nostr.postr.events.Event
+import nostr.postr.toHex
+
+// NIP 56 event.
+class ReportEvent (
+  id: ByteArray,
+  pubKey: ByteArray,
+  createdAt: Long,
+  tags: List<List<String>>,
+  content: String,
+  sig: ByteArray
+): Event(id, pubKey, createdAt, kind, tags, content, sig) {
+
+  @Transient val reportType: List<ReportType>
+  @Transient val reportedPost: List<String>
+  @Transient val reportedAuthor: List<String>
+
+  init {
+    reportType = tags.filter { it.firstOrNull() == "report" }.mapNotNull { it.getOrNull(1) }.map { ReportType.valueOf(it.toUpperCase()) }
+    reportedPost = tags.filter { it.firstOrNull() == "e" }.mapNotNull { it.getOrNull(1) }
+    reportedAuthor = tags.filter { it.firstOrNull() == "p" }.mapNotNull { it.getOrNull(1) }
+  }
+
+  companion object {
+    const val kind = 1984
+
+    fun create(reportedPost: Event, type: ReportType, privateKey: ByteArray, createdAt: Long = Date().time / 1000): ReportEvent {
+      val content = ""
+
+      val reportTypeTag = listOf("report", type.name.toLowerCase())
+      val reportPostTag = listOf("e", reportedPost.id.toHex())
+      val reportAuthorTag = listOf("p", reportedPost.pubKey.toHex())
+
+      val pubKey = Utils.pubkeyCreate(privateKey)
+      val tags:List<List<String>> = listOf(reportTypeTag, reportPostTag, reportAuthorTag)
+      val id = generateId(pubKey, createdAt, kind, tags, content)
+      val sig = Utils.sign(id, privateKey)
+      return ReportEvent(id, pubKey, createdAt, tags, content, sig)
+    }
+
+    fun create(reportedUser: String, type: ReportType, privateKey: ByteArray, createdAt: Long = Date().time / 1000): ReportEvent {
+      val content = ""
+
+      val reportTypeTag = listOf("report", type.name.toLowerCase())
+      val reportAuthorTag = listOf("p", reportedUser)
+
+      val pubKey = Utils.pubkeyCreate(privateKey)
+      val tags:List<List<String>> = listOf(reportTypeTag, reportAuthorTag)
+      val id = generateId(pubKey, createdAt, kind, tags, content)
+      val sig = Utils.sign(id, privateKey)
+      return ReportEvent(id, pubKey, createdAt, tags, content, sig)
+    }
+  }
+
+  enum class ReportType() {
+    EXPLICIT,
+    ILLEGAL,
+    SPAM,
+    IMPERSONATION
+  }
+}

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

@@ -1,5 +1,6 @@
 package com.vitorpamplona.amethyst.service.model
 
+import com.vitorpamplona.amethyst.service.relays.Client
 import java.util.Date
 import nostr.postr.Utils
 import nostr.postr.events.Event
@@ -16,17 +17,24 @@ class RepostEvent (
 
   @Transient val boostedPost: List<String>
   @Transient val originalAuthor: List<String>
+  @Transient val containedPost: Event?
 
   init {
     boostedPost = tags.filter { it.firstOrNull() == "e" }.mapNotNull { it.getOrNull(1) }
     originalAuthor = tags.filter { it.firstOrNull() == "p" }.mapNotNull { it.getOrNull(1) }
+
+    containedPost = try {
+      fromJson(content, Client.lenient)
+    } catch (e: Exception) {
+      null
+    }
   }
 
   companion object {
     const val kind = 6
 
     fun create(boostedPost: Event, privateKey: ByteArray, createdAt: Long = Date().time / 1000): RepostEvent {
-      val content = ""
+      val content = boostedPost.toJson()
 
       val replyToPost = listOf("e", boostedPost.id.toHex())
       val replyToAuthor = listOf("p", boostedPost.pubKey.toHex())

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

@@ -1,10 +1,8 @@
 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.GlobalScope
+import kotlinx.coroutines.launch
 import nostr.postr.events.Event
 
 /**
@@ -24,10 +22,10 @@ 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) {
+    fun connect(relays: Array<Relay>) {
         RelayPool.register(this)
         RelayPool.unloadRelays()
         RelayPool.loadRelays(relays.toList())
@@ -36,17 +34,17 @@ object Client: RelayPool.Listener {
 
     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,7 +52,7 @@ object Client: RelayPool.Listener {
         RelayPool.send(signedEvent)
     }
 
-    fun close(subscriptionId: String){
+    fun close(subscriptionId: String) {
         RelayPool.close(subscriptionId)
     }
 
@@ -65,19 +63,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 {
+            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 {
+            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 {
+            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 {
+            listeners.forEach { it.onSendResponse(eventId, success, message, relay) }
+        }
     }
 
     fun subscribe(listener: Listener) {
@@ -89,12 +103,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 +124,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 java.util.concurrent.TimeUnit
 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 eventUploadCounter = 0
     var errorCounter = 0
+    var ping: Long? = null
 
     var closingTime = 0L
 
@@ -40,82 +49,108 @@ class Relay(
         return socket != null
     }
 
+    @Synchronized
     fun requestAndWatch() {
-        val request = Request.Builder().url(url.trim()).build()
-        val listener = object : WebSocketListener() {
+        if (socket != null) return
 
-            override fun onOpen(webSocket: WebSocket, response: Response) {
-                // Sends everything.
-                Client.allSubscriptions().forEach {
-                    sendFilter(requestId = it)
+        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, null) }
                 }
-                listeners.forEach { it.onRelayStateChange(this@Relay, Type.CONNECT) }
-            }
 
-            override fun onMessage(webSocket: WebSocket, text: String) {
-                try {
-                    val msg = Event.gson.fromJson(text, JsonElement::class.java).asJsonArray
-                    val type = msg[0].asString
-                    val channel = msg[1].asString
-                    when (type) {
-                        "EVENT" -> {
-                            eventDownloadCounter++
-                            val event = Event.fromJson(msg[2], Client.lenient)
-                            listeners.forEach { it.onEvent(this@Relay, channel, event) }
+                override fun onMessage(webSocket: WebSocket, text: String) {
+                    try {
+                        val msg = Event.gson.fromJson(text, JsonElement::class.java).asJsonArray
+                        val type = msg[0].asString
+                        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 {
+                                //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,
+                                    Error("Unknown type $type on channel $channel. Msg was $text")
+                                )
+                            }
                         }
-                        "EOSE" -> listeners.forEach {
-                            it.onRelayStateChange(this@Relay, Type.EOSE)
-                        }
-                        "NOTICE" -> listeners.forEach {
-                            // "channel" being the second string in the string array ...
-                            it.onError(this@Relay, channel, Error("Relay sent notice: $channel"))
-                        }
-                        "OK" -> listeners.forEach {
-                            it.onSendResponse(this@Relay, msg[1].asString, msg[2].asBoolean, msg[3].asString)
-                        }
-                        else -> listeners.forEach {
-                            it.onError(
-                                this@Relay,
-                                channel,
-                                Error("Unknown type $type on channel $channel. Msg was $text")
-                            )
+                    } catch (t: Throwable) {
+                        t.printStackTrace()
+                        text.chunked(2000) { chunked ->
+                            listeners.forEach { it.onError(this@Relay, "", Error("Problem with $chunked")) }
                         }
                     }
-                } catch (t: Throwable) {
+                }
+
+                override fun onClosing(webSocket: WebSocket, code: Int, reason: String) {
+                    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, null) }
+                }
+
+                override fun onFailure(webSocket: WebSocket, t: Throwable, response: Response?) {
+                    errorCounter++
+
+                    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} ${response}")
                     t.printStackTrace()
-                    text.chunked(2000) { chunked ->
-                        listeners.forEach { it.onError(this@Relay, "", Error("Problem with $chunked")) }
+                    listeners.forEach {
+                        it.onError(this@Relay, "", Error("WebSocket Failure. Response: ${response}. Exception: ${t.message}", t))
                     }
                 }
             }
 
-            override fun onClosing(webSocket: WebSocket, code: Int, reason: String) {
-                listeners.forEach { it.onRelayStateChange(this@Relay, Type.DISCONNECTING) }
-            }
-
-            override fun onClosed(webSocket: WebSocket, code: Int, reason: String) {
-                socket = null
-                closingTime = Date().time / 1000
-                listeners.forEach { it.onRelayStateChange(this@Relay, Type.DISCONNECT) }
-            }
-
-            override fun onFailure(webSocket: WebSocket, t: Throwable, response: Response?) {
-                errorCounter++
-
-                socket?.close(1000, "Normal close")
-                // Failures disconnect the relay. 
-                socket = null
-                closingTime = Date().time / 1000
-
-                Log.w("Relay", "Relay onFailure ${url}, ${response?.message}")
-                //t.printStackTrace()
-                listeners.forEach {
-                    it.onError(this@Relay, "", Error("WebSocket Failure. Response: ${response}. Exception: ${t.message}", t))
-                }
-            }
+            socket = httpClient.newWebSocket(request, listener)
+        } catch (e: Exception) {
+            errorCounter++
+            isReady = false
+            closingTime = Date().time / 1000
+            Log.e("Relay", "Relay Invalid $url")
+            e.printStackTrace()
         }
-
-        socket = httpClient.newWebSocket(request, listener)
     }
 
     fun disconnect() {
@@ -123,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()
                 }
             }
         }
@@ -146,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()
+            }
         }
     }
 
@@ -186,6 +229,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,56 @@
+package com.vitorpamplona.amethyst.service.relays
+
+import com.google.gson.Gson
+import com.google.gson.GsonBuilder
+import com.google.gson.JsonArray
+import com.google.gson.JsonObject
+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

@@ -15,6 +15,7 @@ import coil.ImageLoader
 import coil.decode.GifDecoder
 import coil.decode.ImageDecoderDecoder
 import coil.decode.SvgDecoder
+import coil.disk.DiskCache
 import coil.memory.MemoryCache
 import coil.request.CachePolicy
 import com.vitorpamplona.amethyst.EncryptedStorage

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 okhttp3.*
+import okio.BufferedSource
+import okio.IOException
+import okio.sink
+import java.io.File
+
+
+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,75 @@
 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.*
 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
+import java.io.IOException
+import java.util.*
 
 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/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,12 +35,7 @@ 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
@@ -75,135 +56,152 @@ fun NewPostView(onClose: () -> Unit, baseReplyTo: Note? = null, account: Account
     val focusRequester = remember { FocusRequester() }
     val keyboardController = LocalSoftwareKeyboardController.current
 
+    val scroolState = rememberScrollState()
+
     LaunchedEffect(Unit) {
         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, "✖ ") {
+                                    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)
                         }
                     }
                 }

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

@@ -1,23 +1,19 @@
 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 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 androidx.lifecycle.viewModelScope
+import com.vitorpamplona.amethyst.model.*
 import com.vitorpamplona.amethyst.ui.components.isValidURL
 import com.vitorpamplona.amethyst.ui.components.noProtocolUrlValidator
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.launch
 import nostr.postr.toNpub
 
 class NewPostViewModel: ViewModel() {
@@ -25,10 +21,12 @@ class NewPostViewModel: ViewModel() {
     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
@@ -36,7 +34,7 @@ class NewPostViewModel: ViewModel() {
     fun load(account: Account, replyingTo: 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)) {
@@ -78,7 +76,7 @@ class NewPostViewModel: ViewModel() {
                         val restOfWord = word.substring(64)
 
                         val key = decodePublicKey(keyB32.removePrefix("@"))
-                        val user = LocalCache.getOrCreateUser(key)
+                        val user = LocalCache.getOrCreateUser(key.toHexKey())
 
                         val index = addUserToMentionsIfNotInAndReturnIndex(user)
 
@@ -103,26 +101,33 @@ class NewPostViewModel: ViewModel() {
 
         message = TextFieldValue("")
         urlPreview = null
+        isUploadingImage = false
     }
 
     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
     }
 
     fun findUrlInMessage(): String? {

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,12 @@ 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.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 +36,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) {
+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 +77,18 @@ fun NewRelayListView(onClose: () -> Unit, account: Account) {
                 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 +97,7 @@ fun NewRelayListView(onClose: () -> Unit, account: Account) {
 
                 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 +108,15 @@ fun NewRelayListView(onClose: () -> Unit, account: Account) {
                             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) }
                             )
                         }
                     }
@@ -131,7 +125,7 @@ fun NewRelayListView(onClose: () -> Unit, account: Account) {
 
                 Spacer(modifier = Modifier.height(10.dp))
 
-                EditableServerConfig() {
+                EditableServerConfig(relayToAdd) {
                     postViewModel.addRelay(it)
                 }
             }
@@ -156,7 +150,7 @@ fun ServerConfigHeader() {
 
             Column(Modifier.weight(1f)) {
                 Row(verticalAlignment = Alignment.CenterVertically) {
-                    Spacer(modifier = Modifier.size(20.dp))
+                    Spacer(modifier = Modifier.size(25.dp))
 
                     Text(
                         text = "Posts",
@@ -186,7 +180,7 @@ fun ServerConfigHeader() {
                         color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f),
                     )
 
-                    Spacer(modifier = Modifier.size(20.dp))
+                    Spacer(modifier = Modifier.size(5.dp))
                 }
             }
         }
@@ -199,12 +193,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 +231,126 @@ 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(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 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),
+                            )
+                        }
                     }
                 }
             }
@@ -295,8 +363,8 @@ fun ServerConfig(
 }
 
 @Composable
-fun EditableServerConfig(onNewRelay: (NewRelayListViewModel.Relay) -> Unit) {
-    var url by remember { mutableStateOf<String>("") }
+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 +391,7 @@ fun EditableServerConfig(onNewRelay: (NewRelayListViewModel.Relay) -> Unit) {
                 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 +402,16 @@ fun EditableServerConfig(onNewRelay: (NewRelayListViewModel.Relay) -> Unit) {
                 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 +420,7 @@ fun EditableServerConfig(onNewRelay: (NewRelayListViewModel.Relay) -> Unit) {
             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.LocalPreferences
 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)
+            LocalPreferences(ctx).saveToEncryptedStorage(account)
         }
 
-        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
 
-                    Relay(it.key, it.value.read, it.value.write, errorCounter, eventDownloadCounter, eventUploadCounter)
+                    RelaySetupInfo(it.key, it.value.read, it.value.write, errorCounter, eventDownloadCounter, eventUploadCounter, 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
 
-                    Relay(it.url, it.read, it.write, errorCounter, eventDownloadCounter, eventUploadCounter)
+                    RelaySetupInfo(it.url, it.read, it.write, errorCounter, eventDownloadCounter, eventUploadCounter, 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

@@ -205,6 +205,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
@@ -34,6 +35,7 @@ class NewUserMetadataViewModel: ViewModel() {
             website.value = it.info.website ?: ""
             nip05.value = it.info.nip05 ?: ""
             lnAddress.value = it.info.lud16 ?: ""
+            lnURL.value = it.info.lud06 ?: ""
         }
     }
 
@@ -57,6 +59,7 @@ class NewUserMetadataViewModel: ViewModel() {
         currentJson.put("about", about.value)
         currentJson.put("nip05", nip05.value)
         currentJson.put("lud16", lnAddress.value)
+        currentJson.put("lud06", lnURL.value)
 
         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/components/AsyncImageProxy.kt

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

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

@@ -0,0 +1,64 @@
+package com.vitorpamplona.amethyst.ui.components
+
+import androidx.compose.foundation.text.ClickableText
+import androidx.compose.material.LocalTextStyle
+import androidx.compose.material.MaterialTheme
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.livedata.observeAsState
+import androidx.compose.ui.text.AnnotatedString
+import androidx.navigation.NavController
+import com.vitorpamplona.amethyst.model.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(
+  nip19: Nip19.Return,
+  navController: NavController
+) {
+  if (nip19.type == Nip19.Type.USER) {
+    val userBase = LocalCache.getOrCreateUser(nip19.hex)
+
+    val userState by userBase.liveMetadata.observeAsState()
+    val user = userState?.user ?: return
+
+    val route = "User/${nip19.hex}"
+    val text = user.toBestDisplayName()
+
+    ClickableText(
+      text = AnnotatedString("@${text} "),
+      onClick = { navController.navigate(route) },
+      style = LocalTextStyle.current.copy(color = MaterialTheme.colors.primary)
+    )
+  } else {
+    val noteBase = LocalCache.getOrCreateNote(nip19.hex)
+    val noteState by noteBase.live.observeAsState()
+    val note = noteState?.note ?: return
+
+    if (note.event is ChannelCreateEvent) {
+      ClickableText(
+        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?.toBestDisplayName()} "),
+        onClick = { navController.navigate("Channel/${note.channel?.idHex}") },
+        style = LocalTextStyle.current.copy(color = MaterialTheme.colors.primary)
+      )
+    } else {
+      ClickableText(
+        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.liveMetadata.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,70 @@
+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.unit.dp
+import androidx.navigation.NavController
+
+@Composable
+fun ExpandableRichTextViewer(
+  content: String,
+  canPreview: Boolean,
+  tags: List<List<String>>?,
+  navController: NavController
+) {
+  var showFullText by remember { mutableStateOf(false) }
+
+  val text = if (showFullText) content else content.take(350)
+
+  Box(contentAlignment = Alignment.BottomCenter) {
+    RichTextViewer(text, canPreview, tags, navController)
+
+    if (content.length > 350 && !showFullText) {
+      Row(
+        verticalAlignment = Alignment.CenterVertically,
+        horizontalArrangement = Arrangement.Center,
+        modifier = Modifier
+          .fillMaxWidth()
+          .background(
+            brush = Brush.verticalGradient(
+              colors = listOf(
+                MaterialTheme.colors.background.copy(alpha = 0f),
+                MaterialTheme.colors.background
+              )
+            )
+          )
+      ) {
+        Button(
+          modifier = Modifier.padding(top = 10.dp),
+          onClick = { showFullText = !showFullText },
+          shape = RoundedCornerShape(20.dp),
+          colors = ButtonDefaults.buttonColors(
+            backgroundColor = MaterialTheme.colors.primary
+          ),
+          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

@@ -9,13 +9,20 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material.Button
 import androidx.compose.material.ButtonDefaults
 import androidx.compose.material.Divider
 import androidx.compose.material.Icon
+import androidx.compose.material.LocalTextStyle
 import androidx.compose.material.MaterialTheme
+import androidx.compose.material.OutlinedTextField
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
@@ -23,11 +30,15 @@ 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.text.style.TextDirection
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.core.content.ContextCompat.startActivity
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.lnurl.LnInvoiceUtil
+import java.text.NumberFormat
 
 @Composable
 fun InvoicePreview(lnInvoice: String) {
@@ -78,20 +89,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.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,23 +1,21 @@
 package com.vitorpamplona.amethyst.ui.components
 
 import android.util.Patterns
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.padding
-import androidx.compose.material.LocalTextStyle
-import androidx.compose.material.Text
-import androidx.compose.runtime.Composable
+import androidx.compose.animation.animateContentSize
+import androidx.compose.foundation.layout.*
+import androidx.compose.material.*
+import androidx.compose.runtime.*
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.style.TextDirection
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
 import androidx.navigation.NavController
 import com.google.accompanist.flowlayout.FlowRow
 import com.vitorpamplona.amethyst.lnurl.LnInvoiceUtil
 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.screen.loggedIn.AccountViewModel
+import nostr.postr.toNpub
 import java.net.MalformedURLException
 import java.net.URISyntaxException
 import java.net.URL
@@ -44,47 +42,114 @@ 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,
+  tags: List<List<String>>?,
+  navController: NavController
+) {
+  Column(
+    Modifier
+      .animateContentSize()) {
     // FlowRow doesn't work well with paragraphs. So we need to split them
     content.split('\n').forEach { paragraph ->
 
       FlowRow() {
         paragraph.split(' ').forEach { word: String ->
-          // 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, 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 {
-            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, 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)
+    || word.startsWith("note1", true)
+    || word.startsWith("nprofile1", true)
+    || word.startsWith("nevent1", true)
+    || word.startsWith("@npub1", true)
+    || word.startsWith("@note1", true)
+    || word.startsWith("@nprofile1", true)
+    || word.startsWith("@nevent1", true)
+}
+
+@Composable
+fun BechLink(word: String, navController: NavController) {
+  val uri = if (word.startsWith("nostr", true)) {
+    word
+  } else if (word.startsWith("@")) {
+    word.replaceFirst("@", "nostr:")
+  } else {
+    "nostr:${word}"
+  }
+
+  val nip19Route = try {
+    Nip19().uriToRoute(uri)
+  } catch (e: Exception) {
+    null
+  }
+
+  if (nip19Route == null) {
+    Text(text = "$word ")
+  } else {
+    ClickableRoute(nip19Route, navController)
+  }
+}
+
+
 @Composable
 fun TagLink(word: String, tags: List<List<String>>, navController: NavController) {
   val matcher = tagIndex.matcher(word)
@@ -107,17 +172,18 @@ fun TagLink(word: String, tags: List<List<String>>, navController: NavController
       if (user != null) {
         ClickableUserTag(user, navController)
       } else {
-        Text(text = "${tags[index][1].toShortenHex()} ")
+        Text(text = "${tags[index][1].toByteArray().toNpub().toShortenHex()} ")
       }
     } else if (tags[index][0] == "e") {
       val note = LocalCache.notes[tags[index][1]]
       if (note != null) {
         ClickableNoteTag(note, navController)
       } else {
-        Text(text = "${tags[index][1].toShortenHex()} ")
+        Text(text = "${tags[index][1].toByteArray().toNote().toShortenHex()} ")
       }
     } else
       Text(text = "$word ")
   }
 }
 
+

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

@@ -0,0 +1,151 @@
+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.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+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.LocalTextStyle
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.livedata.observeAsState
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+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
+
+@Composable
+fun TranslateableRichTextViewer(
+  content: String,
+  canPreview: Boolean,
+  tags: List<List<String>>?,
+  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) {
+    LanguageTranslatorService.autoTranslate(content, account.dontTranslateFrom, account.translateTo)
+      .addOnCompleteListener { task ->
+        if (task.isSuccessful) {
+          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,
+      tags,
+      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
+            }) {
+              Text("Never translate from ${Locale(source).displayName}")
+            }
+            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
+                }) {
+                  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
@@ -32,7 +33,7 @@ fun UrlPreview(url: String, urlText: String, showUrlIfError: Boolean = true) {
     })
   }
 
-  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,36 @@ 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.google.android.exoplayer2.upstream.DefaultHttpDataSource
+import com.google.android.exoplayer2.upstream.cache.CacheDataSource
+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,35 +2,26 @@ package com.vitorpamplona.amethyst.ui.components
 
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.border
-import androidx.compose.foundation.clickable
 import androidx.compose.foundation.combinedClickable
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Surface
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
+import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalClipboardManager
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.Dialog
 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 +66,8 @@ fun ZoomableImageView(word: String) {
             CloseButton(onCancel = {
               dialogOpen = false
             })
+
+            SaveToGallery(url = word)
           }
 
           ZoomableAsyncImage(word)

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

@@ -1,7 +1,9 @@
 package com.vitorpamplona.amethyst.ui.navigation
 
 import android.util.Log
+import androidx.compose.foundation.border
 import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
@@ -32,10 +34,13 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.painter.BitmapPainter
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.font.FontStyle
 import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.viewmodel.compose.viewModel
 import androidx.navigation.NavHostController
@@ -43,6 +48,8 @@ import coil.Coil
 import coil.compose.AsyncImage
 import coil.compose.rememberAsyncImagePainter
 import com.vitorpamplona.amethyst.R
+import com.vitorpamplona.amethyst.RoboHashCache
+import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.service.NostrAccountDataSource
 import com.vitorpamplona.amethyst.service.NostrChannelDataSource
 import com.vitorpamplona.amethyst.service.NostrChatRoomDataSource
@@ -50,18 +57,24 @@ import com.vitorpamplona.amethyst.service.NostrChatroomListDataSource
 import com.vitorpamplona.amethyst.service.NostrGlobalDataSource
 import com.vitorpamplona.amethyst.service.NostrHomeDataSource
 import com.vitorpamplona.amethyst.service.NostrNotificationDataSource
+import com.vitorpamplona.amethyst.service.NostrSearchEventOrUserDataSource
+import com.vitorpamplona.amethyst.service.NostrSingleChannelDataSource
 import com.vitorpamplona.amethyst.service.NostrSingleEventDataSource
 import com.vitorpamplona.amethyst.service.NostrSingleUserDataSource
 import com.vitorpamplona.amethyst.service.NostrThreadDataSource
 import com.vitorpamplona.amethyst.service.NostrUserProfileDataSource
 import com.vitorpamplona.amethyst.service.NostrUserProfileFollowersDataSource
 import com.vitorpamplona.amethyst.service.NostrUserProfileFollowsDataSource
+import com.vitorpamplona.amethyst.service.NostrUserProfileZapsDataSource
 import com.vitorpamplona.amethyst.service.relays.Client
 import com.vitorpamplona.amethyst.service.relays.RelayPool
+import com.vitorpamplona.amethyst.ui.components.AsyncImageProxy
+import com.vitorpamplona.amethyst.ui.components.ResizeImage
 import com.vitorpamplona.amethyst.ui.actions.NewRelayListView
 import com.vitorpamplona.amethyst.ui.actions.NewUserMetadataView
 import com.vitorpamplona.amethyst.ui.screen.RelayPoolViewModel
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
+import java.net.URLEncoder
 import kotlinx.coroutines.launch
 
 @Composable
@@ -72,13 +85,14 @@ fun AppTopBar(navController: NavHostController, scaffoldState: ScaffoldState, ac
     }
 }
 
+
 @Composable
 fun MainTopBar(scaffoldState: ScaffoldState, accountViewModel: AccountViewModel) {
     val accountState by accountViewModel.accountLiveData.observeAsState()
     val account = accountState?.account ?: return
 
-    val accountUserState by account.userProfile().live.observeAsState()
-    val accountUser = accountUserState?.user
+    val accountUserState by account.userProfile().liveMetadata.observeAsState()
+    val accountUser = accountUserState?.user ?: return
 
     val relayViewModel: RelayPoolViewModel = viewModel { RelayPoolViewModel() }
     val connectedRelaysLiveData by relayViewModel.connectedRelaysLiveData.observeAsState()
@@ -87,6 +101,7 @@ fun MainTopBar(scaffoldState: ScaffoldState, accountViewModel: AccountViewModel)
     val coroutineScope = rememberCoroutineScope()
 
     val context = LocalContext.current
+    val ctx = LocalContext.current.applicationContext
 
     var wantsToEditRelays by remember {
         mutableStateOf(false)
@@ -104,19 +119,21 @@ fun MainTopBar(scaffoldState: ScaffoldState, accountViewModel: AccountViewModel)
                     modifier = Modifier.fillMaxWidth(),
                     horizontalAlignment = Alignment.CenterHorizontally
                 ) {
-                    Box() {
+                    Box(Modifier) {
                         Column(
                             modifier = Modifier
                                 .fillMaxWidth()
+                                .fillMaxHeight()
                                 .padding(start = 0.dp, end = 20.dp),
-                            horizontalAlignment = Alignment.CenterHorizontally
+                            horizontalAlignment = Alignment.CenterHorizontally,
+                            verticalArrangement = Arrangement.Center
                         ) {
                             IconButton(
                                 onClick = {
                                     Client.allSubscriptions().map {
                                         "${it} ${
                                             Client.getSubscriptionFilters(it)
-                                                .joinToString { it.toJson() }
+                                                .joinToString { it.filter.toJson() }
                                         }"
                                     }.forEach {
                                         Log.d("CURRENT FILTERS", it)
@@ -132,18 +149,24 @@ fun MainTopBar(scaffoldState: ScaffoldState, accountViewModel: AccountViewModel)
                                     NostrNotificationDataSource.printCounter()
 
                                     NostrSingleEventDataSource.printCounter()
+                                    NostrSearchEventOrUserDataSource.printCounter()
+                                    NostrSingleChannelDataSource.printCounter()
                                     NostrSingleUserDataSource.printCounter()
                                     NostrThreadDataSource.printCounter()
 
                                     NostrUserProfileDataSource.printCounter()
                                     NostrUserProfileFollowersDataSource.printCounter()
                                     NostrUserProfileFollowsDataSource.printCounter()
+                                    NostrUserProfileZapsDataSource.printCounter()
 
-                                    println("AAA: " + RelayPool.connectedRelays())
+                                    println("Connected Relays: " + RelayPool.connectedRelays())
 
                                     val imageLoader = Coil.imageLoader(context)
-                                    println("${imageLoader.diskCache?.size}/${imageLoader.diskCache?.maxSize}")
-                                    println("${imageLoader.memoryCache?.size}/${imageLoader.memoryCache?.maxSize}")
+                                    println("Image Disk Cache ${(imageLoader.diskCache?.size ?: 0)/(1024*1024)}/${(imageLoader.diskCache?.maxSize ?: 0)/(1024*1024)} MB")
+                                    println("Image Memory Cache ${(imageLoader.memoryCache?.size ?: 0)/(1024*1024)}/${(imageLoader.memoryCache?.maxSize ?: 0)/(1024*1024)} MB")
+
+                                    println("Notes: " + LocalCache.notes.size)
+                                    println("Users: " + LocalCache.users.size)
                                 }
                             ) {
                                 Icon(
@@ -190,9 +213,11 @@ fun MainTopBar(scaffoldState: ScaffoldState, accountViewModel: AccountViewModel)
                     },
                     modifier = Modifier
                 ) {
-                    AsyncImage(
-                        model = accountUser?.profilePicture() ?: "https://robohash.org/ohno.png",
-                        placeholder = rememberAsyncImagePainter("https://robohash.org/${accountUser?.pubkeyHex}.png"),
+                    AsyncImageProxy(
+                        model = ResizeImage(accountUser.profilePicture(), 34.dp),
+                        placeholder = BitmapPainter(RoboHashCache.get(ctx, accountUser.pubkeyHex)),
+                        fallback = BitmapPainter(RoboHashCache.get(ctx, accountUser.pubkeyHex)),
+                        error = BitmapPainter(RoboHashCache.get(ctx, accountUser.pubkeyHex)),
                         contentDescription = "Profile Image",
                         modifier = Modifier
                             .width(34.dp)
@@ -203,7 +228,7 @@ fun MainTopBar(scaffoldState: ScaffoldState, accountViewModel: AccountViewModel)
             },
             actions = {
                 IconButton(
-                    onClick = {}, modifier = Modifier
+                    onClick = { wantsToEditRelays = true }, modifier = Modifier
                 ) {
                     Icon(
                         painter = painterResource(R.drawable.ic_trends),

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

@@ -1,5 +1,6 @@
 package com.vitorpamplona.amethyst.ui.navigation
 
+import androidx.compose.foundation.Canvas
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
@@ -7,6 +8,9 @@ import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.aspectRatio
+import androidx.compose.foundation.layout.defaultMinSize
+import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
@@ -16,6 +20,7 @@ import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material.Divider
 import androidx.compose.material.Icon
+import androidx.compose.material.IconButton
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.ScaffoldState
 import androidx.compose.material.Surface
@@ -23,7 +28,10 @@ import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.livedata.observeAsState
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
@@ -34,15 +42,40 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.font.FontWeight.Companion.W500
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import androidx.compose.ui.window.Dialog
+import androidx.compose.ui.window.DialogProperties
 import androidx.navigation.NavController
 import androidx.navigation.NavHostController
 import coil.compose.AsyncImage
 import coil.compose.rememberAsyncImagePainter
+import com.google.zxing.EncodeHintType
+import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel
+import com.google.zxing.qrcode.encoder.Encoder
+import com.google.zxing.qrcode.encoder.QRCode
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.model.User
+import com.vitorpamplona.amethyst.ui.actions.CloseButton
+import com.vitorpamplona.amethyst.ui.components.ZoomableAsyncImage
 import com.vitorpamplona.amethyst.ui.screen.AccountStateViewModel
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import kotlinx.coroutines.launch
+import nostr.postr.toNpub
+
+import androidx.compose.ui.geometry.CornerRadius
+import androidx.compose.ui.geometry.Offset
+import androidx.compose.ui.geometry.Rect
+import androidx.compose.ui.geometry.RoundRect
+import androidx.compose.ui.geometry.Size
+import androidx.compose.ui.graphics.drawscope.DrawScope
+import com.google.zxing.qrcode.encoder.ByteMatrix
+
+import androidx.compose.ui.graphics.Path
+import androidx.compose.ui.graphics.PathFillType
+import androidx.compose.ui.graphics.painter.BitmapPainter
+import androidx.compose.ui.platform.LocalContext
+import com.vitorpamplona.amethyst.RoboHashCache
+import com.vitorpamplona.amethyst.ui.components.AsyncImageProxy
+import com.vitorpamplona.amethyst.ui.components.ResizeImage
 
 @Composable
 fun DrawerContent(navController: NavHostController,
@@ -53,52 +86,26 @@ fun DrawerContent(navController: NavHostController,
     val accountState by accountViewModel.accountLiveData.observeAsState()
     val account = accountState?.account ?: return
 
-    val accountUserState by account.userProfile().live.observeAsState()
-    val accountUser = accountUserState?.user
-
     Surface(
         modifier = Modifier.fillMaxWidth(),
         color = MaterialTheme.colors.background
     ) {
         Column() {
-            Box {
-                val banner = accountUser?.info?.banner
-                if (banner != null && banner.isNotBlank()) {
-                    AsyncImage(
-                        model = banner,
-                        contentDescription = "Profile Image",
-                        contentScale = ContentScale.FillWidth,
-                        modifier = Modifier
-                            .fillMaxWidth()
-                            .height(150.dp)
-                    )
-                } else {
-                    Image(
-                        painter = painterResource(R.drawable.profile_banner),
-                        contentDescription = "Profile Banner",
-                        contentScale = ContentScale.FillWidth,
-                        modifier = Modifier
-                            .fillMaxWidth()
-                            .height(150.dp)
-                    )
-                }
-
-                ProfileContent(
-                    accountUser,
-                    modifier = Modifier
-                        .fillMaxWidth()
-                        .padding(horizontal = 25.dp)
-                        .padding(top = 100.dp),
-                    scaffoldState,
-                    navController
-                )
-            }
+            ProfileContent(
+                account.userProfile(),
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .padding(horizontal = 25.dp)
+                    .padding(top = 100.dp),
+                scaffoldState,
+                navController
+            )
             Divider(
                 thickness = 0.25.dp,
                 modifier = Modifier.padding(top = 20.dp)
             )
             ListContent(
-                accountUser,
+                account.userProfile(),
                 navController,
                 scaffoldState,
                 modifier = Modifier
@@ -106,49 +113,84 @@ fun DrawerContent(navController: NavHostController,
                     .weight(1F),
                 accountStateViewModel
             )
+
+            BottomContent(account.userProfile(), scaffoldState, navController)
         }
     }
 }
 
 @Composable
-fun ProfileContent(accountUser: User?, modifier: Modifier = Modifier, scaffoldState: ScaffoldState, navController: NavController) {
+fun ProfileContent(baseAccountUser: User, modifier: Modifier = Modifier, scaffoldState: ScaffoldState, navController: NavController) {
     val coroutineScope = rememberCoroutineScope()
 
-    Column(modifier = modifier) {
-        AsyncImage(
-            model = accountUser?.profilePicture() ?: "https://robohash.org/ohno.png",
-            contentDescription = "Profile Image",
-            placeholder = rememberAsyncImagePainter("https://robohash.org/${accountUser?.pubkeyHex}.png"),
-            modifier = Modifier
-                .width(100.dp)
-                .height(100.dp)
-                .clip(shape = CircleShape)
-                .border(3.dp, MaterialTheme.colors.background, CircleShape)
-                .background(MaterialTheme.colors.background)
-                .clickable(onClick = {
-                    accountUser?.let {
-                        navController.navigate("User/${it.pubkeyHex}")
-                    }
-                    coroutineScope.launch {
-                        scaffoldState.drawerState.close()
-                    }
-                })
-        )
-        Text(
-            accountUser?.bestDisplayName() ?: "",
-            modifier = Modifier.padding(top = 7.dp),
-            fontWeight = FontWeight.Bold,
-            fontSize = 18.sp
-        )
-        Text(" @${accountUser?.bestUsername()}", color = Color.LightGray)
-        Row(modifier = Modifier.padding(top = 15.dp)) {
-            Row() {
-                Text("${accountUser?.follows?.size ?: "--"}", fontWeight = FontWeight.Bold)
-                Text(" Following")
-            }
-            Row(modifier = Modifier.padding(start = 10.dp)) {
-                Text("${accountUser?.followers?.size ?: "--"}", fontWeight = FontWeight.Bold)
-                Text(" Followers")
+    val accountUserState by baseAccountUser.liveMetadata.observeAsState()
+    val accountUser = accountUserState?.user ?: return
+
+    val accountUserFollowsState by baseAccountUser.liveFollows.observeAsState()
+    val accountUserFollows = accountUserFollowsState?.user ?: return
+
+    val ctx = LocalContext.current.applicationContext
+
+    Box {
+        val banner = accountUser.info.banner
+        if (banner != null && banner.isNotBlank()) {
+            AsyncImageProxy(
+                model = ResizeImage(banner, 150.dp),
+                contentDescription = "Profile Image",
+                contentScale = ContentScale.FillWidth,
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .height(150.dp)
+            )
+        } else {
+            Image(
+                painter = painterResource(R.drawable.profile_banner),
+                contentDescription = "Profile Banner",
+                contentScale = ContentScale.FillWidth,
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .height(150.dp)
+            )
+        }
+
+        Column(modifier = modifier) {
+            AsyncImageProxy(
+                model = ResizeImage(accountUser.profilePicture(), 100.dp),
+                contentDescription = "Profile Image",
+                placeholder = BitmapPainter(RoboHashCache.get(ctx, accountUser.pubkeyHex)),
+                fallback = BitmapPainter(RoboHashCache.get(ctx, accountUser.pubkeyHex)),
+                error = BitmapPainter(RoboHashCache.get(ctx, accountUser.pubkeyHex)),
+                modifier = Modifier
+                    .width(100.dp)
+                    .height(100.dp)
+                    .clip(shape = CircleShape)
+                    .border(3.dp, MaterialTheme.colors.background, CircleShape)
+                    .background(MaterialTheme.colors.background)
+                    .clickable(onClick = {
+                        accountUser.let {
+                            navController.navigate("User/${it.pubkeyHex}")
+                        }
+                        coroutineScope.launch {
+                            scaffoldState.drawerState.close()
+                        }
+                    })
+            )
+            Text(
+                accountUser.bestDisplayName() ?: "",
+                modifier = Modifier.padding(top = 7.dp),
+                fontWeight = FontWeight.Bold,
+                fontSize = 18.sp
+            )
+            Text(" @${accountUser.bestUsername()}", color = Color.LightGray)
+            Row(modifier = Modifier.padding(top = 15.dp)) {
+                Row() {
+                    Text("${accountUserFollows.follows?.size ?: "--"}", fontWeight = FontWeight.Bold)
+                    Text(" Following")
+                }
+                Row(modifier = Modifier.padding(start = 10.dp)) {
+                    Text("${accountUserFollows.followers?.size ?: "--"}", fontWeight = FontWeight.Bold)
+                    Text(" Followers")
+                }
             }
         }
     }
@@ -239,5 +281,73 @@ fun NavigationRow(navController: NavHostController, scaffoldState: ScaffoldState
             )
         }
     }
+}
+
+@Composable
+fun BottomContent(user: User, scaffoldState: ScaffoldState, navController: NavController) {
+    val coroutineScope = rememberCoroutineScope()
+
+    // store the dialog open or close state
+    var dialogOpen by remember {
+        mutableStateOf(false)
+    }
+
+    Column(modifier = Modifier) {
+        Divider(
+            modifier = Modifier.padding(top = 15.dp),
+            thickness = 0.25.dp
+        )
+        Row(
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(horizontal = 15.dp),
+        ) {
+            /*
+            IconButton(
+                onClick = {
+                    when (AppCompatDelegate.getDefaultNightMode()) {
+                        AppCompatDelegate.MODE_NIGHT_NO -> AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES)
+                        AppCompatDelegate.MODE_NIGHT_YES -> AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO)
+                        else -> AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES)
+                    }
+                }
+            ) {
+                Icon(
+                    painter = painterResource(R.drawable.ic_theme),
+                    null,
+                    modifier = Modifier.size(24.dp),
+                    tint = MaterialTheme.colors.primary
+                )
+            }*/
+            Box(modifier = Modifier.weight(1F))
+            IconButton(onClick = {
+                dialogOpen = true
+                coroutineScope.launch {
+                    scaffoldState.drawerState.close()
+                }
+            }) {
+                Icon(
+                    painter = painterResource(R.drawable.ic_qrcode),
+                    null,
+                    modifier = Modifier.size(24.dp),
+                    tint = MaterialTheme.colors.primary
+                )
+            }
+        }
+    }
+
+    if (dialogOpen) {
+        ShowQRDialog(user,
+            onScan = {
+                dialogOpen = false
+                coroutineScope.launch {
+                    scaffoldState.drawerState.close()
+                }
+                navController.navigate(it)
+            },
+            onClose = { dialogOpen = false }
+        )
+    }
+}
+
 
-}

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

@@ -115,7 +115,7 @@ private fun homeHasNewItems(cache: NotificationCache): Boolean {
     val homeFeed = NostrHomeDataSource.feed().take(100)
 
     val hasNewInFollows = homeFeed.filter {
-        it.event is RepostEvent || it.replyTo == null || it.replyTo?.size == 0
+        it.isNewThread()
     }.filter {
         (it.event?.createdAt ?: 0) > lastTimeFollows
     }.isNotEmpty()
@@ -138,7 +138,7 @@ private fun messagesHasNewItems(cache: NotificationCache): Boolean {
     return NostrChatroomListDataSource.feed().take(100).filter {
         // only for known sources
         val me = NostrChatroomListDataSource.account.userProfile()
-        it.channel != null || me.hasSentMessagesTo(it.author)
+        it.channel == null && me.hasSentMessagesTo(it.author) && it.author != me
     }.filter {
         val lastTime = if (it.channel != null) {
             cache.load("Channel/${it.channel!!.idHex}", context)

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

@@ -1,15 +1,24 @@
 package com.vitorpamplona.amethyst.ui.note
 
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
 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.Divider
+import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
+import androidx.navigation.NavController
+import com.google.accompanist.flowlayout.FlowRow
+import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.model.User
 
 @Composable
 fun BlankNote(modifier: Modifier = Modifier, isQuote: Boolean = false) {
@@ -43,7 +52,7 @@ fun BlankNote(modifier: Modifier = Modifier, isQuote: Boolean = false) {
 
 
 @Composable
-fun HiddenNote(modifier: Modifier = Modifier, isQuote: Boolean = false) {
+fun HiddenNote(reports: Set<Note>, loggedIn: User, modifier: Modifier = Modifier, isQuote: Boolean = false, navController: NavController, onClick: () -> Unit) {
   Column(modifier = modifier) {
     Row(modifier = Modifier.padding(horizontal = if (!isQuote) 12.dp else 6.dp)) {
       Column(modifier = Modifier.padding(start = if (!isQuote) 10.dp else 5.dp)) {
@@ -56,11 +65,35 @@ fun HiddenNote(modifier: Modifier = Modifier, isQuote: Boolean = false) {
           ),
           verticalAlignment = Alignment.CenterVertically
         ) {
-          Text(
-            text = "Post was flagged as inappropriate",
-            modifier = Modifier.padding(30.dp),
-            color = Color.Gray,
-          )
+          Column(horizontalAlignment = Alignment.CenterHorizontally, modifier = Modifier.padding(30.dp)) {
+            Text(
+              text = "Post was flagged as inappropriate by",
+              color = Color.Gray,
+            )
+            FlowRow(modifier = Modifier.padding(top = 10.dp)) {
+              reports.forEach {
+                NoteAuthorPicture(
+                  note = it,
+                  navController = navController,
+                  userAccount = loggedIn,
+                  size = 35.dp
+                )
+              }
+            }
+
+            Button(
+              modifier = Modifier.padding(top = 10.dp),
+              onClick = onClick,
+              shape = RoundedCornerShape(20.dp),
+              colors = ButtonDefaults
+                .buttonColors(
+                  backgroundColor = MaterialTheme.colors.primary
+                ),
+              contentPadding = PaddingValues(vertical = 6.dp, horizontal = 16.dp)
+            ) {
+              Text(text = "Show Anyway", color = Color.White)
+            }
+          }
         }
 
         Divider(

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

@@ -76,19 +76,12 @@ fun BoostSetCompose(likeSetCard: BoostSetCard, isInnerNote: Boolean = false, rou
                 Column(modifier = Modifier.padding(start = if (!isInnerNote) 10.dp else 0.dp)) {
                     FlowRow() {
                         likeSetCard.boostEvents.forEach {
-                            val cardNoteState by it.live.observeAsState()
-                            val cardNote = cardNoteState?.note
-
-                            if (cardNote?.author != null) {
-                                val userState by cardNote.author!!.live.observeAsState()
-
-                                UserPicture(
-                                    user = userState?.user,
-                                    navController = navController,
-                                    userAccount = account.userProfile(),
-                                    size = 35.dp
-                                )
-                            }
+                            NoteAuthorPicture(
+                                note = it,
+                                navController = navController,
+                                userAccount = account.userProfile(),
+                                size = 35.dp
+                            )
                         }
                     }
 

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

@@ -26,6 +26,7 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.painter.BitmapPainter
 import androidx.compose.ui.graphics.painter.Painter
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.text.TextStyle
@@ -40,9 +41,12 @@ import coil.compose.AsyncImage
 import coil.compose.rememberAsyncImagePainter
 import com.vitorpamplona.amethyst.LocalPreferences
 import com.vitorpamplona.amethyst.NotificationCache
+import com.vitorpamplona.amethyst.RoboHashCache
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.service.model.ChannelCreateEvent
 import com.vitorpamplona.amethyst.service.model.ChannelMetadataEvent
+import com.vitorpamplona.amethyst.ui.components.AsyncImageProxy
+import com.vitorpamplona.amethyst.ui.components.ResizeImage
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 
 @Composable
@@ -53,9 +57,6 @@ fun ChatroomCompose(baseNote: Note, accountViewModel: AccountViewModel, navContr
     val accountState by accountViewModel.accountLiveData.observeAsState()
     val account = accountState?.account ?: return
 
-    val accountUserState by account.userProfile().live.observeAsState()
-    val accountUser = accountUserState?.user ?: return
-
     val notificationCacheState = NotificationCache.live.observeAsState()
     val notificationCache = notificationCacheState.value ?: return
 
@@ -64,7 +65,7 @@ fun ChatroomCompose(baseNote: Note, accountViewModel: AccountViewModel, navContr
     if (note?.event == null) {
         BlankNote(Modifier)
     } else if (note.channel != null) {
-        val authorState by note.author!!.live.observeAsState()
+        val authorState by note.author!!.liveMetadata.observeAsState()
         val author = authorState?.user
 
         val channelState by note.channel!!.live.observeAsState()
@@ -88,7 +89,7 @@ fun ChatroomCompose(baseNote: Note, accountViewModel: AccountViewModel, navContr
 
             ChannelName(
                 channelPicture = channel.profilePicture(),
-                channelPicturePlaceholder = null,
+                channelPicturePlaceholder = BitmapPainter(RoboHashCache.get(context, channel.idHex)),
                 channelTitle = {
                     Text(
                         "${channel.info.name}",
@@ -108,25 +109,19 @@ fun ChatroomCompose(baseNote: Note, accountViewModel: AccountViewModel, navContr
         }
 
     } else {
-        val authorState by note.author!!.live.observeAsState()
-        val author = authorState?.user
-
         val replyAuthorBase = note.mentions?.first()
 
-        var userToComposeOn = author
+        var userToComposeOn = note.author!!
 
-        if ( replyAuthorBase != null ) {
-            val replyAuthorState by replyAuthorBase.live.observeAsState()
-            val replyAuthor = replyAuthorState?.user
-
-            if (author == accountUser) {
-                userToComposeOn = replyAuthor
+        if (replyAuthorBase != null) {
+            if (note.author == account.userProfile()) {
+                userToComposeOn = replyAuthorBase
             }
         }
 
         val noteEvent = note.event
 
-        userToComposeOn?.let { user ->
+        userToComposeOn.let { user ->
             val hasNewMessages =
                 if (noteEvent != null)
                     noteEvent.createdAt > notificationCache.cache.load("Room/${userToComposeOn.pubkeyHex}", context)
@@ -134,8 +129,8 @@ fun ChatroomCompose(baseNote: Note, accountViewModel: AccountViewModel, navContr
                     false
 
             ChannelName(
-                channelPicture = { UserPicture(user = user, userAccount = accountUser, size = 55.dp) },
-                channelTitle = { UsernameDisplay(user, it) },
+                channelPicture = { UserPicture(userToComposeOn, account.userProfile(), size = 55.dp) },
+                channelTitle = { UsernameDisplay(userToComposeOn, it) },
                 channelLastTime = noteEvent?.createdAt,
                 channelLastContent = accountViewModel.decrypt(note),
                 hasNewMessages = hasNewMessages,
@@ -147,7 +142,7 @@ fun ChatroomCompose(baseNote: Note, accountViewModel: AccountViewModel, navContr
 
 @Composable
 fun ChannelName(
-    channelPicture: String,
+    channelPicture: String?,
     channelPicturePlaceholder: Painter?,
     channelTitle: @Composable (Modifier) -> Unit,
     channelLastTime: Long?,
@@ -157,10 +152,12 @@ fun ChannelName(
 ) {
     ChannelName(
         channelPicture = {
-            AsyncImage(
-                model = channelPicture,
+            AsyncImageProxy(
+                model = ResizeImage(channelPicture, 55.dp),
                 placeholder = channelPicturePlaceholder,
-                contentDescription = "Profile Image",
+                fallback = channelPicturePlaceholder,
+                error = channelPicturePlaceholder,
+                contentDescription = "Channel Image",
                 modifier = Modifier
                     .width(55.dp)
                     .height(55.dp)

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

@@ -1,24 +1,34 @@
 package com.vitorpamplona.amethyst.ui.note
 
 import androidx.compose.foundation.ExperimentalFoundationApi
+import androidx.compose.foundation.background
 import androidx.compose.foundation.border
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.combinedClickable
 import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.layout.widthIn
 import androidx.compose.foundation.layout.wrapContentWidth
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.Icon
+import androidx.compose.material.IconButton
+import androidx.compose.material.LocalTextStyle
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Surface
 import androidx.compose.material.Text
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.ChevronRight
+import androidx.compose.material.icons.filled.ExpandMore
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.livedata.observeAsState
@@ -29,22 +39,32 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.ColorFilter
+import androidx.compose.ui.graphics.ColorMatrix
 import androidx.compose.ui.graphics.Shape
+import androidx.compose.ui.graphics.painter.BitmapPainter
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalUriHandler
 import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextDirection
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.navigation.NavController
 import coil.compose.AsyncImage
 import coil.compose.rememberAsyncImagePainter
+import com.google.accompanist.flowlayout.FlowRow
 import com.vitorpamplona.amethyst.NotificationCache
+import com.vitorpamplona.amethyst.RoboHashCache
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.service.model.ChannelCreateEvent
 import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
 import com.vitorpamplona.amethyst.service.model.ChannelMetadataEvent
 import com.vitorpamplona.amethyst.service.model.ReactionEvent
 import com.vitorpamplona.amethyst.service.model.RepostEvent
+import com.vitorpamplona.amethyst.ui.components.AsyncImageProxy
+import com.vitorpamplona.amethyst.ui.components.ResizeImage
 import com.vitorpamplona.amethyst.ui.components.RichTextViewer
+import com.vitorpamplona.amethyst.ui.components.TranslateableRichTextViewer
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 
 val ChatBubbleShapeMe = RoundedCornerShape(15.dp, 15.dp, 3.dp, 15.dp)
@@ -59,24 +79,33 @@ fun ChatroomMessageCompose(baseNote: Note, routeForLastRead: String?, innerQuote
     val accountState by accountViewModel.accountLiveData.observeAsState()
     val account = accountState?.account ?: return
 
-    val accountUserState by account.userProfile().live.observeAsState()
-    val accountUser = accountUserState?.user
+    val noteReportsState by baseNote.liveReports.observeAsState()
+    val noteForReports = noteReportsState?.note ?: return
+
+    val accountUser = account.userProfile()
 
     var popupExpanded by remember { mutableStateOf(false) }
+    var showHiddenNote by remember { mutableStateOf(false) }
 
     val context = LocalContext.current.applicationContext
 
     if (note?.event == null) {
         BlankNote(Modifier)
+    } else if (!account.isAcceptable(noteForReports) && !showHiddenNote) {
+        HiddenNote(
+            account.getRelevantReports(noteForReports),
+            account.userProfile(),
+            Modifier,
+            innerQuote,
+            navController,
+            onClick = { showHiddenNote = true }
+        )
     } else {
-        val authorState by note.author!!.live.observeAsState()
-        val author = authorState?.user
-
         var backgroundBubbleColor: Color
         var alignment: Arrangement.Horizontal
         var shape: Shape
 
-        if (author == accountUser) {
+        if (note.author == accountUser) {
             backgroundBubbleColor = MaterialTheme.colors.primary.copy(alpha = 0.32f)
             alignment = Arrangement.End
             shape = ChatBubbleShapeMe
@@ -125,15 +154,20 @@ fun ChatroomMessageCompose(baseNote: Note, routeForLastRead: String?, innerQuote
                             modifier = Modifier.padding(start = 10.dp, end = 10.dp, bottom = 5.dp),
                         ) {
 
+                            val authorState by note.author!!.liveMetadata.observeAsState()
+                            val author = authorState?.user!!
+
                             if (innerQuote || author != accountUser && note.event is ChannelMessageEvent) {
                                 Row(
                                     verticalAlignment = Alignment.CenterVertically,
                                     horizontalArrangement = alignment,
                                     modifier = Modifier.padding(top = 5.dp)
                                 ) {
-                                    AsyncImage(
-                                        model = author?.profilePicture(),
-                                        placeholder = rememberAsyncImagePainter("https://robohash.org/${author?.pubkeyHex}.png"),
+                                    AsyncImageProxy(
+                                        model = ResizeImage(author.profilePicture(), 25.dp),
+                                        placeholder = BitmapPainter(RoboHashCache.get(context, author.pubkeyHex)),
+                                        fallback = BitmapPainter(RoboHashCache.get(context, author.pubkeyHex)),
+                                        error = BitmapPainter(RoboHashCache.get(context, author.pubkeyHex)),
                                         contentDescription = "Profile Image",
                                         modifier = Modifier
                                             .width(25.dp)
@@ -189,19 +223,27 @@ fun ChatroomMessageCompose(baseNote: Note, routeForLastRead: String?, innerQuote
                                 } else {
                                     val eventContent = accountViewModel.decrypt(note)
 
-                                    if (eventContent != null)
-                                        RichTextViewer(
-                                            eventContent,
-                                            note.event?.tags,
-                                            navController
-                                        )
-                                    else
-                                        RichTextViewer(
-                                            "Could Not decrypt the message",
-                                            note.event?.tags,
-                                            navController
-                                        )
+                                    val canPreview = note.author == accountUser
+                                          || (note.author?.let { accountUser.isFollowing(it) } ?: true )
+                                          || !noteForReports.hasAnyReports()
 
+                                    if (eventContent != null) {
+                                        TranslateableRichTextViewer(
+                                            eventContent,
+                                            canPreview,
+                                            note.event?.tags,
+                                            accountViewModel,
+                                            navController
+                                        )
+                                    } else {
+                                        TranslateableRichTextViewer(
+                                            "Could Not decrypt the message",
+                                            true,
+                                            note.event?.tags,
+                                            accountViewModel,
+                                            navController
+                                        )
+                                    }
                                 }
                             }
 
@@ -215,6 +257,8 @@ fun ChatroomMessageCompose(baseNote: Note, routeForLastRead: String?, innerQuote
                                     color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f),
                                     fontSize = 12.sp
                                 )
+
+                                RelayBadges(note)
                             }
                         }
                     }
@@ -227,3 +271,52 @@ fun ChatroomMessageCompose(baseNote: Note, routeForLastRead: String?, innerQuote
     }
 }
 
+
+
+@Composable
+private fun RelayBadges(baseNote: Note) {
+    val noteRelaysState by baseNote.liveRelays.observeAsState()
+    val noteRelays = noteRelaysState?.note?.relays ?: emptySet()
+
+    var expanded by remember { mutableStateOf(false) }
+
+    val relaysToDisplay = if (expanded) noteRelays else noteRelays.take(3)
+
+    val uri = LocalUriHandler.current
+    val ctx = LocalContext.current.applicationContext
+
+    FlowRow(Modifier.padding(start = 10.dp)) {
+        relaysToDisplay.forEach {
+            val url = it.removePrefix("wss://")
+            Box(Modifier.size(15.dp).padding(1.dp)) {
+                AsyncImage(
+                    model = "https://${url}/favicon.ico",
+                    placeholder = BitmapPainter(RoboHashCache.get(ctx, url)),
+                    fallback = BitmapPainter(RoboHashCache.get(ctx, url)),
+                    error = BitmapPainter(RoboHashCache.get(ctx, url)),
+                    contentDescription = "Relay Icon",
+                    colorFilter = ColorFilter.colorMatrix(ColorMatrix().apply { setToSaturation(0f) }),
+                    modifier = Modifier
+                        .fillMaxSize(1f)
+                        .clip(shape = CircleShape)
+                        .background(MaterialTheme.colors.background)
+                        .clickable(onClick = { uri.openUri("https://" + url) } )
+                )
+            }
+        }
+
+        if (noteRelays.size > 3 && !expanded) {
+            IconButton(
+                modifier = Modifier.then(Modifier.size(15.dp)),
+                onClick = { expanded = true }
+            ) {
+                Icon(
+                    imageVector = Icons.Default.ChevronRight,
+                    null,
+                    modifier = Modifier.size(15.dp),
+                    tint = MaterialTheme.colors.onSurface.copy(alpha = 0.32f),
+                )
+            }
+        }
+    }
+}

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

@@ -76,19 +76,12 @@ fun LikeSetCompose(likeSetCard: LikeSetCard, modifier: Modifier = Modifier, isIn
                 Column(modifier = Modifier.padding(start = if (!isInnerNote) 10.dp else 0.dp)) {
                     FlowRow() {
                         likeSetCard.likeEvents.forEach {
-                            val cardNoteState by it.live.observeAsState()
-                            val cardNote = cardNoteState?.note
-
-                            if (cardNote?.author != null) {
-                                val userState by cardNote.author!!.live.observeAsState()
-
-                                UserPicture(
-                                    user = userState?.user,
-                                    navController = navController,
-                                    userAccount = account.userProfile(),
-                                    size = 35.dp
-                                )
-                            }
+                            NoteAuthorPicture(
+                                note = it,
+                                navController = navController,
+                                userAccount = account.userProfile(),
+                                size = 35.dp
+                            )
                         }
                     }
 

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

@@ -1,15 +1,18 @@
 package com.vitorpamplona.amethyst.ui.note
 
 import androidx.compose.foundation.ExperimentalFoundationApi
+import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.combinedClickable
+import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
@@ -19,9 +22,14 @@ import androidx.compose.material.Divider
 import androidx.compose.material.DropdownMenu
 import androidx.compose.material.DropdownMenuItem
 import androidx.compose.material.Icon
+import androidx.compose.material.IconButton
 import androidx.compose.material.LocalContentColor
+import androidx.compose.material.LocalTextStyle
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Text
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.ExpandMore
+import androidx.compose.material.icons.filled.MoreVert
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.livedata.observeAsState
@@ -32,27 +40,39 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.ColorFilter
+import androidx.compose.ui.graphics.ColorMatrix
 import androidx.compose.ui.graphics.Shape
+import androidx.compose.ui.graphics.painter.BitmapPainter
 import androidx.compose.ui.platform.LocalClipboardManager
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalUriHandler
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextDirection
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import androidx.navigation.NavController
 import coil.compose.AsyncImage
 import coil.compose.rememberAsyncImagePainter
+import com.google.accompanist.flowlayout.FlowRow
 import com.vitorpamplona.amethyst.NotificationCache
 import com.vitorpamplona.amethyst.R
+import com.vitorpamplona.amethyst.RoboHashCache
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.model.User
 import com.vitorpamplona.amethyst.model.toNote
 import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
+import com.vitorpamplona.amethyst.service.model.LnZapEvent
 import com.vitorpamplona.amethyst.service.model.ReactionEvent
+import com.vitorpamplona.amethyst.service.model.ReportEvent
 import com.vitorpamplona.amethyst.service.model.RepostEvent
+import com.vitorpamplona.amethyst.ui.components.AsyncImageProxy
+import com.vitorpamplona.amethyst.ui.components.ResizeImage
 import com.vitorpamplona.amethyst.ui.components.RichTextViewer
+import com.vitorpamplona.amethyst.ui.components.TranslateableRichTextViewer
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.theme.Following
 import nostr.postr.events.TextNoteEvent
@@ -74,24 +94,32 @@ fun NoteCompose(
     val noteState by baseNote.live.observeAsState()
     val note = noteState?.note
 
+    val noteReportsState by baseNote.liveReports.observeAsState()
+    val noteForReports = noteReportsState?.note ?: return
+
     var popupExpanded by remember { mutableStateOf(false) }
+    var showHiddenNote by remember { mutableStateOf(false) }
 
     val context = LocalContext.current.applicationContext
 
+    var moreActionsExpanded by remember { mutableStateOf(false) }
+
+
     if (note?.event == null) {
         BlankNote(modifier.combinedClickable(
             onClick = {  },
             onLongClick = { popupExpanded = true },
         ), isInnerNote)
-    } else if (account?.isAcceptable(note) == false) {
-        HiddenNote(modifier.combinedClickable(
-            onClick = {  },
-            onLongClick = { popupExpanded = true },
-        ), isInnerNote)
+    } else if (!account.isAcceptable(noteForReports) && !showHiddenNote) {
+        HiddenNote(
+            account.getRelevantReports(noteForReports),
+            account.userProfile(),
+            modifier,
+            isInnerNote,
+            navController,
+            onClick = { showHiddenNote = true }
+        )
     } else {
-        val authorState by note.author?.live!!.observeAsState()
-        val author = authorState?.user ?: return // if it has event, it should have an author
-
         val isNew = routeForLastRead?.run {
             val lastTime = NotificationCache.load(this, context)
 
@@ -134,65 +162,76 @@ fun NoteCompose(
                         top = 10.dp)
             ) {
 
-                // Draws the boosted picture outside the boosted card.
                 if (!isInnerNote) {
-                    Box(modifier = Modifier
-                        .width(55.dp)
-                        .padding(0.dp)) {
-                        UserPicture(author, navController, account.userProfile(), 55.dp)
+                    Column(Modifier.width(55.dp)) {
+                    // Draws the boosted picture outside the boosted card.
+                        Box(modifier = Modifier
+                            .width(55.dp)
+                            .padding(0.dp)) {
 
-                        // boosted picture
-                        val boostedPosts = note.replyTo
-                        if (note.event is RepostEvent && boostedPosts != null && boostedPosts.isNotEmpty()) {
-                            val boostedAuthor = boostedPosts[0].author
-                            Box(
-                                Modifier
-                                    .width(30.dp)
-                                    .height(30.dp)
-                                    .align(Alignment.BottomEnd)) {
-                                UserPicture(boostedAuthor, navController, account.userProfile(), 35.dp,
-                                    pictureModifier = Modifier.border(2.dp, MaterialTheme.colors.background, CircleShape)
-                                )
+                            NoteAuthorPicture(note, navController, account.userProfile(), 55.dp)
+
+                            if (note.event is RepostEvent) {
+                                note.replyTo?.lastOrNull()?.let {
+                                    Box(
+                                        Modifier
+                                            .width(30.dp)
+                                            .height(30.dp)
+                                            .align(Alignment.BottomEnd)) {
+                                        NoteAuthorPicture(it, navController, account.userProfile(), 35.dp,
+                                            pictureModifier = Modifier.border(2.dp, MaterialTheme.colors.background, CircleShape)
+                                        )
+                                    }
+                                }
+                            }
+
+                            // boosted picture
+                            val baseChannel = note.channel
+                            if (note.event is ChannelMessageEvent && baseChannel != null) {
+                                val channelState by baseChannel.live.observeAsState()
+                                val channel = channelState?.channel
+
+                                if (channel != null) {
+                                    Box(
+                                        Modifier
+                                            .width(30.dp)
+                                            .height(30.dp)
+                                            .align(Alignment.BottomEnd)) {
+                                        AsyncImageProxy(
+                                            model = ResizeImage(channel.profilePicture(), 30.dp),
+                                            placeholder = BitmapPainter(RoboHashCache.get(context, channel.idHex)),
+                                            fallback = BitmapPainter(RoboHashCache.get(context, channel.idHex)),
+                                            error = BitmapPainter(RoboHashCache.get(context, channel.idHex)),
+                                            contentDescription = "Group Picture",
+                                            modifier = Modifier
+                                                .width(30.dp)
+                                                .height(30.dp)
+                                                .clip(shape = CircleShape)
+                                                .background(MaterialTheme.colors.background)
+                                                .border(
+                                                    2.dp,
+                                                    MaterialTheme.colors.background,
+                                                    CircleShape
+                                                )
+                                        )
+                                    }
+                                }
                             }
                         }
 
-                        // boosted picture
-                        val baseChannel = note.channel
-                        if (note.event is ChannelMessageEvent && baseChannel != null) {
-                            val channelState by baseChannel.live.observeAsState()
-                            val channel = channelState?.channel
-
-                            if (channel != null) {
-                                Box(
-                                    Modifier
-                                        .width(30.dp)
-                                        .height(30.dp)
-                                        .align(Alignment.BottomEnd)) {
-                                    AsyncImage(
-                                        model = channel.profilePicture(),
-                                        placeholder = null,
-                                        contentDescription = "Group Picture",
-                                        modifier = Modifier
-                                            .width(30.dp)
-                                            .height(30.dp)
-                                            .clip(shape = CircleShape)
-                                            .background(MaterialTheme.colors.background)
-                                            .border(
-                                                2.dp,
-                                                MaterialTheme.colors.background,
-                                                CircleShape
-                                            )
-                                    )
-                                }
+                        if (note.event is RepostEvent) {
+                            note.replyTo?.lastOrNull()?.let {
+                                RelayBadges(it)
                             }
+                        } else {
+                            RelayBadges(baseNote)
                         }
                     }
                 }
 
                 Column(modifier = Modifier.padding(start = if (!isInnerNote) 10.dp else 0.dp)) {
                     Row(verticalAlignment = Alignment.CenterVertically) {
-                        if (author != null)
-                            UsernameDisplay(author, Modifier.weight(1f))
+                        NoteUsernameDisplay(note, Modifier.weight(1f))
 
                         if (note.event !is RepostEvent) {
                             Text(
@@ -200,6 +239,20 @@ fun NoteCompose(
                                 color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f),
                                 maxLines = 1
                             )
+
+                            IconButton(
+                                modifier = Modifier.then(Modifier.size(24.dp)),
+                                onClick = { moreActionsExpanded = true }
+                            ) {
+                                Icon(
+                                    imageVector = Icons.Default.MoreVert,
+                                    null,
+                                    modifier = Modifier.size(15.dp),
+                                    tint = MaterialTheme.colors.onSurface.copy(alpha = 0.32f),
+                                )
+
+                                NoteDropDownMenu(baseNote, moreActionsExpanded, { moreActionsExpanded = false }, accountViewModel)
+                            }
                         } else {
                             Text(
                                 "  boosted",
@@ -218,9 +271,9 @@ fun NoteCompose(
                     }
 
                     if (note.event is ReactionEvent || note.event is RepostEvent) {
-                        note.replyTo?.mapIndexed { index, note ->
+                        note.replyTo?.lastOrNull()?.let {
                             NoteCompose(
-                                note,
+                                it,
                                 modifier = Modifier,
                                 isInnerNote = true,
                                 accountViewModel = accountViewModel,
@@ -239,12 +292,21 @@ fun NoteCompose(
                         }
                     } else {
                         val eventContent = note.event?.content
-                        if (eventContent != null)
-                            RichTextViewer(eventContent, note.event?.tags, navController)
+                        val canPreview = note.author == account.userProfile()
+                          || (note.author?.let { account.userProfile().isFollowing(it) } ?: true )
+                          || !noteForReports.hasAnyReports()
+
+                        if (eventContent != null) {
+                            TranslateableRichTextViewer(
+                                eventContent,
+                                canPreview,
+                                note.event?.tags,
+                                accountViewModel,
+                                navController
+                            )
+                        }
 
-                        //if (note.event !is ChannelMessageEvent) {
                         ReactionsRow(note, accountViewModel)
-                        //}
 
                         Divider(
                             modifier = Modifier.padding(top = 10.dp),
@@ -260,94 +322,191 @@ fun NoteCompose(
 }
 
 @Composable
-fun UserPicture(
-    user: User?,
+private fun RelayBadges(baseNote: Note) {
+    val noteRelaysState by baseNote.liveRelays.observeAsState()
+    val noteRelays = noteRelaysState?.note?.relays ?: emptySet()
+
+    var expanded by remember { mutableStateOf(false) }
+
+    val relaysToDisplay = if (expanded) noteRelays else noteRelays.take(3)
+
+    val uri = LocalUriHandler.current
+    val ctx = LocalContext.current.applicationContext
+
+    FlowRow(Modifier.padding(top = 10.dp, start = 5.dp, end = 4.dp)) {
+        relaysToDisplay.forEach {
+            val url = it.removePrefix("wss://").removePrefix("ws://")
+            Box(
+                Modifier
+                    .size(15.dp)
+                    .padding(1.dp)) {
+                AsyncImage(
+                    model = "https://${url}/favicon.ico",
+                    placeholder = BitmapPainter(RoboHashCache.get(ctx, url)),
+                    fallback = BitmapPainter(RoboHashCache.get(ctx, url)),
+                    error = BitmapPainter(RoboHashCache.get(ctx, url)),
+                    contentDescription = "Relay Icon",
+                    colorFilter = ColorFilter.colorMatrix(ColorMatrix().apply { setToSaturation(0f) }),
+                    modifier = Modifier
+                        .fillMaxSize(1f)
+                        .clip(shape = CircleShape)
+                        .background(MaterialTheme.colors.background)
+                        .clickable(onClick = { uri.openUri("https://" + url) })
+                )
+            }
+        }
+    }
+
+    if (noteRelays.size > 3 && !expanded) {
+        Row(
+            Modifier
+                .fillMaxWidth()
+                .height(25.dp), horizontalArrangement = Arrangement.Center, verticalAlignment = Alignment.Top) {
+            IconButton(
+                modifier = Modifier.then(Modifier.size(24.dp)),
+                onClick = { expanded = true }
+            ) {
+                Icon(
+                    imageVector = Icons.Default.ExpandMore,
+                    null,
+                    modifier = Modifier.size(15.dp),
+                    tint = MaterialTheme.colors.onSurface.copy(alpha = 0.32f),
+                )
+            }
+        }
+    }
+}
+
+
+@Composable
+fun NoteAuthorPicture(
+    note: Note,
     navController: NavController,
     userAccount: User,
     size: Dp,
     pictureModifier: Modifier = Modifier
 ) {
-    UserPicture(user, userAccount, size, pictureModifier) {
-        user?.let {
-            navController.navigate("User/${it.pubkeyHex}")
-        }
+    NoteAuthorPicture(note, userAccount, size, pictureModifier) {
+        navController.navigate("User/${it.pubkeyHex}")
     }
 }
 
+
 @Composable
-fun UserPicture(
-    user: User?,
-    userAccount: User,
+fun NoteAuthorPicture(
+    baseNote: Note,
+    baseUserAccount: User,
     size: Dp,
     pictureModifier: Modifier = Modifier,
-    onClick: (() -> Unit)? = null
+    onClick: ((User) -> Unit)? = null
 ) {
-    val accountState by userAccount.live.observeAsState()
-    val accountUser = accountState?.user ?: return
+    val noteState by baseNote.live.observeAsState()
+    val note = noteState?.note ?: return
+
+    val author = note.author
+
+    val ctx = LocalContext.current.applicationContext
 
     Box(
         Modifier
             .width(size)
             .height(size)) {
-        if (user == null) {
-            AsyncImage(
-                model = "https://robohash.org/ohno.png",
-                contentDescription = "Profile Image",
-                placeholder = rememberAsyncImagePainter("https://robohash.org/ohno.png"),
+        if (author == null) {
+            Image(
+                painter = BitmapPainter(RoboHashCache.get(ctx, "ohnothisauthorisnotfound")),
+                contentDescription = "Unknown Author",
                 modifier = pictureModifier
                     .fillMaxSize(1f)
                     .clip(shape = CircleShape)
                     .background(MaterialTheme.colors.background)
             )
         } else {
-            val userState by user.live.observeAsState()
-            val userLive = userState?.user ?: return
+            UserPicture(author, baseUserAccount, size, pictureModifier, onClick)
+        }
+    }
+}
 
-            AsyncImage(
-                model = userLive.profilePicture(),
-                contentDescription = "Profile Image",
-                placeholder = rememberAsyncImagePainter("https://robohash.org/${userLive.pubkeyHex}.png"),
-                modifier = pictureModifier
-                    .fillMaxSize(1f)
-                    .clip(shape = CircleShape)
-                    .background(MaterialTheme.colors.background)
-                    .run {
-                        if (onClick != null)
-                            this.clickable(onClick = onClick)
-                        else
-                            this
-                    }
+@Composable
+fun UserPicture(
+    user: User,
+    navController: NavController,
+    userAccount: User,
+    size: Dp,
+    pictureModifier: Modifier = Modifier
+) {
+    UserPicture(user, userAccount, size, pictureModifier) {
+        navController.navigate("User/${it.pubkeyHex}")
+    }
+}
 
-            )
+@Composable
+fun UserPicture(
+    baseUser: User,
+    baseUserAccount: User,
+    size: Dp,
+    pictureModifier: Modifier = Modifier,
+    onClick: ((User) -> Unit)? = null
+) {
+    val userState by baseUser.liveMetadata.observeAsState()
+    val user = userState?.user ?: return
 
-            if (accountUser.isFollowing(userLive) || userLive == accountUser) {
-                Box(
-                    Modifier
-                        .width(size.div(3.5f))
-                        .height(size.div(3.5f))
-                        .align(Alignment.TopEnd),
-                    contentAlignment = Alignment.Center
-                ) {
-                    // Background for the transparent checkmark
-                    Text(
-                        "x",
-                        Modifier
-                            .padding(4.dp)
-                            .fillMaxSize()
-                            .align(Alignment.Center)
-                            .background(MaterialTheme.colors.background)
-                            .clip(shape = CircleShape)
-                    )
+    val ctx = LocalContext.current.applicationContext
 
-                    Icon(
-                        painter = painterResource(R.drawable.ic_verified),
-                        "Following",
-                        modifier = Modifier.fillMaxSize(),
-                        tint = Following
-                    )
+    Box(
+        Modifier
+            .width(size)
+            .height(size)) {
+
+        AsyncImageProxy(
+            model = ResizeImage(user.profilePicture(), size),
+            contentDescription = "Profile Image",
+            placeholder = BitmapPainter(RoboHashCache.get(ctx, user.pubkeyHex)),
+            fallback = BitmapPainter(RoboHashCache.get(ctx, user.pubkeyHex)),
+            error = BitmapPainter(RoboHashCache.get(ctx, user.pubkeyHex)),
+            modifier = pictureModifier
+                .fillMaxSize(1f)
+                .clip(shape = CircleShape)
+                .background(MaterialTheme.colors.background)
+                .run {
+                    if (onClick != null)
+                        this.clickable(onClick = { onClick(user) } )
+                    else
+                        this
                 }
+
+        )
+
+        val accountState by baseUserAccount.liveFollows.observeAsState()
+        val accountUser = accountState?.user ?: return
+
+        if (accountUser.isFollowing(user) || user == accountUser) {
+            Box(
+                Modifier
+                    .width(size.div(3.5f))
+                    .height(size.div(3.5f))
+                    .align(Alignment.TopEnd),
+                contentAlignment = Alignment.Center
+            ) {
+                // Background for the transparent checkmark
+                Text(
+                    "x",
+                    Modifier
+                        .padding(4.dp)
+                        .fillMaxSize()
+                        .align(Alignment.Center)
+                        .background(MaterialTheme.colors.background)
+                        .clip(shape = CircleShape)
+                )
+
+                Icon(
+                    painter = painterResource(R.drawable.ic_verified),
+                    "Following",
+                    modifier = Modifier.fillMaxSize(),
+                    tint = Following
+                )
             }
         }
+
     }
 }
 
@@ -364,7 +523,7 @@ fun NoteDropDownMenu(note: Note, popupExpanded: Boolean, onDismiss: () -> Unit,
             Text("Copy Text")
         }
         DropdownMenuItem(onClick = { clipboardManager.setText(AnnotatedString(note.author?.pubkey?.toNpub() ?: "")); onDismiss() }) {
-            Text("Copy User ID")
+            Text("Copy User PubKey")
         }
         DropdownMenuItem(onClick = { clipboardManager.setText(AnnotatedString(note.id.toNote())); onDismiss() }) {
             Text("Copy Note ID")
@@ -374,11 +533,37 @@ fun NoteDropDownMenu(note: Note, popupExpanded: Boolean, onDismiss: () -> Unit,
             Text("Broadcast")
         }
         Divider()
-        DropdownMenuItem(onClick = { accountViewModel.report(note); onDismiss() }) {
-            Text("Report Post")
-        }
         DropdownMenuItem(onClick = { note.author?.let { accountViewModel.hide(it, context) }; onDismiss() }) {
             Text("Hide User")
         }
+        Divider()
+        DropdownMenuItem(onClick = {
+            accountViewModel.report(note, ReportEvent.ReportType.SPAM);
+            note.author?.let { accountViewModel.hide(it, context) }
+            onDismiss()
+        }) {
+            Text("Report Spam / Scam")
+        }
+        DropdownMenuItem(onClick = {
+            accountViewModel.report(note, ReportEvent.ReportType.IMPERSONATION);
+            note.author?.let { accountViewModel.hide(it, context) }
+            onDismiss()
+        }) {
+            Text("Report Impersonation")
+        }
+        DropdownMenuItem(onClick = {
+            accountViewModel.report(note, ReportEvent.ReportType.EXPLICIT);
+            note.author?.let { accountViewModel.hide(it, context) }
+            onDismiss()
+        }) {
+            Text("Report Explicit Content")
+        }
+        DropdownMenuItem(onClick = {
+            accountViewModel.report(note, ReportEvent.ReportType.ILLEGAL);
+            note.author?.let { accountViewModel.hide(it, context) }
+            onDismiss()
+        }) {
+            Text("Report Illegal Behaviour")
+        }
     }
 }

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

@@ -1,47 +1,52 @@
 package com.vitorpamplona.amethyst.ui.note
 
+import android.content.Intent
+import android.net.Uri
+import android.widget.Toast
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.width
-import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material.Icon
 import androidx.compose.material.IconButton
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Text
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Download
+import androidx.compose.material.icons.filled.Bolt
 import androidx.compose.material.icons.filled.MoreVert
 import androidx.compose.material.icons.outlined.BarChart
-import androidx.compose.material.icons.outlined.Visibility
+import androidx.compose.material.icons.outlined.Bolt
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.livedata.observeAsState
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.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.graphics.ColorFilter
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalUriHandler
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import androidx.core.content.ContextCompat
 import coil.compose.AsyncImage
-import coil.imageLoader
 import coil.request.CachePolicy
 import coil.request.ImageRequest
 import com.vitorpamplona.amethyst.R
-import com.vitorpamplona.amethyst.model.Account
+import com.vitorpamplona.amethyst.lnurl.LightningAddressResolver
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.ui.actions.NewPostView
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
+import com.vitorpamplona.amethyst.ui.theme.BitcoinOrange
+import java.math.BigDecimal
+import java.math.RoundingMode
+import kotlinx.coroutines.launch
 
 @Composable
 fun ReactionsRow(baseNote: Note, accountViewModel: AccountViewModel) {
@@ -54,12 +59,16 @@ fun ReactionsRow(baseNote: Note, accountViewModel: AccountViewModel) {
   val boostsState by baseNote.liveBoosts.observeAsState()
   val boostedNote = boostsState?.note
 
+  val zapsState by baseNote.liveZaps.observeAsState()
+  val zappedNote = zapsState?.note
+
   val repliesState by baseNote.liveReplies.observeAsState()
   val replies = repliesState?.note?.replies ?: emptySet()
 
   val grayTint = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
-
-  var popupExpanded by remember { mutableStateOf(false) }
+  val uri = LocalUriHandler.current
+  val context = LocalContext.current
+  val scope = rememberCoroutineScope()
 
   var wantsToReplyTo by remember {
     mutableStateOf<Note?>(null)
@@ -76,8 +85,19 @@ fun ReactionsRow(baseNote: Note, accountViewModel: AccountViewModel) {
     horizontalArrangement = Arrangement.SpaceBetween
   ) {
     IconButton(
-      modifier = Modifier.then(Modifier.size(24.dp)),
-      onClick = { if (account.isWriteable()) wantsToReplyTo = baseNote }
+      modifier = Modifier.then(Modifier.size(20.dp)),
+      onClick = {
+        if (account.isWriteable())
+          wantsToReplyTo = baseNote
+        else
+          scope.launch {
+            Toast.makeText(
+              context,
+              "Login with a Private key to be able to reply",
+              Toast.LENGTH_SHORT
+            ).show()
+          }
+      }
     ) {
       Icon(
         painter = painterResource(R.drawable.ic_comment),
@@ -95,8 +115,19 @@ fun ReactionsRow(baseNote: Note, accountViewModel: AccountViewModel) {
     )
 
     IconButton(
-      modifier = Modifier.then(Modifier.size(24.dp)),
-      onClick = { if (account.isWriteable()) accountViewModel.boost(baseNote) }
+      modifier = Modifier.then(Modifier.size(20.dp)),
+      onClick = {
+        if (account.isWriteable())
+          accountViewModel.boost(baseNote)
+        else
+          scope.launch {
+            Toast.makeText(
+              context,
+              "Login with a Private key to be able to boost posts",
+              Toast.LENGTH_SHORT
+            ).show()
+          }
+      }
     ) {
       if (boostedNote?.isBoostedBy(account.userProfile()) == true) {
         Icon(
@@ -123,8 +154,19 @@ fun ReactionsRow(baseNote: Note, accountViewModel: AccountViewModel) {
     )
 
     IconButton(
-      modifier = Modifier.then(Modifier.size(24.dp)),
-      onClick = { if (account.isWriteable()) accountViewModel.reactTo(baseNote) }
+      modifier = Modifier.then(Modifier.size(20.dp)),
+      onClick = {
+        if (account.isWriteable())
+          accountViewModel.reactTo(baseNote)
+        else
+          scope.launch {
+            Toast.makeText(
+              context,
+              "Login with a Private key to like Posts",
+              Toast.LENGTH_SHORT
+            ).show()
+          }
+      }
     ) {
       if (reactedNote?.isReactedBy(account.userProfile()) == true) {
         Icon(
@@ -150,10 +192,54 @@ fun ReactionsRow(baseNote: Note, accountViewModel: AccountViewModel) {
       modifier = Modifier.weight(1f)
     )
 
+    IconButton(
+      modifier = Modifier.then(Modifier.size(20.dp)),
+      onClick = {
+        if (account.isWriteable()) {
+          accountViewModel.zap(baseNote, 1000 * 1000, "", context) {
+            scope.launch {
+              Toast.makeText(context, it, Toast.LENGTH_SHORT).show()
+            }
+          }
+        } else {
+          scope.launch {
+            Toast.makeText(
+              context,
+              "Login with a Private key to be able to send Zaps",
+              Toast.LENGTH_SHORT
+            ).show()
+          }
+        }
+      }
+    ) {
+      if (zappedNote?.isZappedBy(account.userProfile()) == true) {
+        Icon(
+          imageVector = Icons.Default.Bolt,
+          contentDescription = "Zaps",
+          modifier = Modifier.size(20.dp),
+          tint = BitcoinOrange
+        )
+      } else {
+        Icon(
+          imageVector = Icons.Outlined.Bolt,
+          contentDescription = "Zaps",
+          modifier = Modifier.size(20.dp),
+          tint = grayTint
+        )
+      }
+    }
+
+    Text(
+      showAmount(zappedNote?.zappedAmount()),
+      fontSize = 14.sp,
+      color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f),
+      modifier = Modifier.weight(1f)
+    )
+
 
     IconButton(
-      modifier = Modifier.then(Modifier.size(24.dp)),
-      onClick = { }
+      modifier = Modifier.then(Modifier.size(20.dp)),
+      onClick = { uri.openUri("https://counter.amethyst.social/${baseNote.idHex}/") }
     ) {
       Icon(
         imageVector = Icons.Outlined.BarChart,
@@ -176,25 +262,33 @@ fun ReactionsRow(baseNote: Note, accountViewModel: AccountViewModel) {
         colorFilter = ColorFilter.tint(grayTint)
       )
     }
-
-
-    IconButton(
-      modifier = Modifier.then(Modifier.size(24.dp)),
-      onClick = { popupExpanded = true }
-    ) {
-      Icon(
-        imageVector = Icons.Default.MoreVert,
-        null,
-        modifier = Modifier.size(15.dp),
-        tint = grayTint,
-      )
-    }
   }
-
-  NoteDropDownMenu(baseNote, popupExpanded, { popupExpanded = false }, accountViewModel)
 }
 
-fun showCount(size: Int?): String {
-  if (size == null) return " "
-  return if (size == 0) return " " else "$size"
+fun showCount(count: Int?): String {
+  if (count == null) return " "
+  if (count == 0) return " "
+
+  return when {
+    count >= 1000000000 -> "${Math.round(count / 1000000000f)}G"
+    count >= 1000000 -> "${Math.round(count / 1000000f)}M"
+    count >= 1000 -> "${Math.round(count / 1000f)}k"
+    else -> "$count"
+  }
+}
+
+val OneGiga = BigDecimal(1000000000)
+val OneMega = BigDecimal(1000000)
+val OneKilo = BigDecimal(1000)
+
+fun showAmount(amount: BigDecimal?): String {
+  if (amount == null) return " "
+  if (amount.abs() < BigDecimal(0.01)) return " "
+
+  return when {
+    amount >= OneGiga -> "%.1fG".format(amount.div(OneGiga).setScale(1, RoundingMode.HALF_UP))
+    amount >= OneMega -> "%.1fM".format(amount.div(OneMega).setScale(1, RoundingMode.HALF_UP))
+    amount >= OneKilo -> "%.1fk".format(amount.div(OneKilo).setScale(1, RoundingMode.HALF_UP))
+    else -> "%.0f".format(amount)
+  }
 }

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

@@ -0,0 +1,126 @@
+package com.vitorpamplona.amethyst.ui.note
+
+import androidx.compose.foundation.layout.Column
+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.Divider
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.livedata.observeAsState
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.dp
+import androidx.navigation.NavController
+import com.vitorpamplona.amethyst.model.User
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
+import java.time.Instant
+import java.time.ZoneId
+import java.time.format.DateTimeFormatter
+
+@Composable
+fun RelayCompose(
+    relay: User.RelayInfo,
+    accountViewModel: AccountViewModel,
+    navController: NavController,
+    onAddRelay: () -> Unit,
+    onRemoveRelay: () -> Unit
+) {
+    val accountState by accountViewModel.accountLiveData.observeAsState()
+    val account = accountState?.account ?: return
+
+    Column() {
+        Row(
+            modifier = Modifier
+                .padding(start = 12.dp, end = 12.dp, top = 10.dp)
+        ) {
+
+            //UserPicture(user, navController, account.userProfile(), 55.dp)
+
+            Column(modifier = Modifier
+                .padding(start = 10.dp)
+                .weight(1f)) {
+                Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.fillMaxWidth()) {
+                    Text(
+                        relay.url.trim().removePrefix("wss://"),
+                        fontWeight = FontWeight.Bold,
+                        maxLines = 1,
+                        overflow = TextOverflow.Ellipsis
+                    )
+
+                    Text(
+                        timeAgo(relay.lastEvent),
+                        maxLines = 1
+                    )
+                }
+
+                Text(
+                    "${relay.counter} posts received",
+                    color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f),
+                    maxLines = 1,
+                    overflow = TextOverflow.Ellipsis
+                )
+            }
+
+            Column(modifier = Modifier.padding(start = 10.dp)) {
+                if (account.activeRelays()?.none { it.url == relay.url } == true) {
+                    AddRelayButton { onAddRelay() }
+                } else {
+                    RemoveRelayButton { onRemoveRelay() }
+                }
+            }
+        }
+
+        Divider(
+            modifier = Modifier.padding(top = 10.dp),
+            thickness = 0.25.dp
+        )
+    }
+}
+
+@Composable
+fun AddRelayButton(onClick: () -> Unit) {
+    Button(
+        modifier = Modifier.padding(horizontal = 3.dp),
+        onClick = onClick,
+        shape = RoundedCornerShape(20.dp),
+        colors = ButtonDefaults
+            .buttonColors(
+                backgroundColor = MaterialTheme.colors.primary
+            ),
+        contentPadding = PaddingValues(vertical = 6.dp, horizontal = 16.dp)
+    ) {
+        Text(text = "Add", color = Color.White)
+    }
+}
+
+@Composable
+fun RemoveRelayButton(onClick: () -> Unit) {
+    Button(
+        modifier = Modifier.padding(horizontal = 3.dp),
+        onClick = onClick,
+        shape = RoundedCornerShape(20.dp),
+        colors = ButtonDefaults
+            .buttonColors(
+                backgroundColor = MaterialTheme.colors.primary
+            ),
+        contentPadding = PaddingValues(vertical = 6.dp, horizontal = 16.dp)
+    ) {
+        Text(text = "Remove", color = Color.White)
+    }
+}
+
+fun formattedDateTime(timestamp: Long): String {
+    return Instant.ofEpochSecond(timestamp).atZone(ZoneId.systemDefault())
+        .format(DateTimeFormatter.ofPattern("MMM d, uuuu hh:mm a"))
+}

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

@@ -24,14 +24,14 @@ import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.model.User
 
 @Composable
-fun ReplyInformation(replyTo: MutableList<Note>?, mentions: List<User>?, navController: NavController) {
+fun ReplyInformation(replyTo: List<Note>?, mentions: List<User>?, navController: NavController) {
   ReplyInformation(replyTo, mentions) {
     navController.navigate("User/${it.pubkeyHex}")
   }
 }
 
 @Composable
-fun ReplyInformation(replyTo: MutableList<Note>?, mentions: List<User>?, prefix: String = "", onUserTagClick: (User) -> Unit) {
+fun ReplyInformation(replyTo: List<Note>?, mentions: List<User>?, prefix: String = "", onUserTagClick: (User) -> Unit) {
   FlowRow() {
     if (mentions != null && mentions.isNotEmpty()) {
       if (replyTo != null && replyTo.isNotEmpty()) {
@@ -44,7 +44,7 @@ fun ReplyInformation(replyTo: MutableList<Note>?, mentions: List<User>?, prefix:
         val mentionSet = mentions.toSet()
 
         mentionSet.toSet().forEachIndexed { idx, user ->
-          val innerUserState by user.live.observeAsState()
+          val innerUserState by user.liveMetadata.observeAsState()
           val innerUser = innerUserState?.user
 
           innerUser?.let { myUser ->
@@ -76,7 +76,7 @@ fun ReplyInformation(replyTo: MutableList<Note>?, mentions: List<User>?, prefix:
 
 
 @Composable
-fun ReplyInformationChannel(replyTo: MutableList<Note>?, mentions: List<User>?, channel: Channel, navController: NavController) {
+fun ReplyInformationChannel(replyTo: List<Note>?, mentions: List<User>?, channel: Channel, navController: NavController) {
   ReplyInformationChannel(replyTo, mentions, channel,
     onUserTagClick = {
       navController.navigate("User/${it.pubkeyHex}")
@@ -89,7 +89,7 @@ fun ReplyInformationChannel(replyTo: MutableList<Note>?, mentions: List<User>?,
 
 
 @Composable
-fun ReplyInformationChannel(replyTo: MutableList<Note>?,
+fun ReplyInformationChannel(replyTo: List<Note>?,
                      mentions: List<User>?,
                      baseChannel: Channel,
                      prefix: String = "",
@@ -123,7 +123,7 @@ fun ReplyInformationChannel(replyTo: MutableList<Note>?,
         val mentionSet = mentions.toSet()
 
         mentionSet.forEachIndexed { idx, user ->
-          val innerUserState by user.live.observeAsState()
+          val innerUserState by user.liveMetadata.observeAsState()
           val innerUser = innerUserState?.user
 
           innerUser?.let { myUser ->

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

@@ -4,6 +4,7 @@ import android.text.format.DateUtils
 
 fun timeAgo(mills: Long?): String {
   if (mills == null) return " "
+  if (mills == 0L) return " • never"
 
   var humanReadable = DateUtils.getRelativeTimeSpanString(
     mills * 1000,

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

@@ -34,14 +34,14 @@ fun UserCompose(baseUser: User, accountViewModel: AccountViewModel, navControlle
     val accountState by accountViewModel.accountLiveData.observeAsState()
     val account = accountState?.account ?: return
 
-    val userState by baseUser.live.observeAsState()
-    val user = userState?.user ?: return
+    val userState by account.userProfile().liveFollows.observeAsState()
+    val userFollows = userState?.user ?: return
 
     val ctx = LocalContext.current.applicationContext
 
     Column(modifier =
         Modifier.clickable(
-            onClick = { navController.navigate("User/${user.pubkeyHex}") }
+            onClick = { navController.navigate("User/${baseUser.pubkeyHex}") }
         )
     ) {
         Row(
@@ -49,16 +49,20 @@ fun UserCompose(baseUser: User, accountViewModel: AccountViewModel, navControlle
                 .padding(
                     start = 12.dp,
                     end = 12.dp,
-                    top = 10.dp)
+                    top = 10.dp),
+            verticalAlignment = Alignment.CenterVertically
         ) {
 
-            UserPicture(user, navController, account.userProfile(), 55.dp)
+            UserPicture(baseUser, navController, account.userProfile(), 55.dp)
 
             Column(modifier = Modifier.padding(start = 10.dp).weight(1f)) {
                 Row(verticalAlignment = Alignment.CenterVertically) {
-                    UsernameDisplay(user)
+                    UsernameDisplay(baseUser)
                 }
 
+                val userState by baseUser.liveMetadata.observeAsState()
+                val user = userState?.user ?: return
+
                 Text(
                     user.info.about ?: "",
                     color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f),
@@ -68,15 +72,15 @@ fun UserCompose(baseUser: User, accountViewModel: AccountViewModel, navControlle
             }
 
             Column(modifier = Modifier.padding(start = 10.dp)) {
-                if (account?.isAcceptable(user) == false) {
+                if (account.isHidden(baseUser)) {
                     ShowUserButton {
-                        account.showUser(user.pubkeyHex)
+                        account.showUser(baseUser.pubkeyHex)
                         LocalPreferences(ctx).saveToEncryptedStorage(account)
                     }
-                } else if (account?.userProfile()?.isFollowing(user) == true) {
-                    UnfollowButton { account.unfollow(user) }
+                } else if (userFollows.isFollowing(baseUser)) {
+                    UnfollowButton { account.unfollow(baseUser) }
                 } else {
-                    FollowButton { account?.follow(user) }
+                    FollowButton { account.follow(baseUser) }
                 }
             }
         }

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

@@ -3,42 +3,61 @@ package com.vitorpamplona.amethyst.ui.note
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.livedata.observeAsState
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextOverflow
+import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.model.User
 
+
 @Composable
-fun UsernameDisplay(user: User, weight: Modifier = Modifier) {
-    if (user.bestUsername() != null || user.bestDisplayName() != null) {
-      if (user.bestDisplayName().isNullOrBlank()) {
-        Text(
-          "@${(user.bestUsername() ?: "")}",
-          fontWeight = FontWeight.Bold,
-          maxLines = 1,
-          overflow = TextOverflow.Ellipsis,
-          modifier = weight
-        )
-      } else {
-        Text(
-          user.bestDisplayName() ?: "",
-          fontWeight = FontWeight.Bold,
-        )
-        Text(
-          "@${(user.bestUsername() ?: "")}",
-          color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f),
-          maxLines = 1,
-          overflow = TextOverflow.Ellipsis,
-          modifier = weight
-        )
-      }
-    } else {
+fun NoteUsernameDisplay(baseNote: Note, weight: Modifier = Modifier) {
+  val noteState by baseNote.live.observeAsState()
+  val note = noteState?.note ?: return
+
+  val author = note.author
+
+  if (author != null) {
+    UsernameDisplay(author, weight)
+  }
+}
+
+@Composable
+fun UsernameDisplay(baseUser: User, weight: Modifier = Modifier) {
+  val userState by baseUser.liveMetadata.observeAsState()
+  val user = userState?.user ?: return
+
+  if (user.bestUsername() != null || user.bestDisplayName() != null) {
+    if (user.bestDisplayName().isNullOrBlank()) {
       Text(
-        user.pubkeyDisplayHex,
+        "@${(user.bestUsername() ?: "")}",
         fontWeight = FontWeight.Bold,
         maxLines = 1,
         overflow = TextOverflow.Ellipsis,
         modifier = weight
       )
+    } else {
+      Text(
+        user.bestDisplayName() ?: "",
+        fontWeight = FontWeight.Bold,
+      )
+      Text(
+        "@${(user.bestUsername() ?: "")}",
+        color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f),
+        maxLines = 1,
+        overflow = TextOverflow.Ellipsis,
+        modifier = weight
+      )
     }
+  } else {
+    Text(
+      user.pubkeyDisplayHex,
+      fontWeight = FontWeight.Bold,
+      maxLines = 1,
+      overflow = TextOverflow.Ellipsis,
+      modifier = weight
+    )
+  }
 }

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

@@ -0,0 +1,123 @@
+package com.vitorpamplona.amethyst.ui.note
+
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material.Divider
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.livedata.observeAsState
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import androidx.navigation.NavController
+import com.vitorpamplona.amethyst.LocalPreferences
+import com.vitorpamplona.amethyst.lnurl.LnInvoiceUtil
+import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.service.model.LnZapEvent
+import com.vitorpamplona.amethyst.ui.screen.FollowButton
+import com.vitorpamplona.amethyst.ui.screen.ShowUserButton
+import com.vitorpamplona.amethyst.ui.screen.UnfollowButton
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
+import com.vitorpamplona.amethyst.ui.theme.BitcoinOrange
+
+@Composable
+fun ZapNoteCompose(baseNote: Pair<Note, Note>, accountViewModel: AccountViewModel, navController: NavController) {
+    val accountState by accountViewModel.accountLiveData.observeAsState()
+    val account = accountState?.account ?: return
+
+    val userState by account.userProfile().liveFollows.observeAsState()
+    val userFollows = userState?.user ?: return
+
+    val noteState by baseNote.second.live.observeAsState()
+    val noteZap = noteState?.note ?: return
+
+    val baseNoteRequest by baseNote.first.live.observeAsState()
+    val noteZapRequest = baseNoteRequest?.note ?: return
+
+    val baseAuthor = noteZapRequest.author
+
+    val ctx = LocalContext.current.applicationContext
+
+    if (baseAuthor == null) {
+        BlankNote()
+    } else {
+        Column(modifier =
+            Modifier.clickable(
+                onClick = { navController.navigate("User/${baseAuthor.pubkeyHex}") }
+            ),
+            verticalArrangement = Arrangement.Center
+        ) {
+            Row(
+                modifier = Modifier
+                    .padding(
+                        start = 12.dp,
+                        end = 12.dp,
+                        top = 10.dp
+                    ),
+                verticalAlignment = Alignment.CenterVertically
+            ) {
+
+                UserPicture(baseAuthor, navController, account.userProfile(), 55.dp)
+
+                Column(modifier = Modifier.padding(start = 10.dp).weight(1f)) {
+                    Row(verticalAlignment = Alignment.CenterVertically) {
+                        UsernameDisplay(baseAuthor)
+                    }
+
+                    val userState by baseAuthor.liveMetadata.observeAsState()
+                    val user = userState?.user ?: return
+
+                    Text(
+                        user.info.about ?: "",
+                        color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f),
+                        maxLines = 1,
+                        overflow = TextOverflow.Ellipsis
+                    )
+                }
+
+                val amount =
+                    (noteZap.event as? LnZapEvent)?.amount
+
+                Column(
+                    modifier = Modifier.padding(start = 10.dp),
+                    verticalArrangement = Arrangement.Center
+                ) {
+                    Text(
+                        showAmount(amount) + " sats",
+                        color = BitcoinOrange,
+                        fontSize = 20.sp,
+                        fontWeight = FontWeight.W500,
+                    )
+                }
+
+                Column(modifier = Modifier.padding(start = 10.dp)) {
+                    if (account.isHidden(baseAuthor)) {
+                        ShowUserButton {
+                            account.showUser(baseAuthor.pubkeyHex)
+                            LocalPreferences(ctx).saveToEncryptedStorage(account)
+                        }
+                    } else if (userFollows.isFollowing(baseAuthor)) {
+                        UnfollowButton { account.unfollow(baseAuthor) }
+                    } else {
+                        FollowButton { account.follow(baseAuthor) }
+                    }
+                }
+            }
+
+            Divider(
+                modifier = Modifier.padding(top = 10.dp),
+                thickness = 0.25.dp
+            )
+        }
+    }
+}

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

@@ -0,0 +1,91 @@
+package com.vitorpamplona.amethyst.ui.note
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.material.Icon
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Bolt
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.livedata.observeAsState
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.unit.dp
+import androidx.navigation.NavController
+import com.google.accompanist.flowlayout.FlowRow
+import com.vitorpamplona.amethyst.NotificationCache
+import com.vitorpamplona.amethyst.R
+import com.vitorpamplona.amethyst.ui.screen.LikeSetCard
+import com.vitorpamplona.amethyst.ui.screen.ZapSetCard
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
+import com.vitorpamplona.amethyst.ui.theme.BitcoinOrange
+
+@Composable
+fun ZapSetCompose(zapSetCard: ZapSetCard, modifier: Modifier = Modifier, isInnerNote: Boolean = false, routeForLastRead: String, accountViewModel: AccountViewModel, navController: NavController) {
+    val noteState by zapSetCard.note.live.observeAsState()
+    val note = noteState?.note
+
+    val accountState by accountViewModel.accountLiveData.observeAsState()
+    val account = accountState?.account ?: return
+
+    val context = LocalContext.current.applicationContext
+
+    if (note == null) {
+        BlankNote(Modifier, isInnerNote)
+    } else {
+        val isNew = zapSetCard.createdAt > NotificationCache.load(routeForLastRead, context)
+        NotificationCache.markAsRead(routeForLastRead, zapSetCard.createdAt, context)
+
+        Column(
+            modifier = Modifier.background(
+                if (isNew) MaterialTheme.colors.primary.copy(0.12f) else MaterialTheme.colors.background
+            )
+        ) {
+            Row(modifier = Modifier
+                .padding(
+                    start = if (!isInnerNote) 12.dp else 0.dp,
+                    end = if (!isInnerNote) 12.dp else 0.dp,
+                    top = 10.dp)
+            ) {
+
+                // Draws the like picture outside the boosted card.
+                if (!isInnerNote) {
+                    Box(modifier = Modifier
+                        .width(55.dp)
+                        .padding(0.dp)) {
+                        Icon(
+                            imageVector = Icons.Default.Bolt,
+                            contentDescription = "Zaps",
+                            tint = BitcoinOrange,
+                            modifier = Modifier.size(25.dp).align(Alignment.TopEnd)
+                        )
+                    }
+                }
+
+                Column(modifier = Modifier.padding(start = if (!isInnerNote) 10.dp else 0.dp)) {
+                    FlowRow() {
+                        zapSetCard.zapEvents.forEach {
+                            NoteAuthorPicture(
+                                note = it,
+                                navController = navController,
+                                userAccount = account.userProfile(),
+                                size = 35.dp
+                            )
+                        }
+                    }
+
+                    NoteCompose(note, null, Modifier.padding(top = 5.dp), true, accountViewModel, navController)
+                }
+            }
+        }
+    }
+}

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

@@ -0,0 +1,245 @@
+package com.vitorpamplona.amethyst.ui.navigation
+
+import androidx.compose.foundation.Canvas
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.aspectRatio
+import androidx.compose.foundation.layout.defaultMinSize
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.material.MaterialTheme
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.geometry.CornerRadius
+import androidx.compose.ui.geometry.Offset
+import androidx.compose.ui.geometry.Rect
+import androidx.compose.ui.geometry.RoundRect
+import androidx.compose.ui.geometry.Size
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.Path
+import androidx.compose.ui.graphics.PathFillType
+import androidx.compose.ui.graphics.drawscope.DrawScope
+import androidx.compose.ui.unit.dp
+import com.google.zxing.EncodeHintType
+import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel
+import com.google.zxing.qrcode.encoder.ByteMatrix
+import com.google.zxing.qrcode.encoder.Encoder
+import com.google.zxing.qrcode.encoder.QRCode
+
+
+const val QR_MARGIN_PX = 100f
+
+@Composable
+fun QrCodeDrawer(contents: String, modifier: Modifier = Modifier) {
+  val qrCode = remember(contents) {
+    createQrCode(contents = contents)
+  }
+
+  val foregroundColor = MaterialTheme.colors.onSurface
+
+  Box(
+    modifier = modifier
+      .defaultMinSize(48.dp, 48.dp)
+      .aspectRatio(1f)
+      .background(MaterialTheme.colors.background)
+  ) {
+    Canvas(modifier = Modifier.fillMaxSize()) {
+      // Calculate the height and width of each column/row
+      val rowHeight = (size.width - QR_MARGIN_PX * 2f) / qrCode.matrix.height
+      val columnWidth = (size.width - QR_MARGIN_PX * 2f) / qrCode.matrix.width
+
+      // Draw all of the finder patterns required by the QR spec. Calculate the ratio
+      // of the number of rows/columns to the width and height
+      drawQrCodeFinders(
+        sideLength = size.width,
+        finderPatternSize = Size(
+          width = columnWidth * FINDER_PATTERN_ROW_COUNT,
+          height = rowHeight * FINDER_PATTERN_ROW_COUNT
+        ),
+        color = foregroundColor
+      )
+
+      // Draw data bits (encoded data part)
+      drawAllQrCodeDataBits(
+        bytes = qrCode.matrix,
+        size = Size(
+          width = columnWidth,
+          height = rowHeight
+        ),
+        color = foregroundColor
+      )
+    }
+  }
+}
+
+private typealias Coordinate = Pair<Int, Int>
+
+private fun createQrCode(contents: String): QRCode {
+  require(contents.isNotEmpty())
+
+  return Encoder.encode(
+    contents,
+    ErrorCorrectionLevel.Q,
+    mapOf(
+      EncodeHintType.CHARACTER_SET to "UTF-8",
+      EncodeHintType.MARGIN to QR_MARGIN_PX,
+      EncodeHintType.ERROR_CORRECTION to ErrorCorrectionLevel.Q
+    )
+  )
+}
+
+fun newPath(withPath: Path.() -> Unit) = Path().apply {
+  fillType = PathFillType.EvenOdd
+  withPath(this)
+}
+
+fun DrawScope.drawAllQrCodeDataBits(
+  bytes: ByteMatrix,
+  size: Size,
+  color: Color,
+) {
+  setOf(
+    // data bits between top left finder pattern and top right finder pattern.
+    Pair(
+      first = Coordinate(first = FINDER_PATTERN_ROW_COUNT, second = 0),
+      second = Coordinate(
+        first = (bytes.width - FINDER_PATTERN_ROW_COUNT),
+        second = FINDER_PATTERN_ROW_COUNT
+      )
+    ),
+    // data bits below top left finder pattern and above bottom left finder pattern.
+    Pair(
+      first = Coordinate(first = 0, second = FINDER_PATTERN_ROW_COUNT),
+      second = Coordinate(
+        first = bytes.width,
+        second = bytes.height - FINDER_PATTERN_ROW_COUNT
+      )
+    ),
+    // data bits to the right of the bottom left finder pattern.
+    Pair(
+      first = Coordinate(
+        first = FINDER_PATTERN_ROW_COUNT,
+        second = (bytes.height - FINDER_PATTERN_ROW_COUNT)
+      ),
+      second = Coordinate(
+        first = bytes.width,
+        second = bytes.height
+      )
+    )
+  ).forEach { section ->
+    for (y in section.first.second until section.second.second) {
+      for (x in section.first.first until section.second.first) {
+        if (bytes[x, y] == 1.toByte()) {
+          drawPath(
+            color = color,
+            path = newPath {
+              addRect(
+                rect = Rect(
+                  offset = Offset(
+                    x = QR_MARGIN_PX + x * size.width,
+                    y = QR_MARGIN_PX + y * size.height
+                  ),
+                  size = size
+                )
+              )
+            }
+          )
+        }
+      }
+    }
+  }
+}
+
+const val FINDER_PATTERN_ROW_COUNT = 7
+private const val INTERIOR_EXTERIOR_SHAPE_RATIO = 3f / FINDER_PATTERN_ROW_COUNT
+private const val INTERIOR_EXTERIOR_OFFSET_RATIO = 2f / FINDER_PATTERN_ROW_COUNT
+private const val INTERIOR_EXTERIOR_SHAPE_CORNER_RADIUS = 0.12f
+private const val INTERIOR_BACKGROUND_EXTERIOR_SHAPE_RATIO = 5f / FINDER_PATTERN_ROW_COUNT
+private const val INTERIOR_BACKGROUND_EXTERIOR_OFFSET_RATIO = 1f / FINDER_PATTERN_ROW_COUNT
+private const val INTERIOR_BACKGROUND_EXTERIOR_SHAPE_CORNER_RADIUS = 0.5f
+
+/**
+ *  A valid QR code has three finder patterns (top left, top right, bottom left).
+ *
+ *  @param qrCodeProperties how the QR code is drawn
+ *  @param sideLength length, in pixels, of each side of the QR code
+ *  @param finderPatternSize [Size] of each finder patten, based on the QR code spec
+ */
+internal fun DrawScope.drawQrCodeFinders(
+  sideLength: Float,
+  finderPatternSize: Size,
+  color: Color
+) {
+
+  setOf(
+    // Draw top left finder pattern.
+    Offset(x = QR_MARGIN_PX, y = QR_MARGIN_PX),
+    // Draw top right finder pattern.
+    Offset(x = sideLength - (QR_MARGIN_PX + finderPatternSize.width), y = QR_MARGIN_PX),
+    // Draw bottom finder pattern.
+    Offset(x = QR_MARGIN_PX, y = sideLength - (QR_MARGIN_PX + finderPatternSize.height))
+  ).forEach { offset ->
+    drawQrCodeFinder(
+      topLeft = offset,
+      finderPatternSize = finderPatternSize,
+      cornerRadius = CornerRadius.Zero,
+      color = color
+    )
+  }
+}
+
+/**
+ * This func is responsible for drawing a single finder pattern, for a QR code
+ */
+private fun DrawScope.drawQrCodeFinder(
+  topLeft: Offset,
+  finderPatternSize: Size,
+  cornerRadius: CornerRadius,
+  color: Color
+) {
+  drawPath(
+    color = color,
+    path = newPath {
+      // Draw the outer rectangle for the finder pattern.
+      addRoundRect(
+        roundRect = RoundRect(
+          rect = Rect(
+            offset = topLeft,
+            size = finderPatternSize
+          ),
+          cornerRadius = cornerRadius
+        )
+      )
+
+      // Draw background for the finder pattern interior (this keeps the arc ratio consistent).
+      val innerBackgroundOffset = Offset(
+        x = finderPatternSize.width * INTERIOR_BACKGROUND_EXTERIOR_OFFSET_RATIO,
+        y = finderPatternSize.height * INTERIOR_BACKGROUND_EXTERIOR_OFFSET_RATIO
+      )
+      addRoundRect(
+        roundRect = RoundRect(
+          rect = Rect(
+            offset = topLeft + innerBackgroundOffset,
+            size = finderPatternSize * INTERIOR_BACKGROUND_EXTERIOR_SHAPE_RATIO
+          ),
+          cornerRadius = cornerRadius * INTERIOR_BACKGROUND_EXTERIOR_SHAPE_CORNER_RADIUS
+        )
+      )
+
+      // Draw the inner rectangle for the finder pattern.
+      val innerRectOffset = Offset(
+        x = finderPatternSize.width * INTERIOR_EXTERIOR_OFFSET_RATIO,
+        y = finderPatternSize.height * INTERIOR_EXTERIOR_OFFSET_RATIO
+      )
+      addRoundRect(
+        roundRect = RoundRect(
+          rect = Rect(
+            offset = topLeft + innerRectOffset,
+            size = finderPatternSize * INTERIOR_EXTERIOR_SHAPE_RATIO
+          ),
+          cornerRadius = cornerRadius * INTERIOR_EXTERIOR_SHAPE_CORNER_RADIUS
+        )
+      )
+    }
+  )
+}

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

@@ -0,0 +1,167 @@
+package com.vitorpamplona.amethyst.ui.qrcode
+import android.Manifest
+import android.content.Context
+import android.content.pm.PackageManager
+import android.graphics.ImageFormat
+import android.util.Size
+import androidx.activity.compose.rememberLauncherForActivityResult
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.camera.core.CameraSelector
+import androidx.camera.core.ImageAnalysis
+import androidx.camera.core.ImageProxy
+import androidx.camera.core.Preview
+import androidx.camera.lifecycle.ProcessCameraProvider
+import androidx.camera.view.PreviewView
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material.Text
+import androidx.compose.runtime.*
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalLifecycleOwner
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import androidx.compose.ui.viewinterop.AndroidView
+import androidx.core.content.ContextCompat
+import androidx.lifecycle.LifecycleOwner
+import com.google.common.util.concurrent.ListenableFuture
+import com.google.mlkit.vision.barcode.BarcodeScannerOptions
+import com.google.mlkit.vision.barcode.BarcodeScanning
+import com.google.mlkit.vision.barcode.common.Barcode
+import com.google.mlkit.vision.common.InputImage
+import com.vitorpamplona.amethyst.service.Nip19
+import java.util.concurrent.ExecutorService
+import java.util.concurrent.Executors
+
+@Composable
+fun QrCodeScanner(onScan: (String) -> Unit) {
+    val context = LocalContext.current
+    val lifecycleOwner = LocalLifecycleOwner.current
+    val cameraProviderFuture = remember { ProcessCameraProvider.getInstance(context) }
+
+    val cameraExecutor= Executors.newSingleThreadExecutor()
+
+    var hasCameraPermission by remember {
+        mutableStateOf(
+            ContextCompat.checkSelfPermission(
+                context,
+                Manifest.permission.CAMERA
+            ) == PackageManager.PERMISSION_GRANTED
+        )
+    }
+
+    val launcher = rememberLauncherForActivityResult(
+        contract = ActivityResultContracts.RequestPermission(),
+        onResult = { granted ->
+            hasCameraPermission = granted
+        }
+    )
+
+    val analyzer = QRCodeAnalyzer { result ->
+        result?.let {
+            try {
+                val nip19 = Nip19().uriToRoute(it)
+                val startingPage = when (nip19?.type) {
+                    Nip19.Type.USER -> "User/${nip19.hex}"
+                    Nip19.Type.NOTE -> "Note/${nip19.hex}"
+                    else -> null
+                }
+
+                if (startingPage != null) {
+                    onScan(startingPage)
+                }
+            } catch (e: Throwable) {
+                // QR can be anythign. do not throw errors.
+            }
+        }
+    }
+
+    DisposableEffect(key1 = true) {
+        launcher.launch(Manifest.permission.CAMERA)
+        onDispose() {
+            cameraProviderFuture.get().unbindAll()
+            cameraExecutor.shutdown()
+        }
+    }
+
+    Column() {
+        if (hasCameraPermission) {
+            AndroidView(
+                factory = { context ->
+                    val previewView = PreviewView(context)
+
+                    cameraProviderFuture.addListener({
+                        val cameraProvider = cameraProviderFuture.get()
+                        bindPreview(analyzer, previewView, cameraExecutor, cameraProvider, lifecycleOwner)
+                    }, ContextCompat.getMainExecutor(context))
+
+                    return@AndroidView previewView
+                },
+                modifier = Modifier.weight(1f)
+            )
+        }
+    }
+}
+
+fun bindPreview(
+    analyzer: ImageAnalysis.Analyzer,
+    previewView: PreviewView,
+    cameraExecutor: ExecutorService,
+    cameraProvider: ProcessCameraProvider,
+    lifecycleOwner: LifecycleOwner
+) {
+    val preview = Preview.Builder().build()
+
+    val selector = CameraSelector.Builder()
+        .requireLensFacing(CameraSelector.LENS_FACING_BACK)
+        .build()
+
+    preview.setSurfaceProvider(previewView.surfaceProvider)
+
+    val imageAnalysis = ImageAnalysis.Builder()
+        .setBackpressureStrategy(ImageAnalysis.STRATEGY_KEEP_ONLY_LATEST)
+        .build()
+
+    imageAnalysis.setAnalyzer(
+        cameraExecutor,
+        analyzer
+    )
+
+    cameraProvider.bindToLifecycle(
+        lifecycleOwner,
+        selector,
+        imageAnalysis,
+        preview
+    )
+}
+
+class QRCodeAnalyzer(
+    private val onQrCodeScanned: (result: String?) -> Unit
+) : ImageAnalysis.Analyzer {
+
+    private val scanningOptions = BarcodeScannerOptions.Builder().setBarcodeFormats(Barcode.FORMAT_QR_CODE).build()
+
+    fun scanBarcodes(inputImage: InputImage) {
+        BarcodeScanning.getClient(scanningOptions).process(inputImage)
+            .addOnSuccessListener { barcodes ->
+                if (barcodes.isNotEmpty()) {
+                    onQrCodeScanned(barcodes[0].displayValue)
+                }
+            }
+            .addOnFailureListener {
+                it.printStackTrace()
+            }
+    }
+
+    @androidx.annotation.OptIn(androidx.camera.core.ExperimentalGetImage::class)
+    override fun analyze(imageProxy: ImageProxy) {
+        imageProxy.image?.let { image ->
+            val inputImage = InputImage.fromMediaImage(image, imageProxy.imageInfo.rotationDegrees)
+            scanBarcodes(inputImage)
+        }
+        imageProxy.close()
+    }
+}

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

@@ -0,0 +1,185 @@
+package com.vitorpamplona.amethyst.ui.navigation
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.border
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.shape.CircleShape
+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.Surface
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.painter.BitmapPainter
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import androidx.compose.ui.window.Dialog
+import androidx.compose.ui.window.DialogProperties
+import coil.compose.AsyncImage
+import coil.compose.rememberAsyncImagePainter
+import com.vitorpamplona.amethyst.RoboHashCache
+import com.vitorpamplona.amethyst.model.User
+import com.vitorpamplona.amethyst.ui.components.AsyncImageProxy
+import com.vitorpamplona.amethyst.ui.components.ResizeImage
+import com.vitorpamplona.amethyst.ui.actions.CloseButton
+import com.vitorpamplona.amethyst.ui.qrcode.QrCodeScanner
+import nostr.postr.toNpub
+
+@Composable
+fun ShowQRDialog(user: User, onScan: (String) -> Unit, onClose: () -> Unit) {
+  var presenting by remember { mutableStateOf(true) }
+
+  val ctx = LocalContext.current.applicationContext
+
+  Dialog(
+    onDismissRequest = onClose,
+    properties = DialogProperties(usePlatformDefaultWidth = false)
+  ) {
+    Surface(modifier = Modifier.fillMaxSize()) {
+      Column(
+        modifier = Modifier
+          .background(MaterialTheme.colors.background)
+          .fillMaxSize(),
+      ) {
+        Row(
+          modifier = Modifier.fillMaxWidth().padding(10.dp),
+          horizontalArrangement = Arrangement.SpaceBetween,
+          verticalAlignment = Alignment.CenterVertically
+        ) {
+          CloseButton(onCancel = onClose)
+        }
+
+        Column(
+          modifier = Modifier.fillMaxSize().padding(horizontal = 10.dp),
+          verticalArrangement = Arrangement.SpaceBetween
+        ) {
+          if (presenting) {
+            Row(
+              horizontalArrangement = Arrangement.Center,
+              modifier = Modifier.fillMaxWidth().padding(horizontal = 30.dp, vertical = 10.dp)
+            ) {
+
+            }
+
+            Column(modifier = Modifier.fillMaxWidth()) {
+              Row(horizontalArrangement = Arrangement.Center, modifier = Modifier.fillMaxWidth()) {
+                AsyncImageProxy(
+                  model = ResizeImage(user.profilePicture(), 100.dp),
+                  placeholder = BitmapPainter(RoboHashCache.get(ctx, user.pubkeyHex)),
+                  fallback = BitmapPainter(RoboHashCache.get(ctx, user.pubkeyHex)),
+                  error = BitmapPainter(RoboHashCache.get(ctx, user.pubkeyHex)),
+                  contentDescription = "Profile Image",
+                  modifier = Modifier
+                    .width(100.dp)
+                    .height(100.dp)
+                    .clip(shape = CircleShape)
+                    .border(3.dp, MaterialTheme.colors.background, CircleShape)
+                    .background(MaterialTheme.colors.background)
+                )
+              }
+              Row(horizontalArrangement = Arrangement.Center, modifier = Modifier.fillMaxWidth()) {
+                Text(
+                  user.bestDisplayName() ?: "",
+                  modifier = Modifier.padding(top = 7.dp),
+                  fontWeight = FontWeight.Bold,
+                  fontSize = 18.sp
+                )
+              }
+              Row(horizontalArrangement = Arrangement.Center, modifier = Modifier.fillMaxWidth()) {
+                Text(" @${user.bestUsername()}", color = Color.LightGray)
+              }
+
+              Row(
+                horizontalArrangement = Arrangement.Center,
+                modifier = Modifier.fillMaxWidth().padding(horizontal = 35.dp, vertical = 10.dp)
+              ) {
+                QrCodeDrawer("nostr:${user.pubkey.toNpub()}")
+              }
+
+            }
+
+            Row(
+              horizontalArrangement = Arrangement.Center,
+              modifier = Modifier.fillMaxWidth().padding(horizontal = 30.dp, vertical = 10.dp)
+            ) {
+
+              Button(
+                onClick = { presenting = false },
+                shape = RoundedCornerShape(35.dp),
+                modifier = Modifier
+                  .fillMaxWidth()
+                  .height(50.dp),
+                colors = ButtonDefaults
+                  .buttonColors(
+                    backgroundColor = MaterialTheme.colors.primary
+                  )
+              ) {
+                Text(text = "Scan QR")
+              }
+            }
+
+          } else {
+
+            Row(horizontalArrangement = Arrangement.Center, modifier = Modifier.fillMaxWidth()) {
+              Text(
+                "Point to the QR Code",
+                modifier = Modifier.padding(top = 7.dp),
+                fontWeight = FontWeight.Bold,
+                fontSize = 25.sp
+              )
+            }
+
+            Row(
+              horizontalArrangement = Arrangement.Center,
+              modifier = Modifier.fillMaxWidth().padding(30.dp)
+            ) {
+              QrCodeScanner(onScan)
+            }
+
+            Row(
+              horizontalArrangement = Arrangement.Center,
+              modifier = Modifier.fillMaxWidth().padding(horizontal = 30.dp, vertical = 10.dp)
+            ) {
+
+              Button(
+                onClick = { presenting = true },
+                shape = RoundedCornerShape(35.dp),
+                modifier = Modifier
+                  .fillMaxWidth()
+                  .height(50.dp),
+                colors = ButtonDefaults
+                  .buttonColors(
+                    backgroundColor = MaterialTheme.colors.primary
+                  )
+              ) {
+                Text(text = "Show QR")
+              }
+            }
+
+          }
+
+
+        }
+      }
+    }
+  }
+}

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

@@ -1,6 +1,7 @@
 package com.vitorpamplona.amethyst.ui.screen
 
 import androidx.compose.animation.Crossfade
+import androidx.compose.animation.core.tween
 import androidx.compose.foundation.layout.Column
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
@@ -13,7 +14,7 @@ fun AccountScreen(accountStateViewModel: AccountStateViewModel, startingPage: St
   val accountState by accountStateViewModel.accountContent.collectAsState()
 
   Column() {
-    Crossfade(targetState = accountState) { state ->
+    Crossfade(targetState = accountState, animationSpec = tween(durationMillis = 100)) { state ->
       when (state) {
         is AccountState.LoggedOff -> {
           LoginPage(accountStateViewModel)

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

@@ -2,34 +2,18 @@ package com.vitorpamplona.amethyst.ui.screen
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import androidx.security.crypto.EncryptedSharedPreferences
 import com.vitorpamplona.amethyst.LocalPreferences
 import com.vitorpamplona.amethyst.ServiceManager
 import com.vitorpamplona.amethyst.model.Account
-import com.vitorpamplona.amethyst.model.DefaultChannels
-import com.vitorpamplona.amethyst.model.toByteArray
-import com.vitorpamplona.amethyst.service.NostrAccountDataSource
-import com.vitorpamplona.amethyst.service.NostrChatroomListDataSource
-import com.vitorpamplona.amethyst.service.NostrGlobalDataSource
-import com.vitorpamplona.amethyst.service.NostrHomeDataSource
-import com.vitorpamplona.amethyst.service.NostrNotificationDataSource
-import com.vitorpamplona.amethyst.service.NostrSingleEventDataSource
-import com.vitorpamplona.amethyst.service.NostrSingleUserDataSource
-import com.vitorpamplona.amethyst.service.NostrThreadDataSource
-import com.vitorpamplona.amethyst.service.relays.Client
-import com.vitorpamplona.amethyst.ui.MainActivity
 import fr.acinq.secp256k1.Hex
 import java.util.regex.Pattern
-import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
 import nostr.postr.Persona
 import nostr.postr.bechToBytes
-import nostr.postr.toHex
 
 class AccountStateViewModel(private val localPreferences: LocalPreferences): ViewModel() {
   private val _accountContent = MutableStateFlow<AccountState>(AccountState.LoggedOff)

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

@@ -18,12 +18,18 @@ class NoteCard(val note: Note): Card() {
 
 class LikeSetCard(val note: Note, val likeEvents: List<Note>): Card() {
     val createdAt = likeEvents.maxOf { it.event?.createdAt ?: 0 }
-
     override fun createdAt(): Long {
         return createdAt
     }
+    override fun id() = note.idHex + "L" + createdAt
+}
 
-    override fun id() = note.idHex + createdAt
+class ZapSetCard(val note: Note, val zapEvents: List<Note>): Card() {
+    val createdAt = zapEvents.maxOf { it.event?.createdAt ?: 0 }
+    override fun createdAt(): Long {
+        return createdAt
+    }
+    override fun id() = note.idHex + "Z" + createdAt
 }
 
 class BoostSetCard(val note: Note, val boostEvents: List<Note>): Card() {
@@ -33,7 +39,7 @@ class BoostSetCard(val note: Note, val boostEvents: List<Note>): Card() {
         return createdAt
     }
 
-    override fun id() = note.idHex + createdAt
+    override fun id() = note.idHex + "B" + createdAt
 }
 
 sealed class CardFeedState {