Merge pull request #1388 from vitorpamplona/full-outbox

Full outbox

.gitignore

@@ -14,6 +14,7 @@
 /.idea/studiobot.xml
 /.idea/other.xml
 /.idea/runConfigurations.xml
+/.idea/ChatHistory_schema_v2.xml
 .DS_Store
 /build
 /captures

.idea/deviceManager.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="DeviceTable">
+    <option name="columnSorters">
+      <list>
+        <ColumnSorterState>
+          <option name="column" value="Name" />
+          <option name="order" value="ASCENDING" />
+        </ColumnSorterState>
+      </list>
+    </option>
+  </component>
+</project>

.idea/kotlinNotebook.xml

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

.idea/kotlinc.xml

@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="Kotlin2JsCompilerArguments">
+    <option name="moduleKind" value="plain" />
+  </component>
+  <component name="Kotlin2JvmCompilerArguments">
+    <option name="jvmTarget" value="1.8" />
+  </component>
   <component name="KotlinJpsPluginSettings">
     <option name="version" value="2.1.0" />
   </component>

README.md

@@ -175,7 +175,7 @@ Lastly, the user's account information (private key/pub key) is stored in the An
 ## Setup
 
 Make sure to have the following pre-requisites installed:
-1. Java 17+
+1. Java 21+
 2. Android Studio
 3. Android 8.0+ Phone or Emulation setup
 

amethyst/build.gradle

@@ -9,20 +9,20 @@ plugins {
 }
 
 android {
-    namespace 'com.vitorpamplona.amethyst'
-    compileSdk libs.versions.android.compileSdk.get().toInteger()
+    namespace = 'com.vitorpamplona.amethyst'
+    compileSdk = libs.versions.android.compileSdk.get().toInteger()
 
     defaultConfig {
-        applicationId "com.vitorpamplona.amethyst"
-        minSdk libs.versions.android.minSdk.get().toInteger()
-        targetSdk libs.versions.android.targetSdk.get().toInteger()
-        versionCode 418
-        versionName "0.94.3"
+        applicationId = "com.vitorpamplona.amethyst"
+        minSdk = libs.versions.android.minSdk.get().toInteger()
+        targetSdk = libs.versions.android.targetSdk.get().toInteger()
+        versionCode = 418
+        versionName = "0.94.3"
         buildConfigField "String", "RELEASE_NOTES_ID", "\"fd42b23b9ef792059b1c1a89555443abbb11578f4b3c8430b452559eec7325f3\""
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {
-            useSupportLibrary true
+            useSupportLibrary = true
         }
         resourceConfigurations += [
             'ar',
@@ -107,7 +107,7 @@ android {
     buildTypes {
         release {
             proguardFiles getDefaultProguardFile("proguard-android-optimize.txt"), 'proguard-rules.pro'
-            minifyEnabled true
+            minifyEnabled = true
         }
         debug {
             applicationIdSuffix '.debug'
@@ -119,8 +119,8 @@ android {
             applicationIdSuffix '.benchmark'
             versionNameSuffix '-BENCHMARK'
             resValue "string", "app_name", "@string/app_name_benchmark"
-            profileable true
-            signingConfig signingConfigs.debug
+            profileable = true
+            signingConfig = signingConfigs.debug
         }
     }
 
@@ -139,10 +139,10 @@ android {
 
     splits {
         abi {
-            enable true
+            enable = true
             reset()
             include "x86", "x86_64", "arm64-v8a", "armeabi-v7a"
-            universalApk true
+            universalApk = true
         }
     }
 
@@ -152,8 +152,8 @@ android {
     }
 
     buildFeatures {
-        compose true
-        buildConfig true
+        compose = true
+        buildConfig = true
     }
 
     packagingOptions {
@@ -171,6 +171,17 @@ android {
     }
 }
 
+// TODO: until google merges and unifiedpush updates https://github.com/tink-crypto/tink-java-apps/pull/5
+configurations.all {
+    def tink = "com.google.crypto.tink:tink-android:1.17.0"
+    resolutionStrategy {
+        force(tink)
+        dependencySubstitution {
+            substitute module('com.google.crypto.tink:tink') using module(tink)
+        }
+    }
+}
+
 kotlin {
     compilerOptions {
         jvmTarget = JvmTarget.JVM_17
@@ -222,9 +233,11 @@ dependencies {
 
     // Websockets API
     implementation libs.okhttp
+    implementation libs.okhttpCoroutines
 
     // Encrypted Key Storage
     implementation libs.androidx.security.crypto.ktx
+    implementation libs.androidx.datastore.preferences
 
     // view videos
     implementation libs.androidx.media3.exoplayer

amethyst/src/androidTest/java/com/vitorpamplona/amethyst/CashuBTest.kt

@@ -21,8 +21,8 @@
 package com.vitorpamplona.amethyst
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.vitorpamplona.amethyst.service.CashuProcessor
-import com.vitorpamplona.amethyst.service.CashuToken
+import com.vitorpamplona.amethyst.service.cashu.CashuParser
+import com.vitorpamplona.amethyst.service.cashu.CashuToken
 import com.vitorpamplona.amethyst.ui.components.GenericLoadable
 import junit.framework.TestCase.assertEquals
 import kotlinx.coroutines.runBlocking
@@ -38,7 +38,7 @@ class CashuBTest {
     @Test()
     fun parseCashuA() {
         runBlocking {
-            val parsed = (CashuProcessor().parse(cashuTokenA) as GenericLoadable.Loaded<List<CashuToken>>).loaded[0]
+            val parsed = (CashuParser().parse(cashuTokenA) as GenericLoadable.Loaded<List<CashuToken>>).loaded[0]
 
             assertEquals(cashuTokenA, parsed.token)
             assertEquals("https://8333.space:3338", parsed.mint)
@@ -59,7 +59,7 @@ class CashuBTest {
     @Test()
     fun parseCashuB() =
         runBlocking {
-            val parsed = (CashuProcessor().parse(cashuTokenB1) as GenericLoadable.Loaded<List<CashuToken>>).loaded
+            val parsed = (CashuParser().parse(cashuTokenB1) as GenericLoadable.Loaded<List<CashuToken>>).loaded
 
             assertEquals(cashuTokenB1, parsed[0].token)
             assertEquals("http://localhost:3338", parsed[0].mint)
@@ -84,7 +84,7 @@ class CashuBTest {
     @Test()
     fun parseCashuB2() =
         runBlocking {
-            val parsed = (CashuProcessor().parse(cashuTokenB2) as GenericLoadable.Loaded<List<CashuToken>>).loaded
+            val parsed = (CashuParser().parse(cashuTokenB2) as GenericLoadable.Loaded<List<CashuToken>>).loaded
 
             assertEquals(cashuTokenB2, parsed[0].token)
             assertEquals("http://lbutlh5lfggq5r7xpiwhrajdl7sxpupgagazxl65w4c5cg72wtofasad.onion:3338", parsed[0].mint)

amethyst/src/androidTest/java/com/vitorpamplona/amethyst/DMFileDecryptionTest.kt

@@ -58,7 +58,6 @@ class DMFileDecryptionTest {
         val request =
             Request
                 .Builder()
-                .header("User-Agent", "Amethyst/${BuildConfig.VERSION_NAME}")
                 .url(url)
                 .get()
                 .build()

amethyst/src/androidTest/java/com/vitorpamplona/amethyst/ImageUploadTesting.kt

@@ -24,8 +24,9 @@ import android.graphics.Bitmap
 import android.graphics.Color
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
-import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.AccountSettings
+import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.model.nipB7Blossom.BlossomServerListState
 import com.vitorpamplona.amethyst.service.okhttp.DefaultContentTypeInterceptor
 import com.vitorpamplona.amethyst.service.uploads.FileHeader
 import com.vitorpamplona.amethyst.service.uploads.ImageDownloader
@@ -37,6 +38,8 @@ import com.vitorpamplona.amethyst.ui.actions.mediaServers.ServerName
 import com.vitorpamplona.amethyst.ui.actions.mediaServers.ServerType
 import com.vitorpamplona.quartz.nip01Core.core.toHexKey
 import com.vitorpamplona.quartz.nip01Core.crypto.KeyPair
+import com.vitorpamplona.quartz.nip01Core.signers.NostrSignerInternal
+import com.vitorpamplona.quartz.nip98HttpAuth.HTTPAuthorizationEvent
 import com.vitorpamplona.quartz.utils.sha256.sha256
 import junit.framework.TestCase.assertEquals
 import junit.framework.TestCase.fail
@@ -48,6 +51,7 @@ import okhttp3.OkHttpClient
 import org.junit.Assert
 import org.junit.Ignore
 import org.junit.Test
+import org.junit.runner.Request.method
 import org.junit.runner.RunWith
 import java.io.ByteArrayOutputStream
 import kotlin.random.Random
@@ -55,10 +59,17 @@ import kotlin.random.Random
 @RunWith(AndroidJUnit4::class)
 class ImageUploadTesting {
     companion object {
-        val account =
-            Account(
-                AccountSettings(KeyPair()),
-                scope = CoroutineScope(Dispatchers.IO + SupervisorJob()),
+        val accountSettings = AccountSettings(KeyPair())
+        val signer = NostrSignerInternal(accountSettings.keyPair)
+        val scope = CoroutineScope(Dispatchers.IO + SupervisorJob())
+        val cache = LocalCache
+
+        val blossomServerListState =
+            BlossomServerListState(
+                signer = signer,
+                cache = cache,
+                scope = scope,
+                settings = accountSettings,
             )
     }
 
@@ -107,7 +118,7 @@ class ImageUploadTesting {
                     sensitiveContent = null,
                     serverBaseUrl = server.baseUrl,
                     okHttpClient = { client },
-                    httpAuth = account::createBlossomUploadAuth,
+                    httpAuth = blossomServerListState::createBlossomUploadAuth,
                     context = InstrumentationRegistry.getInstrumentation().targetContext,
                 )
 
@@ -135,25 +146,27 @@ class ImageUploadTesting {
                     { client },
                 )
 
-        val paylod = getBitmap()
-        val inputStream = paylod.inputStream()
+        val payload = getBitmap()
+        val inputStream = payload.inputStream()
         val result =
             Nip96Uploader()
                 .upload(
                     inputStream = inputStream,
-                    length = paylod.size.toLong(),
+                    length = payload.size.toLong(),
                     contentType = "image/png",
                     alt = null,
                     sensitiveContent = null,
                     server = serverInfo,
                     okHttpClient = { client },
                     onProgress = {},
-                    httpAuth = account::createHTTPAuthorization,
+                    httpAuth = { url, method, body ->
+                        signer.sign(HTTPAuthorizationEvent.build(url, method, body))
+                    },
                     context = InstrumentationRegistry.getInstrumentation().targetContext,
                 )
 
         val url = result.url!!
-        val size = result.size
+        val size = result.size?.toInt()
         val dim = result.dimension
         val hash = result.sha256
 
@@ -179,7 +192,7 @@ class ImageUploadTesting {
                     assertEquals("${server.name}: Invalid dimensions", it.dim.toString(), dim.toString())
                 }
                 if (size != null) {
-                    assertEquals("${server.name}: Invalid size", it.size.toString(), size)
+                    assertEquals("${server.name}: Invalid size", it.size, size)
                 }
             },
             onFailure = { fail("${server.name}: It should not fail") },
@@ -221,6 +234,7 @@ class ImageUploadTesting {
             testBase(ServerName("sove", "https://sove.rent", ServerType.NIP96))
         }
 
+    @Ignore("Not Working anymore")
     @Test()
     fun testNostrBuild() =
         runBlocking {
@@ -235,6 +249,7 @@ class ImageUploadTesting {
         }
 
     @Test()
+    @Ignore("Not Working anymore")
     fun testVoidCat() =
         runBlocking {
             testBase(ServerName("void.cat", "https://void.cat", ServerType.NIP96))

amethyst/src/androidTest/java/com/vitorpamplona/amethyst/OkHttpOtsTest.kt

@@ -25,17 +25,15 @@ import com.vitorpamplona.amethyst.service.ots.OkHttpBitcoinExplorer
 import com.vitorpamplona.amethyst.service.ots.OkHttpCalendarBuilder
 import com.vitorpamplona.amethyst.service.ots.OtsBlockHeightCache
 import com.vitorpamplona.quartz.nip01Core.crypto.KeyPair
-import com.vitorpamplona.quartz.nip01Core.jackson.EventMapper
+import com.vitorpamplona.quartz.nip01Core.jackson.JsonMapper
 import com.vitorpamplona.quartz.nip01Core.signers.NostrSignerInternal
 import com.vitorpamplona.quartz.nip03Timestamp.OtsEvent
 import com.vitorpamplona.quartz.nip03Timestamp.OtsResolver
 import junit.framework.TestCase.assertEquals
+import kotlinx.coroutines.runBlocking
 import okhttp3.OkHttpClient
-import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
-import java.util.concurrent.CountDownLatch
-import java.util.concurrent.TimeUnit
 
 @RunWith(AndroidJUnit4::class)
 class OkHttpOtsTest {
@@ -49,30 +47,30 @@ class OkHttpOtsTest {
     val resolver =
         OtsResolver(
             OkHttpBitcoinExplorer(
-                OkHttpBitcoinExplorer.MEMPOOL_API_URL,
+                baseAPI = OkHttpBitcoinExplorer.MEMPOOL_API_URL,
                 client = OkHttpClient.Builder().build(),
-                otsCache,
+                cache = otsCache,
             ),
             OkHttpCalendarBuilder { OkHttpClient.Builder().build() },
         )
 
     @Test
     fun verifyNostrEvent() {
-        val ots = EventMapper.fromJson(otsEvent) as OtsEvent
+        val ots = JsonMapper.fromJson(otsEvent) as OtsEvent
         println(resolver.info(ots.otsByteArray()))
         assertEquals(1707688818L, ots.verify(resolver))
     }
 
     @Test
     fun verifyNostrEvent2() {
-        val ots = EventMapper.fromJson(otsEvent2) as OtsEvent
+        val ots = JsonMapper.fromJson(otsEvent2) as OtsEvent
         println(resolver.info(ots.otsByteArray()))
         assertEquals(1706322179L, ots.verify(resolver))
     }
 
     @Test
     fun verifyNostrPendingEvent() {
-        val ots = EventMapper.fromJson(otsPendingEvent) as OtsEvent
+        val ots = JsonMapper.fromJson(otsPendingEvent) as OtsEvent
         println(resolver.info(ots.otsByteArray()))
         assertEquals(null, ots.verify(resolver))
     }
@@ -80,20 +78,15 @@ class OkHttpOtsTest {
     @Test
     fun createOTSEventAndVerify() {
         val signer = NostrSignerInternal(KeyPair())
-        var ots: OtsEvent? = null
-
-        val countDownLatch = CountDownLatch(1)
 
         val otsFile = OtsEvent.stamp(otsEvent2Digest, resolver)
 
-        signer.sign(OtsEvent.build(otsEvent2Digest, otsFile)) {
-            ots = it
-            countDownLatch.countDown()
-        }
+        val ots =
+            runBlocking {
+                signer.sign(OtsEvent.build(otsEvent2Digest, otsFile))
+            }
 
-        Assert.assertTrue(countDownLatch.await(1, TimeUnit.SECONDS))
-
-        println(ots!!.toJson())
+        println(ots.toJson())
         println(resolver.info(ots.otsByteArray()))
 
         // Should not be valid because we need to wait for confirmations

amethyst/src/fdroid/java/com/vitorpamplona/amethyst/service/notifications/PushDistributorHandler.kt

@@ -89,14 +89,14 @@ object PushDistributorHandler : PushDistributorActions {
 
     override fun saveDistributor(distributor: String) {
         unifiedPush.saveDistributor(appContext(), distributor)
-        unifiedPush.registerApp(appContext())
+        unifiedPush.register(appContext())
     }
 
     override fun removeSavedDistributor() {
-        unifiedPush.safeRemoveDistributor(appContext())
+        unifiedPush.removeDistributor(appContext())
     }
 
     fun forceRemoveDistributor(context: Context) {
-        unifiedPush.forceRemoveDistributor(context)
+        UnifiedPush.removeDistributor(context)
     }
 }

amethyst/src/fdroid/java/com/vitorpamplona/amethyst/service/notifications/PushMessageReceiver.kt

@@ -34,7 +34,10 @@ import com.vitorpamplona.quartz.nip59Giftwrap.wraps.GiftWrapEvent
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
+import org.unifiedpush.android.connector.FailedReason
 import org.unifiedpush.android.connector.MessagingReceiver
+import org.unifiedpush.android.connector.data.PushEndpoint
+import org.unifiedpush.android.connector.data.PushMessage
 
 class PushMessageReceiver : MessagingReceiver() {
     companion object {
@@ -48,10 +51,10 @@ class PushMessageReceiver : MessagingReceiver() {
 
     override fun onMessage(
         context: Context,
-        message: ByteArray,
+        message: PushMessage,
         instance: String,
     ) {
-        val messageStr = message.decodeToString()
+        val messageStr = message.content.decodeToString()
         Log.d(TAG, "New message $messageStr for Instance: $instance")
         scope.launch {
             try {
@@ -81,10 +84,10 @@ class PushMessageReceiver : MessagingReceiver() {
 
     override fun onNewEndpoint(
         context: Context,
-        endpoint: String,
+        endpoint: PushEndpoint,
         instance: String,
     ) {
-        val sanitizedEndpoint = if (endpoint.endsWith("?up=1")) endpoint.dropLast(5) else endpoint
+        val sanitizedEndpoint = if (endpoint.url.endsWith("?up=1")) endpoint.url.dropLast(5) else endpoint.url
         if (sanitizedEndpoint != pushHandler.getSavedEndpoint()) {
             Log.d(TAG, "New endpoint provided:- $endpoint for Instance: $instance ${pushHandler.getSavedEndpoint()} $sanitizedEndpoint")
             pushHandler.setEndpoint(sanitizedEndpoint)
@@ -102,6 +105,7 @@ class PushMessageReceiver : MessagingReceiver() {
 
     override fun onRegistrationFailed(
         context: Context,
+        reason: FailedReason,
         instance: String,
     ) {
         Log.d(TAG, "Registration failed for Instance: $instance")

amethyst/src/fdroid/java/com/vitorpamplona/amethyst/ui/components/TranslatableRichTextViewer.kt

@@ -24,7 +24,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.MutableState
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
-import com.vitorpamplona.amethyst.ui.navigation.INav
+import com.vitorpamplona.amethyst.ui.navigation.navs.INav
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.quartz.nip02FollowList.ImmutableListOfLists
 

amethyst/src/main/AndroidManifest.xml

@@ -23,6 +23,9 @@
     <!-- To take pictures -->
     <uses-permission android:name="android.permission.CAMERA" />
 
+    <!-- To record audio messages -->
+    <uses-permission android:name="android.permission.RECORD_AUDIO" />
+
     <!-- To read NFCs that contain nostr:<NIP19> -->
     <uses-permission android:name="android.permission.NFC" />
 

amethyst/src/main/java/com/vitorpamplona/amethyst/Amethyst.kt

@@ -37,17 +37,19 @@ import com.vitorpamplona.amethyst.service.notifications.PokeyReceiver
 import com.vitorpamplona.amethyst.service.okhttp.DualHttpClientManager
 import com.vitorpamplona.amethyst.service.okhttp.EncryptionKeyCache
 import com.vitorpamplona.amethyst.service.okhttp.OkHttpWebSocket
+import com.vitorpamplona.amethyst.service.okhttp.ProxySettingsAnchor
 import com.vitorpamplona.amethyst.service.ots.OtsBlockHeightCache
 import com.vitorpamplona.amethyst.service.playback.diskCache.VideoCache
 import com.vitorpamplona.amethyst.service.playback.diskCache.VideoCacheFactory
 import com.vitorpamplona.amethyst.service.relayClient.CacheClientConnector
-import com.vitorpamplona.amethyst.service.relayClient.RelaySpeedLogger
+import com.vitorpamplona.amethyst.service.relayClient.RelayProxyClientConnector
 import com.vitorpamplona.amethyst.service.relayClient.authCommand.model.AuthCoordinator
 import com.vitorpamplona.amethyst.service.relayClient.notifyCommand.model.NotifyCoordinator
 import com.vitorpamplona.amethyst.service.relayClient.reqCommand.RelaySubscriptionsCoordinator
+import com.vitorpamplona.amethyst.service.relayClient.speedLogger.RelaySpeedLogger
 import com.vitorpamplona.amethyst.service.uploads.nip95.Nip95CacheFactory
 import com.vitorpamplona.amethyst.ui.tor.TorManager
-import com.vitorpamplona.ammolite.relays.NostrClient
+import com.vitorpamplona.quartz.nip01Core.relay.client.NostrClient
 import com.vitorpamplona.quartz.nip03Timestamp.VerificationStateCache
 import kotlinx.coroutines.CoroutineExceptionHandler
 import kotlinx.coroutines.CoroutineScope
@@ -89,38 +91,40 @@ class Amethyst : Application() {
             scope = applicationIOScope,
         )
 
-    // Connects the NostrClient class with okHttp
-    val factory =
-        OkHttpWebSocket.BuilderFactory { _, useProxy ->
-            okHttpClients.getHttpClient(useProxy)
-        }
+    val torProxySettingsAnchor = ProxySettingsAnchor()
 
-    // Provides a relay pool
-    val client: NostrClient = NostrClient(factory)
+    // Connects the NostrClient class with okHttp
+    val websocketBuilder =
+        OkHttpWebSocket.Builder { url ->
+            okHttpClients.getHttpClient(torProxySettingsAnchor.useProxy(url))
+        }
 
     // Caches all events in Memory
     val cache: LocalCache = LocalCache
 
+    // Organizes cache clearing
+    val trimmingService = MemoryTrimmingService(cache)
+
+    // Provides a relay pool
+    val client: NostrClient = NostrClient(websocketBuilder, applicationIOScope)
+
+    // Watches for changes on Tor and Relay List Settings
+    val relayProxyClientConnector = RelayProxyClientConnector(torProxySettingsAnchor, okHttpClients, connManager, client, applicationIOScope)
+
     // Verifies and inserts in the cache from all relays, all subscriptions
-    val cacheClientConnector = CacheClientConnector(client, cache)
+    val cacheClientConnector = CacheClientConnector(client, cache, applicationIOScope)
 
     // Show messages from the Relay and controls their dismissal
     val notifyCoordinator = NotifyCoordinator(client)
 
     // Authenticates with relays.
-    val authCoordinator = AuthCoordinator(client)
+    val authCoordinator = AuthCoordinator(client, applicationIOScope)
 
     val logger = if (isDebug) RelaySpeedLogger(client) else null
 
-    // Organizes cache clearing
-    val trimmingService = MemoryTrimmingService(cache)
-
     // Coordinates all subscriptions for the Nostr Client
     val sources: RelaySubscriptionsCoordinator = RelaySubscriptionsCoordinator(LocalCache, client, applicationIOScope)
 
-    // Trash.
-    val serviceManager = ServiceManager(client, applicationIOScope)
-
     // saves the .content of NIP-95 blobs in disk to save memory
     val nip95cache: File by lazy { Nip95CacheFactory.new(this) }
 
@@ -150,7 +154,10 @@ class Amethyst : Application() {
         }
 
         // initializes diskcache on an IO thread.
-        applicationIOScope.launch { videoCache }
+        applicationIOScope.launch {
+            diskCache
+            videoCache
+        }
 
         // registers to receive events
         pokeyReceiver.register(this)

amethyst/src/main/java/com/vitorpamplona/amethyst/DebugUtils.kt

@@ -30,12 +30,13 @@ import com.vitorpamplona.amethyst.model.LocalCache
 import kotlin.time.DurationUnit
 import kotlin.time.measureTimedValue
 
+@Suppress("SENSELESS_COMPARISON")
 val isDebug = BuildConfig.DEBUG || BuildConfig.BUILD_TYPE == "benchmark"
 
 fun debugState(context: Context) {
-    Amethyst.instance.client
-        .allSubscriptions()
-        .forEach { Log.d("STATE DUMP", "${it.key} ${it.value.joinToString { it.filter.toDebugJson() }}") }
+    // Amethyst.instance.client
+    //    .allSubscriptions()
+    //    .forEach { Log.d("STATE DUMP", "${it.key} ${it.value.filters.joinToString { it.filter.toJson() }}") }
 
     val totalMemoryMb = Runtime.getRuntime().totalMemory() / (1024 * 1024)
     val freeMemoryMb = Runtime.getRuntime().freeMemory() / (1024 * 1024)
@@ -58,7 +59,16 @@ fun debugState(context: Context) {
         Log.d("STATE DUMP", "Memory Class $memClass MB (largeHeap $isLargeHeap)")
     }
 
-    Log.d("STATE DUMP", "Connected Relays: " + Amethyst.instance.client.connectedRelays())
+    Log.d(
+        "STATE DUMP",
+        "Connected Relays: " +
+            Amethyst.instance.client
+                .relayStatusFlow()
+                .value.connected.size + "/" +
+            Amethyst.instance.client
+                .relayStatusFlow()
+                .value.available.size,
+    )
 
     Log.d(
         "STATE DUMP",
@@ -112,7 +122,7 @@ fun debugState(context: Context) {
     Log.d(
         "STATE DUMP",
         "Spam: " +
-            LocalCache.antiSpam.spamMessages.size() + " / " + LocalCache.antiSpam.recentMessages.size(),
+            LocalCache.antiSpam.spamMessages.size() + " / " + LocalCache.antiSpam.recentEventIds.size() + " / " + LocalCache.antiSpam.recentAddressables.size(),
     )
 
     Log.d(
@@ -132,21 +142,24 @@ fun debugState(context: Context) {
         LocalCache.addressables
             .sumByGroup(groupMap = { _, it -> it.event?.kind }, sumOf = { _, it -> it.event?.countMemory() ?: 0L })
 
-    qttNotes.toList().sortedByDescending { bytesNotes.get(it.first) }.forEach { (kind, qtt) ->
-        Log.d("STATE DUMP", "Kind ${kind.toString().padStart(5,' ')}:\t${qtt.toString().padStart(6,' ')} elements\t${bytesNotes.get(kind)?.div((1024 * 1024))}MB ")
+    qttNotes.toList().sortedByDescending { bytesNotes[it.first] }.forEach { (kind, qtt) ->
+        Log.d("STATE DUMP", "Kind ${kind.toString().padStart(5,' ')}:\t${qtt.toString().padStart(6,' ')} elements\t${bytesNotes[kind]?.div((1024 * 1024))}MB ")
     }
-    qttAddressables.toList().sortedByDescending { bytesNotes.get(it.first) }.forEach { (kind, qtt) ->
-        Log.d("STATE DUMP", "Kind ${kind.toString().padStart(5,' ')}:\t${qtt.toString().padStart(6,' ')} elements\t${bytesAddressables.get(kind)?.div((1024 * 1024))}MB ")
+    qttAddressables.toList().sortedByDescending { bytesNotes[it.first] }.forEach { (kind, qtt) ->
+        Log.d("STATE DUMP", "Kind ${kind.toString().padStart(5,' ')}:\t${qtt.toString().padStart(6,' ')} elements\t${bytesAddressables[kind]?.div((1024 * 1024))}MB ")
     }
 }
 
 inline fun <T> logTime(
     debugMessage: String,
+    minToReportMs: Int = 1,
     block: () -> T,
 ): T =
     if (isDebug) {
         val (result, elapsed) = measureTimedValue(block)
-        Log.d("DEBUG-TIME", "${elapsed.toString(DurationUnit.MILLISECONDS, 3).padStart(12)}: $debugMessage")
+        if (elapsed.inWholeMilliseconds > minToReportMs) {
+            Log.d("DEBUG-TIME", "${elapsed.toString(DurationUnit.MILLISECONDS, 3).padStart(12)}: $debugMessage")
+        }
         result
     } else {
         block()
@@ -154,11 +167,14 @@ inline fun <T> logTime(
 
 inline fun <T> logTime(
     debugMessage: (T) -> String,
+    minToReportMs: Int = 1,
     block: () -> T,
 ): T =
     if (isDebug) {
         val (result, elapsed) = measureTimedValue(block)
-        Log.d("DEBUG-TIME", "${elapsed.toString(DurationUnit.MILLISECONDS, 3).padStart(12)}: ${debugMessage(result)}")
+        if (elapsed.inWholeMilliseconds > minToReportMs) {
+            Log.d("DEBUG-TIME", "${elapsed.toString(DurationUnit.MILLISECONDS, 3).padStart(12)}: ${debugMessage(result)}")
+        }
         result
     } else {
         block()

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

@@ -27,33 +27,37 @@ import android.util.Log
 import androidx.compose.runtime.Immutable
 import androidx.core.content.edit
 import com.fasterxml.jackson.module.kotlin.readValue
+import com.vitorpamplona.amethyst.model.ALL_FOLLOWS
 import com.vitorpamplona.amethyst.model.AccountSettings
 import com.vitorpamplona.amethyst.model.GLOBAL_FOLLOWS
-import com.vitorpamplona.amethyst.model.KIND3_FOLLOWS
 import com.vitorpamplona.amethyst.model.Settings
 import com.vitorpamplona.amethyst.service.checkNotInMainThread
 import com.vitorpamplona.amethyst.ui.actions.mediaServers.DEFAULT_MEDIA_SERVERS
 import com.vitorpamplona.amethyst.ui.actions.mediaServers.ServerName
 import com.vitorpamplona.amethyst.ui.tor.TorSettings
 import com.vitorpamplona.amethyst.ui.tor.TorSettingsFlow
-import com.vitorpamplona.ammolite.relays.RelaySetupInfo
-import com.vitorpamplona.quartz.experimental.edits.PrivateOutboxRelayListEvent
 import com.vitorpamplona.quartz.experimental.ephemChat.list.EphemeralChatListEvent
 import com.vitorpamplona.quartz.nip01Core.core.Event
 import com.vitorpamplona.quartz.nip01Core.core.HexKey
 import com.vitorpamplona.quartz.nip01Core.core.hexToByteArray
 import com.vitorpamplona.quartz.nip01Core.core.toHexKey
 import com.vitorpamplona.quartz.nip01Core.crypto.KeyPair
-import com.vitorpamplona.quartz.nip01Core.jackson.EventMapper
+import com.vitorpamplona.quartz.nip01Core.jackson.JsonMapper
 import com.vitorpamplona.quartz.nip01Core.metadata.MetadataEvent
 import com.vitorpamplona.quartz.nip02FollowList.ContactListEvent
 import com.vitorpamplona.quartz.nip17Dm.settings.ChatMessageRelayListEvent
 import com.vitorpamplona.quartz.nip19Bech32.toNpub
 import com.vitorpamplona.quartz.nip28PublicChat.list.ChannelListEvent
+import com.vitorpamplona.quartz.nip37Drafts.privateOutbox.PrivateOutboxRelayListEvent
 import com.vitorpamplona.quartz.nip47WalletConnect.Nip47WalletConnect
 import com.vitorpamplona.quartz.nip50Search.SearchRelayListEvent
-import com.vitorpamplona.quartz.nip51Lists.MuteListEvent
+import com.vitorpamplona.quartz.nip51Lists.geohashList.GeohashListEvent
+import com.vitorpamplona.quartz.nip51Lists.hashtagList.HashtagListEvent
+import com.vitorpamplona.quartz.nip51Lists.muteList.MuteListEvent
+import com.vitorpamplona.quartz.nip51Lists.relayLists.BlockedRelayListEvent
+import com.vitorpamplona.quartz.nip51Lists.relayLists.TrustedRelayListEvent
 import com.vitorpamplona.quartz.nip65RelayList.AdvertisedRelayListEvent
+import com.vitorpamplona.quartz.nip72ModCommunities.follow.CommunityListEvent
 import com.vitorpamplona.quartz.nip78AppData.AppSpecificDataEvent
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.Dispatchers
@@ -82,7 +86,6 @@ private object PrefKeys {
     const val SAVED_ACCOUNTS = "all_saved_accounts"
     const val NOSTR_PRIVKEY = "nostr_privkey"
     const val NOSTR_PUBKEY = "nostr_pubkey"
-    const val RELAYS = "relays"
     const val LOCAL_RELAY_SERVERS = "localRelayServers"
     const val DEFAULT_FILE_SERVER = "defaultFileServer"
     const val DEFAULT_HOME_FOLLOW_LIST = "defaultHomeFollowList"
@@ -95,10 +98,15 @@ private object PrefKeys {
     const val LATEST_DM_RELAY_LIST = "latestDMRelayList"
     const val LATEST_NIP65_RELAY_LIST = "latestNIP65RelayList"
     const val LATEST_SEARCH_RELAY_LIST = "latestSearchRelayList"
+    const val LATEST_BLOCKED_RELAY_LIST = "latestBlockedRelayList"
+    const val LATEST_TRUSTED_RELAY_LIST = "latestTrustedRelayList"
     const val LATEST_MUTE_LIST = "latestMuteList"
     const val LATEST_PRIVATE_HOME_RELAY_LIST = "latestPrivateHomeRelayList"
     const val LATEST_APP_SPECIFIC_DATA = "latestAppSpecificData"
     const val LATEST_CHANNEL_LIST = "latestChannelList"
+    const val LATEST_COMMUNITY_LIST = "latestCommunityList"
+    const val LATEST_HASHTAG_LIST = "latestHashtagList"
+    const val LATEST_GEOHASH_LIST = "latestGeohashList"
     const val LATEST_EPHEMERAL_LIST = "latestEphemeralChatList"
     const val HIDE_DELETE_REQUEST_DIALOG = "hide_delete_request_dialog"
     const val HIDE_BLOCK_ALERT_DIALOG = "hide_block_alert_dialog"
@@ -120,8 +128,8 @@ object LocalPreferences {
     private const val COMMA = ","
 
     private var currentAccount: String? = null
-    private var savedAccounts: MutableStateFlow<List<AccountInfo>?> = MutableStateFlow(null)
-    private var cachedAccounts: MutableMap<String, AccountSettings?> = mutableMapOf()
+    private val savedAccounts: MutableStateFlow<List<AccountInfo>?> = MutableStateFlow(null)
+    private val cachedAccounts: MutableMap<String, AccountSettings?> = mutableMapOf()
 
     suspend fun currentAccount(): String? {
         if (currentAccount == null) {
@@ -155,7 +163,7 @@ object LocalPreferences {
                 with(encryptedPreferences()) {
                     val newSystemOfAccounts =
                         getString(PrefKeys.ALL_ACCOUNT_INFO, "[]")?.let {
-                            EventMapper.mapper.readValue<List<AccountInfo>>(it)
+                            JsonMapper.mapper.readValue<List<AccountInfo>>(it)
                         }
 
                     if (!newSystemOfAccounts.isNullOrEmpty()) {
@@ -175,7 +183,7 @@ object LocalPreferences {
 
                         savedAccounts.emit(migrated)
 
-                        edit { putString(PrefKeys.ALL_ACCOUNT_INFO, EventMapper.mapper.writeValueAsString(savedAccounts.value)) }
+                        edit { putString(PrefKeys.ALL_ACCOUNT_INFO, JsonMapper.mapper.writeValueAsString(savedAccounts.value)) }
                     }
                 }
             }
@@ -195,7 +203,7 @@ object LocalPreferences {
                     .edit {
                         putString(
                             PrefKeys.ALL_ACCOUNT_INFO,
-                            EventMapper.mapper.writeValueAsString(accounts.filter { !it.isTransient }),
+                            JsonMapper.mapper.writeValueAsString(accounts.filter { !it.isTransient }),
                         )
                     }
             }
@@ -249,7 +257,7 @@ object LocalPreferences {
                 if (npub == null) DEBUG_PREFERENCES_NAME else "${DEBUG_PREFERENCES_NAME}_$npub"
             Amethyst.instance.getSharedPreferences(preferenceFile, Context.MODE_PRIVATE)
         } else {
-            return Amethyst.instance.encryptedStorage(npub)
+            Amethyst.instance.encryptedStorage(npub)
         }
     }
 
@@ -262,7 +270,7 @@ object LocalPreferences {
      * deleted
      */
     @SuppressLint("ApplySharedPref")
-    suspend fun updatePrefsForLogout(accountInfo: AccountInfo) {
+    suspend fun deleteAccount(accountInfo: AccountInfo) {
         Log.d("LocalPreferences", "Saving to encrypted storage updatePrefsForLogout ${accountInfo.npub}")
         withContext(Dispatchers.IO) {
             encryptedPreferences(accountInfo.npub).edit(commit = true) { clear() }
@@ -277,7 +285,7 @@ object LocalPreferences {
         }
     }
 
-    suspend fun updatePrefsForLogin(accountSettings: AccountSettings) {
+    suspend fun setDefaultAccount(accountSettings: AccountSettings) {
         setCurrentAccount(accountSettings)
         saveToEncryptedStorage(accountSettings)
     }
@@ -299,11 +307,10 @@ object LocalPreferences {
                         settings.keyPair.privKey?.let { putString(PrefKeys.NOSTR_PRIVKEY, it.toHexKey()) }
                     }
                     settings.keyPair.pubKey.let { putString(PrefKeys.NOSTR_PUBKEY, it.toHexKey()) }
-                    putString(PrefKeys.RELAYS, EventMapper.mapper.writeValueAsString(settings.localRelays))
 
                     putString(
                         PrefKeys.DEFAULT_FILE_SERVER,
-                        EventMapper.mapper.writeValueAsString(settings.defaultFileServer),
+                        JsonMapper.mapper.writeValueAsString(settings.defaultFileServer),
                     )
                     putString(PrefKeys.DEFAULT_HOME_FOLLOW_LIST, settings.defaultHomeFollowList.value)
                     putString(PrefKeys.DEFAULT_STORIES_FOLLOW_LIST, settings.defaultStoriesFollowList.value)
@@ -317,12 +324,12 @@ object LocalPreferences {
                     )
                     putString(
                         PrefKeys.ZAP_PAYMENT_REQUEST_SERVER,
-                        EventMapper.mapper.writeValueAsString(settings.zapPaymentRequest),
+                        JsonMapper.mapper.writeValueAsString(settings.zapPaymentRequest.value?.denormalize()),
                     )
                     if (settings.backupContactList != null) {
                         putString(
                             PrefKeys.LATEST_CONTACT_LIST,
-                            EventMapper.mapper.writeValueAsString(settings.backupContactList),
+                            JsonMapper.mapper.writeValueAsString(settings.backupContactList),
                         )
                     } else {
                         remove(PrefKeys.LATEST_CONTACT_LIST)
@@ -331,7 +338,7 @@ object LocalPreferences {
                     if (settings.backupUserMetadata != null) {
                         putString(
                             PrefKeys.LATEST_USER_METADATA,
-                            EventMapper.mapper.writeValueAsString(settings.backupUserMetadata),
+                            JsonMapper.mapper.writeValueAsString(settings.backupUserMetadata),
                         )
                     } else {
                         remove(PrefKeys.LATEST_USER_METADATA)
@@ -340,7 +347,7 @@ object LocalPreferences {
                     if (settings.backupDMRelayList != null) {
                         putString(
                             PrefKeys.LATEST_DM_RELAY_LIST,
-                            EventMapper.mapper.writeValueAsString(settings.backupDMRelayList),
+                            JsonMapper.mapper.writeValueAsString(settings.backupDMRelayList),
                         )
                     } else {
                         remove(PrefKeys.LATEST_DM_RELAY_LIST)
@@ -349,7 +356,7 @@ object LocalPreferences {
                     if (settings.backupNIP65RelayList != null) {
                         putString(
                             PrefKeys.LATEST_NIP65_RELAY_LIST,
-                            EventMapper.mapper.writeValueAsString(settings.backupNIP65RelayList),
+                            JsonMapper.mapper.writeValueAsString(settings.backupNIP65RelayList),
                         )
                     } else {
                         remove(PrefKeys.LATEST_NIP65_RELAY_LIST)
@@ -358,14 +365,32 @@ object LocalPreferences {
                     if (settings.backupSearchRelayList != null) {
                         putString(
                             PrefKeys.LATEST_SEARCH_RELAY_LIST,
-                            EventMapper.mapper.writeValueAsString(settings.backupSearchRelayList),
+                            JsonMapper.mapper.writeValueAsString(settings.backupSearchRelayList),
                         )
                     } else {
                         remove(PrefKeys.LATEST_SEARCH_RELAY_LIST)
                     }
 
-                    if (settings.localRelayServers.isNotEmpty()) {
-                        putStringSet(PrefKeys.LOCAL_RELAY_SERVERS, settings.localRelayServers)
+                    if (settings.backupBlockedRelayList != null) {
+                        putString(
+                            PrefKeys.LATEST_BLOCKED_RELAY_LIST,
+                            JsonMapper.mapper.writeValueAsString(settings.backupBlockedRelayList),
+                        )
+                    } else {
+                        remove(PrefKeys.LATEST_BLOCKED_RELAY_LIST)
+                    }
+
+                    if (settings.backupTrustedRelayList != null) {
+                        putString(
+                            PrefKeys.LATEST_TRUSTED_RELAY_LIST,
+                            JsonMapper.mapper.writeValueAsString(settings.backupTrustedRelayList),
+                        )
+                    } else {
+                        remove(PrefKeys.LATEST_TRUSTED_RELAY_LIST)
+                    }
+
+                    if (settings.localRelayServers.value.isNotEmpty()) {
+                        putStringSet(PrefKeys.LOCAL_RELAY_SERVERS, settings.localRelayServers.value)
                     } else {
                         remove(PrefKeys.LOCAL_RELAY_SERVERS)
                     }
@@ -373,7 +398,7 @@ object LocalPreferences {
                     if (settings.backupMuteList != null) {
                         putString(
                             PrefKeys.LATEST_MUTE_LIST,
-                            EventMapper.mapper.writeValueAsString(settings.backupMuteList),
+                            JsonMapper.mapper.writeValueAsString(settings.backupMuteList),
                         )
                     } else {
                         remove(PrefKeys.LATEST_MUTE_LIST)
@@ -382,7 +407,7 @@ object LocalPreferences {
                     if (settings.backupPrivateHomeRelayList != null) {
                         putString(
                             PrefKeys.LATEST_PRIVATE_HOME_RELAY_LIST,
-                            EventMapper.mapper.writeValueAsString(settings.backupPrivateHomeRelayList),
+                            JsonMapper.mapper.writeValueAsString(settings.backupPrivateHomeRelayList),
                         )
                     } else {
                         remove(PrefKeys.LATEST_PRIVATE_HOME_RELAY_LIST)
@@ -391,7 +416,7 @@ object LocalPreferences {
                     if (settings.backupAppSpecificData != null) {
                         putString(
                             PrefKeys.LATEST_APP_SPECIFIC_DATA,
-                            EventMapper.mapper.writeValueAsString(settings.backupAppSpecificData),
+                            JsonMapper.mapper.writeValueAsString(settings.backupAppSpecificData),
                         )
                     } else {
                         remove(PrefKeys.LATEST_APP_SPECIFIC_DATA)
@@ -400,16 +425,43 @@ object LocalPreferences {
                     if (settings.backupChannelList != null) {
                         putString(
                             PrefKeys.LATEST_CHANNEL_LIST,
-                            EventMapper.mapper.writeValueAsString(settings.backupChannelList),
+                            JsonMapper.mapper.writeValueAsString(settings.backupChannelList),
                         )
                     } else {
                         remove(PrefKeys.LATEST_CHANNEL_LIST)
                     }
 
+                    if (settings.backupCommunityList != null) {
+                        putString(
+                            PrefKeys.LATEST_COMMUNITY_LIST,
+                            JsonMapper.mapper.writeValueAsString(settings.backupCommunityList),
+                        )
+                    } else {
+                        remove(PrefKeys.LATEST_COMMUNITY_LIST)
+                    }
+
+                    if (settings.backupHashtagList != null) {
+                        putString(
+                            PrefKeys.LATEST_HASHTAG_LIST,
+                            JsonMapper.mapper.writeValueAsString(settings.backupHashtagList),
+                        )
+                    } else {
+                        remove(PrefKeys.LATEST_HASHTAG_LIST)
+                    }
+
+                    if (settings.backupGeohashList != null) {
+                        putString(
+                            PrefKeys.LATEST_HASHTAG_LIST,
+                            JsonMapper.mapper.writeValueAsString(settings.backupGeohashList),
+                        )
+                    } else {
+                        remove(PrefKeys.LATEST_HASHTAG_LIST)
+                    }
+
                     if (settings.backupEphemeralChatList != null) {
                         putString(
                             PrefKeys.LATEST_EPHEMERAL_LIST,
-                            EventMapper.mapper.writeValueAsString(settings.backupEphemeralChatList),
+                            JsonMapper.mapper.writeValueAsString(settings.backupEphemeralChatList),
                         )
                     } else {
                         remove(PrefKeys.LATEST_EPHEMERAL_LIST)
@@ -423,7 +475,7 @@ object LocalPreferences {
                     remove(PrefKeys.USE_PROXY)
                     remove(PrefKeys.PROXY_PORT)
 
-                    putString(PrefKeys.TOR_SETTINGS, EventMapper.mapper.writeValueAsString(settings.torSettings.toSettings()))
+                    putString(PrefKeys.TOR_SETTINGS, JsonMapper.mapper.writeValueAsString(settings.torSettings.toSettings()))
 
                     val regularMap =
                         settings.lastReadPerRoute.value.mapValues {
@@ -432,13 +484,13 @@ object LocalPreferences {
 
                     putString(
                         PrefKeys.LAST_READ_PER_ROUTE,
-                        EventMapper.mapper.writeValueAsString(regularMap),
+                        JsonMapper.mapper.writeValueAsString(regularMap),
                     )
                     putStringSet(PrefKeys.HAS_DONATED_IN_VERSION, settings.hasDonatedInVersion.value)
 
                     putString(
                         PrefKeys.PENDING_ATTESTATIONS,
-                        EventMapper.mapper.writeValueAsString(settings.pendingAttestations.value),
+                        JsonMapper.mapper.writeValueAsString(settings.pendingAttestations.value),
                     )
                 }
             }
@@ -453,9 +505,8 @@ object LocalPreferences {
         prefs: SharedPreferences = encryptedPreferences(),
     ) {
         Log.d("LocalPreferences", "Saving to shared settings")
-        with(prefs.edit()) {
-            putString(PrefKeys.SHARED_SETTINGS, EventMapper.mapper.writeValueAsString(sharedSettings))
-            apply()
+        prefs.edit {
+            putString(PrefKeys.SHARED_SETTINGS, JsonMapper.mapper.writeValueAsString(sharedSettings))
         }
     }
 
@@ -463,7 +514,7 @@ object LocalPreferences {
         Log.d("LocalPreferences", "Load shared settings")
         with(prefs) {
             return try {
-                getString(PrefKeys.SHARED_SETTINGS, "{}")?.let { EventMapper.mapper.readValue<Settings>(it) }
+                getString(PrefKeys.SHARED_SETTINGS, "{}")?.let { JsonMapper.mapper.readValue<Settings>(it) }
             } catch (e: Throwable) {
                 if (e is CancellationException) throw e
                 Log.w(
@@ -471,7 +522,6 @@ object LocalPreferences {
                     "Unable to decode shared preferences: ${getString(PrefKeys.SHARED_SETTINGS, null)}",
                     e,
                 )
-                e.printStackTrace()
                 null
             }
         }
@@ -514,7 +564,7 @@ object LocalPreferences {
                             ?: if (getBoolean(PrefKeys.LOGIN_WITH_EXTERNAL_SIGNER, false)) "com.greenart7c3.nostrsigner" else null
 
                     val defaultHomeFollowList =
-                        getString(PrefKeys.DEFAULT_HOME_FOLLOW_LIST, null) ?: KIND3_FOLLOWS
+                        getString(PrefKeys.DEFAULT_HOME_FOLLOW_LIST, null) ?: ALL_FOLLOWS
                     val defaultStoriesFollowList =
                         getString(PrefKeys.DEFAULT_STORIES_FOLLOW_LIST, null) ?: GLOBAL_FOLLOWS
                     val defaultNotificationFollowList =
@@ -522,8 +572,6 @@ object LocalPreferences {
                     val defaultDiscoveryFollowList =
                         getString(PrefKeys.DEFAULT_DISCOVERY_FOLLOW_LIST, null) ?: GLOBAL_FOLLOWS
 
-                    val localRelays = parseOrNull<Set<RelaySetupInfo>>(PrefKeys.RELAYS) ?: emptySet()
-
                     val zapPaymentRequestServer = parseOrNull<Nip47WalletConnect.Nip47URI>(PrefKeys.ZAP_PAYMENT_REQUEST_SERVER)
                     val defaultFileServer = parseOrNull<ServerName>(PrefKeys.DEFAULT_FILE_SERVER) ?: DEFAULT_MEDIA_SERVERS[0]
 
@@ -535,11 +583,16 @@ object LocalPreferences {
                     val latestDmRelayList = parseEventOrNull<ChatMessageRelayListEvent>(PrefKeys.LATEST_DM_RELAY_LIST)
                     val latestNip65RelayList = parseEventOrNull<AdvertisedRelayListEvent>(PrefKeys.LATEST_NIP65_RELAY_LIST)
                     val latestSearchRelayList = parseEventOrNull<SearchRelayListEvent>(PrefKeys.LATEST_SEARCH_RELAY_LIST)
+                    val latestBlockedRelayList = parseEventOrNull<BlockedRelayListEvent>(PrefKeys.LATEST_BLOCKED_RELAY_LIST)
+                    val latestTrustedRelayList = parseEventOrNull<TrustedRelayListEvent>(PrefKeys.LATEST_TRUSTED_RELAY_LIST)
                     val latestMuteList = parseEventOrNull<MuteListEvent>(PrefKeys.LATEST_MUTE_LIST)
                     val latestPrivateHomeRelayList = parseEventOrNull<PrivateOutboxRelayListEvent>(PrefKeys.LATEST_PRIVATE_HOME_RELAY_LIST)
                     val latestAppSpecificData = parseEventOrNull<AppSpecificDataEvent>(PrefKeys.LATEST_APP_SPECIFIC_DATA)
-                    val latestEphemeralList = parseEventOrNull<EphemeralChatListEvent>(PrefKeys.LATEST_EPHEMERAL_LIST)
                     val latestChannelList = parseEventOrNull<ChannelListEvent>(PrefKeys.LATEST_CHANNEL_LIST)
+                    val latestCommunityList = parseEventOrNull<CommunityListEvent>(PrefKeys.LATEST_COMMUNITY_LIST)
+                    val latestHashtagList = parseEventOrNull<HashtagListEvent>(PrefKeys.LATEST_HASHTAG_LIST)
+                    val latestGeohashList = parseEventOrNull<GeohashListEvent>(PrefKeys.LATEST_GEOHASH_LIST)
+                    val latestEphemeralList = parseEventOrNull<EphemeralChatListEvent>(PrefKeys.LATEST_EPHEMERAL_LIST)
 
                     val hideDeleteRequestDialog = getBoolean(PrefKeys.HIDE_DELETE_REQUEST_DIALOG, false)
                     val hideBlockAlertDialog = getBoolean(PrefKeys.HIDE_BLOCK_ALERT_DIALOG, false)
@@ -559,14 +612,13 @@ object LocalPreferences {
                         keyPair = keyPair,
                         transientAccount = false,
                         externalSignerPackageName = externalSignerPackageName,
-                        localRelays = localRelays,
-                        localRelayServers = localRelayServers,
+                        localRelayServers = MutableStateFlow(localRelayServers),
                         defaultFileServer = defaultFileServer,
                         defaultHomeFollowList = MutableStateFlow(defaultHomeFollowList),
                         defaultStoriesFollowList = MutableStateFlow(defaultStoriesFollowList),
                         defaultNotificationFollowList = MutableStateFlow(defaultNotificationFollowList),
                         defaultDiscoveryFollowList = MutableStateFlow(defaultDiscoveryFollowList),
-                        zapPaymentRequest = zapPaymentRequestServer,
+                        zapPaymentRequest = MutableStateFlow(zapPaymentRequestServer?.normalize()),
                         hideDeleteRequestDialog = hideDeleteRequestDialog,
                         hideBlockAlertDialog = hideBlockAlertDialog,
                         hideNIP17WarningDialog = hideNIP17WarningDialog,
@@ -575,10 +627,15 @@ object LocalPreferences {
                         backupNIP65RelayList = latestNip65RelayList,
                         backupDMRelayList = latestDmRelayList,
                         backupSearchRelayList = latestSearchRelayList,
+                        backupBlockedRelayList = latestBlockedRelayList,
+                        backupTrustedRelayList = latestTrustedRelayList,
                         backupPrivateHomeRelayList = latestPrivateHomeRelayList,
                         backupMuteList = latestMuteList,
                         backupAppSpecificData = latestAppSpecificData,
                         backupChannelList = latestChannelList,
+                        backupCommunityList = latestCommunityList,
+                        backupHashtagList = latestHashtagList,
+                        backupGeohashList = latestGeohashList,
                         backupEphemeralChatList = latestEphemeralList,
                         torSettings = TorSettingsFlow.build(torSettings),
                         lastReadPerRoute = MutableStateFlow(lastReadPerRoute),
@@ -600,12 +657,11 @@ object LocalPreferences {
             if (T::class.java.isInstance(Event::class.java)) {
                 Event.fromJson(value) as T?
             } else {
-                EventMapper.mapper.readValue<T?>(value)
+                JsonMapper.mapper.readValue<T?>(value)
             }
         } catch (e: Throwable) {
             if (e is CancellationException) throw e
             Log.w("LocalPreferences", "Error Decoding $key from Preferences with value $value", e)
-            e.printStackTrace()
             null
         }
     }
@@ -620,7 +676,6 @@ object LocalPreferences {
         } catch (e: Throwable) {
             if (e is CancellationException) throw e
             Log.w("LocalPreferences", "Error Decoding $key from Preferences with value $value", e)
-            e.printStackTrace()
             null
         }
     }

amethyst/src/main/java/com/vitorpamplona/amethyst/ParallelUtils.kt

@@ -1,95 +0,0 @@
-/**
- * Copyright (c) 2025 Vitor Pamplona
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
- * Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 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.
- */
-package com.vitorpamplona.amethyst
-
-import kotlinx.coroutines.async
-import kotlinx.coroutines.coroutineScope
-import kotlinx.coroutines.joinAll
-import kotlinx.coroutines.suspendCancellableCoroutine
-import kotlinx.coroutines.withTimeoutOrNull
-import kotlin.coroutines.Continuation
-import kotlin.coroutines.resume
-
-/**
- * Launches an async coroutine for each item, runs the
- * function and waits for everybody to finsih
- */
-suspend fun <T> launchAndWaitAll(
-    items: List<T>,
-    asyncFunc: suspend (T) -> Unit,
-) {
-    coroutineScope {
-        val jobs =
-            items.map { next ->
-                async {
-                    asyncFunc(next)
-                }
-            }
-
-        // runs in parallel to avoid overcrowding Amber.
-        withTimeoutOrNull(15000) {
-            jobs.joinAll()
-        }
-    }
-}
-
-/**
- * Runs the function and waits for 10 seconds for any result.
- */
-suspend inline fun <T> tryAndWait(
-    timeoutMillis: Long = 10000,
-    crossinline asyncFunc: (Continuation<T>) -> Unit,
-): T? =
-    withTimeoutOrNull(timeoutMillis) {
-        suspendCancellableCoroutine { continuation ->
-            asyncFunc(continuation)
-        }
-    }
-
-/**
- * Runs an async coroutine for each one of the items,
- * runs the request for that item,
- * and gathers all the results in the output map.
- */
-suspend fun <T, K> collectSuccessfulOperations(
-    items: List<T>,
-    runRequestFor: (T, (K) -> Unit) -> Unit,
-    output: MutableList<K> = mutableListOf(),
-    onReady: suspend (List<K>) -> Unit,
-) {
-    if (items.isEmpty()) {
-        onReady(output)
-        return
-    }
-
-    launchAndWaitAll(items) {
-        val result =
-            tryAndWait { continuation ->
-                runRequestFor(it) { result: K -> continuation.resume(result) }
-            }
-
-        if (result != null) {
-            output.add(result)
-        }
-    }
-
-    onReady(output)
-}

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

@@ -1,142 +0,0 @@
-/**
- * Copyright (c) 2025 Vitor Pamplona
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
- * Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 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.
- */
-package com.vitorpamplona.amethyst
-
-import android.util.Log
-import androidx.compose.runtime.Stable
-import coil3.annotation.DelicateCoilApi
-import com.vitorpamplona.amethyst.model.Account
-import com.vitorpamplona.amethyst.model.LocalCache
-import com.vitorpamplona.ammolite.relays.NostrClient
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.flow.collectLatest
-import kotlinx.coroutines.launch
-
-@Stable
-class ServiceManager(
-    val client: NostrClient,
-    val scope: CoroutineScope,
-) {
-    // to not open amber in a loop trying to use auth relays and registering for notifications
-    private var isStarted: Boolean = false
-
-    private var account: Account? = null
-
-    private var collectorJob: Job? = null
-
-    private fun start(account: Account) {
-        this.account = account
-        start()
-    }
-
-    @OptIn(DelicateCoilApi::class)
-    private fun start() {
-        Log.d("ServiceManager", "-- May Start (hasStarted: $isStarted) for account $account")
-        if (isStarted && account != null) {
-            Log.d("ServiceManager", "---- Restarting innactive relay Services with Tor: ${account?.settings?.torSettings?.torType?.value}")
-            client.reconnect()
-            return
-        }
-        Log.d("ServiceManager", "---- Starting Relay Services with Tor: ${account?.settings?.torSettings?.torType?.value}")
-
-        val myAccount = account
-
-        if (myAccount != null) {
-            val relaySet = myAccount.connectToRelaysWithProxy.value
-            client.reconnect(relaySet)
-
-            collectorJob?.cancel()
-            collectorJob = null
-            collectorJob =
-                scope.launch {
-                    myAccount.connectToRelaysWithProxy.collectLatest {
-                        delay(500)
-                        if (isStarted) {
-                            client.reconnect(it, onlyIfChanged = true)
-                        }
-                    }
-                }
-
-            isStarted = true
-        }
-    }
-
-    private fun pause() {
-        Log.d("ServiceManager", "-- Pausing Relay Services")
-
-        collectorJob?.cancel()
-        collectorJob = null
-
-        client.reconnect(null)
-        isStarted = false
-    }
-
-    fun cleanObservers() {
-        LocalCache.cleanObservers()
-    }
-
-    // This method keeps the pause/start in a Syncronized block to
-    // avoid concurrent pauses and starts.
-    @Synchronized
-    fun forceRestart(
-        account: Account? = null,
-        start: Boolean = true,
-        pause: Boolean = true,
-    ) {
-        Log.d("ServiceManager", "-- Force Restart (start:$start) (pause:$pause) for $account")
-        if (pause) {
-            pause()
-        }
-
-        if (start) {
-            if (account != null) {
-                start(account)
-            } else {
-                start()
-            }
-        }
-    }
-
-    fun setAccountAndRestart(account: Account) {
-        forceRestart(account, true, true)
-    }
-
-    fun forceRestart() {
-        forceRestart(null, true, true)
-    }
-
-    fun justStartIfItHasAccount() {
-        if (account != null) {
-            forceRestart(null, true, false)
-        }
-    }
-
-    fun pauseForGood() {
-        forceRestart(null, false, true)
-    }
-
-    fun pauseAndLogOff() {
-        account = null
-        forceRestart(null, false, true)
-    }
-}

amethyst/src/main/java/com/vitorpamplona/amethyst/model/AccountSettings.kt

@@ -20,34 +20,41 @@
  */
 package com.vitorpamplona.amethyst.model
 
-import android.util.Log
+import android.content.ContentResolver
 import androidx.compose.runtime.Stable
-import com.vitorpamplona.amethyst.Amethyst
 import com.vitorpamplona.amethyst.ui.actions.mediaServers.DEFAULT_MEDIA_SERVERS
 import com.vitorpamplona.amethyst.ui.actions.mediaServers.ServerName
+import com.vitorpamplona.amethyst.ui.screen.FeedDefinition
 import com.vitorpamplona.amethyst.ui.tor.TorSettings
 import com.vitorpamplona.amethyst.ui.tor.TorSettingsFlow
-import com.vitorpamplona.ammolite.relays.Constants
-import com.vitorpamplona.ammolite.relays.RelaySetupInfo
-import com.vitorpamplona.quartz.experimental.edits.PrivateOutboxRelayListEvent
 import com.vitorpamplona.quartz.experimental.ephemChat.list.EphemeralChatListEvent
 import com.vitorpamplona.quartz.nip01Core.core.HexKey
 import com.vitorpamplona.quartz.nip01Core.core.toHexKey
 import com.vitorpamplona.quartz.nip01Core.crypto.KeyPair
-import com.vitorpamplona.quartz.nip01Core.hints.types.EventIdHint
 import com.vitorpamplona.quartz.nip01Core.metadata.MetadataEvent
 import com.vitorpamplona.quartz.nip01Core.signers.NostrSignerInternal
 import com.vitorpamplona.quartz.nip02FollowList.ContactListEvent
 import com.vitorpamplona.quartz.nip17Dm.settings.ChatMessageRelayListEvent
 import com.vitorpamplona.quartz.nip28PublicChat.list.ChannelListEvent
+import com.vitorpamplona.quartz.nip28PublicChat.list.tags.ChannelTag
+import com.vitorpamplona.quartz.nip37Drafts.DraftEvent
+import com.vitorpamplona.quartz.nip37Drafts.privateOutbox.PrivateOutboxRelayListEvent
+import com.vitorpamplona.quartz.nip42RelayAuth.RelayAuthEvent
 import com.vitorpamplona.quartz.nip47WalletConnect.Nip47WalletConnect
 import com.vitorpamplona.quartz.nip50Search.SearchRelayListEvent
-import com.vitorpamplona.quartz.nip51Lists.MuteListEvent
-import com.vitorpamplona.quartz.nip55AndroidSigner.ExternalSignerLauncher
-import com.vitorpamplona.quartz.nip55AndroidSigner.NostrSignerExternal
+import com.vitorpamplona.quartz.nip51Lists.geohashList.GeohashListEvent
+import com.vitorpamplona.quartz.nip51Lists.hashtagList.HashtagListEvent
+import com.vitorpamplona.quartz.nip51Lists.muteList.MuteListEvent
+import com.vitorpamplona.quartz.nip51Lists.relayLists.BlockedRelayListEvent
+import com.vitorpamplona.quartz.nip51Lists.relayLists.TrustedRelayListEvent
+import com.vitorpamplona.quartz.nip55AndroidSigner.api.CommandType
+import com.vitorpamplona.quartz.nip55AndroidSigner.api.permission.Permission
+import com.vitorpamplona.quartz.nip55AndroidSigner.client.NostrSignerExternal
 import com.vitorpamplona.quartz.nip57Zaps.LnZapEvent
 import com.vitorpamplona.quartz.nip65RelayList.AdvertisedRelayListEvent
-import com.vitorpamplona.quartz.nip65RelayList.RelayUrlFormatter
+import com.vitorpamplona.quartz.nip65RelayList.tags.AdvertisedRelayInfo
+import com.vitorpamplona.quartz.nip65RelayList.tags.AdvertisedRelayType
+import com.vitorpamplona.quartz.nip72ModCommunities.follow.CommunityListEvent
 import com.vitorpamplona.quartz.nip78AppData.AppSpecificDataEvent
 import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -56,49 +63,45 @@ import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.update
 import java.util.Locale
 
-val DefaultChannelSet =
-    setOf(
-        // Anigma's Nostr
-        "25e5c82273a271cb1a840d0060391a0bf4965cafeb029d5ab55350b418953fbb",
-        // Amethyst's Group
-        "42224859763652914db53052103f0b744df79dfc4efef7e950fc0802fc3df3c5",
-    )
-
 val DefaultChannels =
     listOf(
         // Anigma's Nostr
-        EventIdHint("25e5c82273a271cb1a840d0060391a0bf4965cafeb029d5ab55350b418953fbb", "wss://nos.lol"),
+        ChannelTag("25e5c82273a271cb1a840d0060391a0bf4965cafeb029d5ab55350b418953fbb", Constants.nos),
         // Amethyst's Group
-        EventIdHint("42224859763652914db53052103f0b744df79dfc4efef7e950fc0802fc3df3c5", "wss://nos.lol"),
+        ChannelTag("42224859763652914db53052103f0b744df79dfc4efef7e950fc0802fc3df3c5", Constants.nos),
     )
 
+val DefaultNIP65RelaySet = setOf(Constants.mom, Constants.nos, Constants.bitcoiner)
+
 val DefaultNIP65List =
     listOf(
-        AdvertisedRelayListEvent.AdvertisedRelayInfo(RelayUrlFormatter.normalize("wss://nostr.mom/"), AdvertisedRelayListEvent.AdvertisedRelayType.BOTH),
-        AdvertisedRelayListEvent.AdvertisedRelayInfo(RelayUrlFormatter.normalize("wss://nos.lol/"), AdvertisedRelayListEvent.AdvertisedRelayType.BOTH),
-        AdvertisedRelayListEvent.AdvertisedRelayInfo(RelayUrlFormatter.normalize("wss://nostr.bitcoiner.social/"), AdvertisedRelayListEvent.AdvertisedRelayType.BOTH),
+        AdvertisedRelayInfo(Constants.mom, AdvertisedRelayType.BOTH),
+        AdvertisedRelayInfo(Constants.nos, AdvertisedRelayType.BOTH),
+        AdvertisedRelayInfo(Constants.bitcoiner, AdvertisedRelayType.BOTH),
     )
 
-val DefaultDMRelayList =
-    listOf(
-        RelayUrlFormatter.normalize("wss://auth.nostr1.com"),
-        RelayUrlFormatter.normalize("wss://relay.0xchat.com"),
-        RelayUrlFormatter.normalize("wss://nos.lol"),
-    )
+val DefaultDMRelayList = listOf(Constants.auth, Constants.oxchat, Constants.nos)
 
-val DefaultSearchRelayList =
+val DefaultSearchRelayList = setOf(Constants.band, Constants.wine, Constants.where, Constants.nostoday)
+
+val DefaultIndexerRelayList = setOf(Constants.purplepages, Constants.coracle, Constants.userkinds)
+
+val DefaultSignerPermissions =
     listOf(
-        RelayUrlFormatter.normalize("wss://relay.nostr.band"),
-        RelayUrlFormatter.normalize("wss://nostr.wine"),
-        RelayUrlFormatter.normalize("wss://relay.noswhere.com"),
-        RelayUrlFormatter.normalize("wss://search.nos.today"),
+        Permission(CommandType.SIGN_EVENT, RelayAuthEvent.KIND),
+        Permission(CommandType.SIGN_EVENT, DraftEvent.KIND),
+        Permission(CommandType.NIP04_ENCRYPT),
+        Permission(CommandType.NIP04_DECRYPT),
+        Permission(CommandType.NIP44_DECRYPT),
+        Permission(CommandType.NIP44_DECRYPT),
+        Permission(CommandType.DECRYPT_ZAP_EVENT),
     )
 
 // This has spaces to avoid mixing with a potential NIP-51 list with the same name.
 val GLOBAL_FOLLOWS = " Global "
 
 // This has spaces to avoid mixing with a potential NIP-51 list with the same name.
-val KIND3_FOLLOWS = " All Follows "
+val ALL_FOLLOWS = " All Follows "
 
 // This has spaces to avoid mixing with a potential NIP-51 list with the same name.
 val AROUND_ME = " Around Me "
@@ -108,14 +111,13 @@ class AccountSettings(
     val keyPair: KeyPair,
     val transientAccount: Boolean = false,
     var externalSignerPackageName: String? = null,
-    var localRelays: Set<RelaySetupInfo> = Constants.defaultRelays.toSet(),
-    var localRelayServers: Set<String> = setOf(),
+    var localRelayServers: MutableStateFlow<Set<String>> = MutableStateFlow(setOf()),
     var defaultFileServer: ServerName = DEFAULT_MEDIA_SERVERS[0],
-    val defaultHomeFollowList: MutableStateFlow<String> = MutableStateFlow(KIND3_FOLLOWS),
+    val defaultHomeFollowList: MutableStateFlow<String> = MutableStateFlow(ALL_FOLLOWS),
     val defaultStoriesFollowList: MutableStateFlow<String> = MutableStateFlow(GLOBAL_FOLLOWS),
     val defaultNotificationFollowList: MutableStateFlow<String> = MutableStateFlow(GLOBAL_FOLLOWS),
     val defaultDiscoveryFollowList: MutableStateFlow<String> = MutableStateFlow(GLOBAL_FOLLOWS),
-    var zapPaymentRequest: Nip47WalletConnect.Nip47URI? = null,
+    var zapPaymentRequest: MutableStateFlow<Nip47WalletConnect.Nip47URINorm?> = MutableStateFlow(null),
     var hideDeleteRequestDialog: Boolean = false,
     var hideBlockAlertDialog: Boolean = false,
     var hideNIP17WarningDialog: Boolean = false,
@@ -124,10 +126,15 @@ class AccountSettings(
     var backupDMRelayList: ChatMessageRelayListEvent? = null,
     var backupNIP65RelayList: AdvertisedRelayListEvent? = null,
     var backupSearchRelayList: SearchRelayListEvent? = null,
+    var backupBlockedRelayList: BlockedRelayListEvent? = null,
+    var backupTrustedRelayList: TrustedRelayListEvent? = null,
     var backupMuteList: MuteListEvent? = null,
     var backupPrivateHomeRelayList: PrivateOutboxRelayListEvent? = null,
     var backupAppSpecificData: AppSpecificDataEvent? = null,
     var backupChannelList: ChannelListEvent? = null,
+    var backupCommunityList: CommunityListEvent? = null,
+    var backupHashtagList: HashtagListEvent? = null,
+    var backupGeohashList: GeohashListEvent? = null,
     var backupEphemeralChatList: EphemeralChatListEvent? = null,
     val torSettings: TorSettingsFlow = TorSettingsFlow(),
     val lastReadPerRoute: MutableStateFlow<Map<String, MutableStateFlow<Long>>> = MutableStateFlow(mapOf()),
@@ -147,25 +154,18 @@ class AccountSettings(
 
     fun isWriteable(): Boolean = keyPair.privKey != null || externalSignerPackageName != null
 
-    fun createSigner() =
+    fun createSigner(contentResolver: ContentResolver) =
         if (keyPair.privKey != null) {
             NostrSignerInternal(keyPair)
         } else {
             when (val packageName = externalSignerPackageName) {
                 null -> NostrSignerInternal(keyPair)
-                else -> {
-                    val externalSignerLauncher = ExternalSignerLauncher(keyPair.pubKey.toHexKey(), packageName)
-                    // TODO: How to handle the launcher here?
-                    try {
-                        externalSignerLauncher.registerLauncher(
-                            launcher = { },
-                            contentResolver = Amethyst.instance::contentResolverFn,
-                        )
-                    } catch (e: Exception) {
-                        Log.d("AccountSettings", "Failed to initialize external signer", e)
-                    }
-                    NostrSignerExternal(keyPair.pubKey.toHexKey(), externalSignerLauncher)
-                }
+                else ->
+                    NostrSignerExternal(
+                        pubKey = keyPair.pubKey.toHexKey(),
+                        packageName = packageName,
+                        contentResolver = contentResolver,
+                    )
             }
         }
 
@@ -200,9 +200,9 @@ class AccountSettings(
         return false
     }
 
-    fun changeZapPaymentRequest(newServer: Nip47WalletConnect.Nip47URI?): Boolean {
-        if (zapPaymentRequest != newServer) {
-            zapPaymentRequest = newServer
+    fun changeZapPaymentRequest(newServer: Nip47WalletConnect.Nip47URINorm?): Boolean {
+        if (zapPaymentRequest.value != newServer) {
+            zapPaymentRequest.tryEmit(newServer)
             saveAccountSettings()
             return true
         }
@@ -224,6 +224,10 @@ class AccountSettings(
     // list names
     // ---
 
+    fun changeDefaultHomeFollowList(name: FeedDefinition) {
+        changeDefaultHomeFollowList(name.code)
+    }
+
     fun changeDefaultHomeFollowList(name: String) {
         if (defaultHomeFollowList.value != name) {
             defaultHomeFollowList.tryEmit(name)
@@ -231,6 +235,10 @@ class AccountSettings(
         }
     }
 
+    fun changeDefaultStoriesFollowList(name: FeedDefinition) {
+        changeDefaultStoriesFollowList(name.code)
+    }
+
     fun changeDefaultStoriesFollowList(name: String) {
         if (defaultStoriesFollowList.value != name) {
             defaultStoriesFollowList.tryEmit(name)
@@ -238,6 +246,10 @@ class AccountSettings(
         }
     }
 
+    fun changeDefaultNotificationFollowList(name: FeedDefinition) {
+        changeDefaultNotificationFollowList(name.code)
+    }
+
     fun changeDefaultNotificationFollowList(name: String) {
         if (defaultNotificationFollowList.value != name) {
             defaultNotificationFollowList.tryEmit(name)
@@ -245,6 +257,10 @@ class AccountSettings(
         }
     }
 
+    fun changeDefaultDiscoveryFollowList(name: FeedDefinition) {
+        changeDefaultDiscoveryFollowList(name.code)
+    }
+
     fun changeDefaultDiscoveryFollowList(name: String) {
         if (defaultDiscoveryFollowList.value != name) {
             defaultDiscoveryFollowList.tryEmit(name)
@@ -255,14 +271,13 @@ class AccountSettings(
     // ---
     // proxy settings
     // ---
-    fun setTorSettings(newTorSettings: TorSettings): Boolean {
+    fun setTorSettings(newTorSettings: TorSettings): Boolean =
         if (torSettings.update(newTorSettings)) {
             saveAccountSettings()
-            return true
+            true
         } else {
-            return false
+            false
         }
-    }
 
     // ---
     // language services
@@ -301,8 +316,8 @@ class AccountSettings(
     // ----
 
     fun updateLocalRelayServers(servers: Set<String>) {
-        if (localRelayServers != servers) {
-            localRelayServers = servers
+        if (localRelayServers.value != servers) {
+            localRelayServers.update { servers }
             saveAccountSettings()
         }
     }
@@ -357,6 +372,26 @@ class AccountSettings(
         }
     }
 
+    fun updateBlockedRelayList(newBlockedRelayList: BlockedRelayListEvent?) {
+        if (newBlockedRelayList == null || newBlockedRelayList.tags.isEmpty()) return
+
+        // Events might be different objects, we have to compare their ids.
+        if (backupBlockedRelayList?.id != newBlockedRelayList.id) {
+            backupBlockedRelayList = newBlockedRelayList
+            saveAccountSettings()
+        }
+    }
+
+    fun updateTrustedRelayList(newTrustedRelayList: TrustedRelayListEvent?) {
+        if (newTrustedRelayList == null || newTrustedRelayList.tags.isEmpty()) return
+
+        // Events might be different objects, we have to compare their ids.
+        if (backupTrustedRelayList?.id != newTrustedRelayList.id) {
+            backupTrustedRelayList = newTrustedRelayList
+            saveAccountSettings()
+        }
+    }
+
     fun updatePrivateHomeRelayList(newPrivateHomeRelayList: PrivateOutboxRelayListEvent?) {
         if (newPrivateHomeRelayList == null || newPrivateHomeRelayList.tags.isEmpty()) return
 
@@ -377,6 +412,36 @@ class AccountSettings(
         }
     }
 
+    fun updateGeohashListTo(newGeohashList: GeohashListEvent?) {
+        if (newGeohashList == null || newGeohashList.tags.isEmpty()) return
+
+        // Events might be different objects, we have to compare their ids.
+        if (backupGeohashList?.id != newGeohashList.id) {
+            backupGeohashList = newGeohashList
+            saveAccountSettings()
+        }
+    }
+
+    fun updateHashtagListTo(newHashtagList: HashtagListEvent?) {
+        if (newHashtagList == null || newHashtagList.tags.isEmpty()) return
+
+        // Events might be different objects, we have to compare their ids.
+        if (backupHashtagList?.id != newHashtagList.id) {
+            backupHashtagList = newHashtagList
+            saveAccountSettings()
+        }
+    }
+
+    fun updateCommunityListTo(newCommunityList: CommunityListEvent?) {
+        if (newCommunityList == null || newCommunityList.tags.isEmpty()) return
+
+        // Events might be different objects, we have to compare their ids.
+        if (backupCommunityList?.id != newCommunityList.id) {
+            backupCommunityList = newCommunityList
+            saveAccountSettings()
+        }
+    }
+
     fun updateEphemeralChatListTo(newEphemeralChatList: EphemeralChatListEvent?) {
         if (newEphemeralChatList == null || newEphemeralChatList.tags.isEmpty()) return
 
@@ -492,17 +557,6 @@ class AccountSettings(
         }
     }
 
-    // ----
-    // local relays
-    // ----
-
-    fun updateLocalRelays(newLocalRelays: Set<RelaySetupInfo>) {
-        if (!localRelays.equals(newLocalRelays)) {
-            localRelays = newLocalRelays
-            saveAccountSettings()
-        }
-    }
-
     // ---
     // attestations
     // ---

amethyst/src/main/java/com/vitorpamplona/amethyst/model/AccountSyncedSettings.kt

@@ -114,9 +114,7 @@ class AccountSyncedSettings(
         }
     }
 
-    fun dontTranslateFromFilteredBySpokenLanguages(): Set<String> {
-        return languages.dontTranslateFrom - getLanguagesSpokenByUser()
-    }
+    fun dontTranslateFromFilteredBySpokenLanguages(): Set<String> = languages.dontTranslateFrom - getLanguagesSpokenByUser()
 }
 
 @Stable
@@ -140,11 +138,12 @@ class AccountLanguagePreferences(
     // language services
     // ---
     fun toggleDontTranslateFrom(languageCode: String) {
-        if (!dontTranslateFrom.contains(languageCode)) {
-            dontTranslateFrom = dontTranslateFrom.plus(languageCode)
-        } else {
-            dontTranslateFrom = dontTranslateFrom.minus(languageCode)
-        }
+        dontTranslateFrom =
+            if (!dontTranslateFrom.contains(languageCode)) {
+                dontTranslateFrom.plus(languageCode)
+            } else {
+                dontTranslateFrom.minus(languageCode)
+            }
     }
 
     fun translateToContains(languageCode: Locale) = translateTo.contains(languageCode.language)

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

@@ -22,75 +22,114 @@ package com.vitorpamplona.amethyst.model
 
 import android.util.Log
 import android.util.LruCache
-import com.vitorpamplona.amethyst.service.checkNotInMainThread
 import com.vitorpamplona.amethyst.ui.note.njumpLink
-import com.vitorpamplona.ammolite.relays.RelayBriefInfoCache
-import com.vitorpamplona.ammolite.relays.RelayStats
+import com.vitorpamplona.quartz.nip01Core.core.AddressableEvent
 import com.vitorpamplona.quartz.nip01Core.core.Event
 import com.vitorpamplona.quartz.nip01Core.core.HexKey
+import com.vitorpamplona.quartz.nip01Core.relay.client.stats.RelayStats
+import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl
+import com.vitorpamplona.quartz.nip01Core.tags.addressables.Address
 import com.vitorpamplona.quartz.nip19Bech32.Nip19Parser
+import com.vitorpamplona.quartz.nip19Bech32.entities.NAddress
 import com.vitorpamplona.quartz.nip19Bech32.entities.NEvent
 import kotlinx.coroutines.flow.MutableStateFlow
 
 data class Spammer(
     val pubkeyHex: HexKey,
-    var duplicatedMessages: Set<HexKey>,
-)
+    var duplicatedEventIds: Set<HexKey>,
+    var duplicatedEventAddresses: Set<Address>,
+) {
+    fun shouldHide() = duplicatedEventIds.size >= 5 || duplicatedEventAddresses.size >= 5
+}
 
 class AntiSpamFilter {
-    val recentMessages = LruCache<Int, String>(1000)
+    val recentEventIds = LruCache<Int, String>(2000)
+    val recentAddressables = LruCache<Int, Address>(2000)
     val spamMessages = LruCache<Int, Spammer>(1000)
 
     var active: Boolean = true
 
+    fun spamHashCode(event: Event): Int = 31 * event.content.hashCode() + event.tags.contentDeepHashCode()
+
     fun isSpam(
         event: Event,
-        relay: RelayBriefInfoCache.RelayBriefInfo?,
+        relay: NormalizedRelayUrl?,
     ): Boolean {
-        checkNotInMainThread()
-
         if (!active) return false
 
-        val idHex = event.id
-
         // if short message, ok
         // The idea here is to avoid considering repeated "GM" messages spam.
-        if (event.content.length < 50) return false
+        if (event.content.length < 60) return false
 
         // if the message is actually short but because it cites a user/event, the nostr: string is
         // really long, make it ok.
         // The idea here is to avoid considering repeated "@Bot, command" messages spam, while still
         // blocking repeated "lnbc..." invoices or fishing urls
-        if (event.content.length < 180 && Nip19Parser.nip19regex.matcher(event.content).find()) return false
+        if (event.content.length < 180 && event.content.startsWith("nostr:") && Nip19Parser.nip19regex.matcher(event.content).find()) return false
 
         // double list strategy:
         // if duplicated, it goes into spam. 1000 spam messages are saved into the spam list.
 
         // Considers tags so that same replies to different people don't count.
-        val hash = (event.content + event.tags.flatten().joinToString(",")).hashCode()
+        val hash = spamHashCode(event)
 
-        if (
-            (recentMessages[hash] != null && recentMessages[hash] != idHex) || spamMessages[hash] != null
-        ) {
-            Log.w(
-                "Potential SPAM Message",
-                "${event.id} ${recentMessages[hash]} ${spamMessages[hash] != null} ${relay?.url} ${event.content.replace("\n", " | ")}",
-            )
+        // ignores multiple versions of the same addressable.
+        if (event is AddressableEvent) {
+            val address = event.address()
 
-            // Log down offenders
-            logOffender(hash, event)
+            // normal event
+            if (
+                (recentAddressables[hash] != null && recentAddressables[hash] != address) ||
+                (spamMessages[hash] != null && !spamMessages[hash].duplicatedEventAddresses.contains(address))
+            ) {
+                val existingAddress = recentAddressables[hash]
 
-            if (relay != null) {
-                RelayStats.newSpam(relay.url, njumpLink(NEvent.create(event.id, event.pubKey, event.kind, relay.url)))
+                val link1 = njumpLink(NAddress.create(existingAddress.kind, existingAddress.pubKeyHex, existingAddress.dTag, relay))
+                val link2 = njumpLink(NAddress.create(event.kind, event.pubKey, event.dTag(), relay))
+
+                Log.w("Duplicated/SPAM", "${relay?.url} $link1 $link2")
+
+                // Log down offenders
+                val spammer = logOffender(hash, event)
+
+                if (spammer.shouldHide() && relay != null) {
+                    RelayStats.newSpam(relay, "$link1 $link2")
+                }
+
+                flowSpam.tryEmit(AntiSpamState(this))
+
+                return true
             }
 
-            flowSpam.tryEmit(AntiSpamState(this))
+            recentAddressables.put(hash, address)
+        } else {
+            // normal event
+            if (
+                (recentEventIds[hash] != null && recentEventIds[hash] != event.id) ||
+                (spamMessages[hash] != null && !spamMessages[hash].duplicatedEventIds.contains(event.id))
+            ) {
+                val existingEvent = recentEventIds[hash]
 
-            return true
+                val link1 = njumpLink(NEvent.create(existingEvent, null, null, relay))
+                val link2 = njumpLink(NEvent.create(event.id, null, null, relay))
+
+                Log.w("Duplicated/SPAM", "${relay?.url} $link1 $link2")
+
+                // Log down offenders
+                val spammer = logOffender(hash, event)
+
+                if (spammer.shouldHide() && relay != null) {
+                    RelayStats.newSpam(relay, "$link1 $link2")
+                }
+
+                flowSpam.tryEmit(AntiSpamState(this))
+
+                return true
+            }
+
+            recentEventIds.put(hash, event.id)
         }
 
-        recentMessages.put(hash, idHex)
-
         return false
     }
 
@@ -98,12 +137,33 @@ class AntiSpamFilter {
     private fun logOffender(
         hashCode: Int,
         event: Event,
-    ) {
-        if (spamMessages.get(hashCode) == null) {
-            spamMessages.put(hashCode, Spammer(event.pubKey, setOf(recentMessages[hashCode], event.id)))
+    ): Spammer {
+        val spammer = spamMessages.get(hashCode)
+
+        if (spammer == null) {
+            val newSpammer =
+                if (event is AddressableEvent) {
+                    Spammer(
+                        pubkeyHex = event.pubKey,
+                        duplicatedEventIds = setOf(),
+                        duplicatedEventAddresses = setOf(recentAddressables[hashCode], event.address()),
+                    )
+                } else {
+                    Spammer(
+                        pubkeyHex = event.pubKey,
+                        duplicatedEventIds = setOf(recentEventIds[hashCode], event.id),
+                        duplicatedEventAddresses = setOf(),
+                    )
+                }
+            spamMessages.put(hashCode, newSpammer)
+            return newSpammer
         } else {
-            val spammer = spamMessages.get(hashCode)
-            spammer.duplicatedMessages += event.id
+            if (event is AddressableEvent) {
+                spammer.duplicatedEventAddresses += event.address()
+            } else {
+                spammer.duplicatedEventIds += event.id
+            }
+            return spammer
         }
     }
 

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

@@ -22,197 +22,40 @@ package com.vitorpamplona.amethyst.model
 
 import androidx.compose.runtime.Stable
 import com.vitorpamplona.amethyst.ui.dal.DefaultFeedOrder
-import com.vitorpamplona.amethyst.ui.note.toShortenHex
-import com.vitorpamplona.ammolite.relays.RelayBriefInfoCache
-import com.vitorpamplona.quartz.experimental.ephemChat.chat.RoomId
 import com.vitorpamplona.quartz.nip01Core.core.HexKey
-import com.vitorpamplona.quartz.nip01Core.hints.EventHintBundle
-import com.vitorpamplona.quartz.nip01Core.hints.types.EventIdHint
-import com.vitorpamplona.quartz.nip01Core.tags.addressables.ATag
-import com.vitorpamplona.quartz.nip01Core.tags.addressables.Address
-import com.vitorpamplona.quartz.nip02FollowList.EmptyTagList
-import com.vitorpamplona.quartz.nip02FollowList.toImmutableListOfLists
-import com.vitorpamplona.quartz.nip19Bech32.entities.NAddress
-import com.vitorpamplona.quartz.nip19Bech32.entities.NEvent
-import com.vitorpamplona.quartz.nip19Bech32.toNEvent
-import com.vitorpamplona.quartz.nip28PublicChat.admin.ChannelCreateEvent
-import com.vitorpamplona.quartz.nip28PublicChat.admin.ChannelMetadataEvent
-import com.vitorpamplona.quartz.nip28PublicChat.base.ChannelData
-import com.vitorpamplona.quartz.nip53LiveActivities.streaming.LiveActivitiesEvent
-import com.vitorpamplona.quartz.utils.Hex
+import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl
 import com.vitorpamplona.quartz.utils.LargeCache
 import kotlinx.coroutines.flow.MutableStateFlow
 
 @Stable
-class EphemeralChatChannel(
-    val roomId: RoomId,
-) : Channel(roomId.toKey()) {
-    override fun idNote() = roomId.toDisplayKey()
-
-    override fun idDisplayNote() = idNote().toShortenHex()
-
-    override fun relays() = listOf(roomId.relayUrl)
-
-    override fun toBestDisplayName() = roomId.toDisplayKey()
-
-    override fun summary(): String? = null
-
-    override fun profilePicture(): String? = null
-
-    override fun anyNameStartsWith(prefix: String): Boolean = roomId.id.contains(prefix, true)
-}
-
-@Stable
-class PublicChatChannel(
-    idHex: String,
-) : Channel(idHex) {
-    var event: ChannelCreateEvent? = null
-    var infoTags = EmptyTagList
-    var info = ChannelData(null, null, null, null)
-
-    override fun relays() = info.relays ?: super.relays()
-
-    fun toNEvent() = NEvent.create(idHex, event?.pubKey, ChannelCreateEvent.KIND, *relays().toTypedArray())
-
-    fun toNostrUri() = "nostr:${toNEvent()}"
-
-    fun toEventHint() = event?.let { EventHintBundle<ChannelCreateEvent>(it, relays().firstOrNull(), null) }
-
-    fun toEventId() = EventIdHint(idHex, relays().firstOrNull())
-
-    fun updateChannelInfo(
-        creator: User,
-        event: ChannelCreateEvent,
-    ) {
-        this.event = event
-        this.infoTags = event.tags.toImmutableListOfLists()
-        updateChannelInfo(creator, event.channelInfo(), event.createdAt)
-    }
-
-    fun updateChannelInfo(
-        creator: User,
-        event: ChannelMetadataEvent,
-    ) {
-        this.infoTags = event.tags.toImmutableListOfLists()
-        updateChannelInfo(creator, event.channelInfo(), event.createdAt)
-    }
-
-    fun updateChannelInfo(
-        creator: User,
-        channelInfo: ChannelData,
-        updatedAt: Long,
-    ) {
-        this.info = channelInfo
-        super.updateChannelInfo(creator, updatedAt)
-    }
-
-    override fun toBestDisplayName(): String = info.name ?: super.toBestDisplayName()
-
-    override fun summary(): String? = info.about
-
-    override fun profilePicture(): String? {
-        if (info.picture.isNullOrBlank()) return super.profilePicture()
-        return info.picture ?: super.profilePicture()
-    }
-
-    override fun anyNameStartsWith(prefix: String): Boolean = listOfNotNull(info.name, info.about).any { it.contains(prefix, true) }
-}
-
-@Stable
-class LiveActivitiesChannel(
-    val address: Address,
-) : Channel(address.toValue()) {
-    var info: LiveActivitiesEvent? = null
-
-    override fun idNote() = toNAddr()
-
-    override fun idDisplayNote() = idNote().toShortenHex()
-
-    fun address() = address
-
-    override fun relays() = info?.allRelayUrls() ?: super.relays()
-
-    fun relayHintUrl() = relays().firstOrNull()
-
-    fun updateChannelInfo(
-        creator: User,
-        channelInfo: LiveActivitiesEvent,
-        updatedAt: Long,
-    ) {
-        this.info = channelInfo
-        super.updateChannelInfo(creator, updatedAt)
-    }
-
-    override fun toBestDisplayName(): String = info?.title() ?: super.toBestDisplayName()
-
-    override fun summary(): String? = info?.summary()
-
-    override fun profilePicture(): String? = info?.image()?.ifBlank { null }
-
-    override fun anyNameStartsWith(prefix: String): Boolean =
-        listOfNotNull(info?.title(), info?.summary())
-            .filter { it.contains(prefix, true) }
-            .isNotEmpty()
-
-    fun toNAddr() = NAddress.create(address.kind, address.pubKeyHex, address.dTag, *relays().toTypedArray())
-
-    fun toATag() = ATag(address, relayHintUrl())
-
-    fun toNostrUri() = "nostr:${toNAddr()}"
-}
-
-data class Counter(
-    var number: Int = 0,
-)
-
-@Stable
-abstract class Channel(
-    val idHex: String,
-) {
-    var creator: User? = null
-    var updatedMetadataAt: Long = 0
+abstract class Channel : NotesGatherer {
     val notes = LargeCache<HexKey, Note>()
-    var lastNoteCreatedAt: Long = 0
-    private var relays = mapOf<RelayBriefInfoCache.RelayBriefInfo, Counter>()
+    var lastNote: Note? = null
 
-    open fun idNote() = Hex.decode(idHex).toNEvent()
+    private var relays = mapOf<NormalizedRelayUrl, Counter>()
 
-    open fun idDisplayNote() = idNote().toShortenHex()
+    abstract fun toBestDisplayName(): String
 
-    open fun toBestDisplayName(): String = idDisplayNote()
-
-    open fun summary(): String? = null
-
-    open fun creatorName(): String? = creator?.toBestDisplayName()
-
-    open fun profilePicture(): String? = creator?.info?.banner
-
-    open fun relays() =
+    open fun relays(): Set<NormalizedRelayUrl> =
         relays.keys
             .toSortedSet { o1, o2 ->
                 val o1Count = relays[o1]?.number ?: 0
                 val o2Count = relays[o2]?.number ?: 0
                 o2Count.compareTo(o1Count) // descending
-            }.map { it.url }
-
-    open fun updateChannelInfo(
-        creator: User,
-        updatedAt: Long,
-    ) {
-        this.creator = creator
-        this.updatedMetadataAt = updatedAt
+            }
 
+    fun updateChannelInfo() {
         flowSet?.metadata?.invalidateData()
     }
 
     @Synchronized
-    fun addRelaySync(briefInfo: RelayBriefInfoCache.RelayBriefInfo) {
+    fun addRelaySync(briefInfo: NormalizedRelayUrl) {
         if (briefInfo !in relays) {
             relays = relays + Pair(briefInfo, Counter(1))
         }
     }
 
-    fun addRelay(relay: RelayBriefInfoCache.RelayBriefInfo) {
+    fun addRelay(relay: NormalizedRelayUrl) {
         val counter = relays[relay]
         if (counter != null) {
             counter.number++
@@ -223,31 +66,37 @@ abstract class Channel(
 
     fun addNote(
         note: Note,
-        relay: RelayBriefInfoCache.RelayBriefInfo? = null,
+        relay: NormalizedRelayUrl? = null,
     ) {
-        notes.put(note.idHex, note)
+        if (!notes.containsKey(note.idHex)) {
+            notes.put(note.idHex, note)
+            note.addGatherer(this)
 
-        if ((note.createdAt() ?: 0) > lastNoteCreatedAt) {
-            lastNoteCreatedAt = note.createdAt() ?: 0
+            if ((note.createdAt() ?: 0) > (lastNote?.createdAt() ?: 0)) {
+                lastNote = note
+            }
+
+            if (relay != null) {
+                addRelay(relay)
+            }
+
+            flowSet?.notes?.invalidateData()
         }
+    }
 
-        if (relay != null) {
-            addRelay(relay)
+    override fun removeNote(note: Note) {
+        if (notes.containsKey(note.idHex)) {
+            notes.remove(note.idHex)
+            note.removeGatherer(this)
+
+            if (note == lastNote) {
+                lastNote = notes.values().sortedWith(DefaultFeedOrder).firstOrNull()
+            }
+
+            flowSet?.notes?.invalidateData()
         }
-
-        flowSet?.notes?.invalidateData()
     }
 
-    fun removeNote(note: Note) {
-        notes.remove(note.idHex)
-    }
-
-    fun removeNote(noteHex: String) {
-        notes.remove(noteHex)
-    }
-
-    abstract fun anyNameStartsWith(prefix: String): Boolean
-
     fun pruneOldMessages(): Set<Note> {
         val important =
             notes
@@ -308,6 +157,10 @@ abstract class Channel(
     }
 }
 
+data class Counter(
+    var number: Int = 0,
+)
+
 @Stable
 class ChannelFlowSet(
     u: Channel,

amethyst/src/main/java/com/vitorpamplona/amethyst/model/Constants.kt

@@ -0,0 +1,53 @@
+/**
+ * Copyright (c) 2025 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 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.
+ */
+package com.vitorpamplona.amethyst.model
+
+import com.vitorpamplona.quartz.nip01Core.relay.normalizer.RelayUrlNormalizer
+
+object Constants {
+    val nos = RelayUrlNormalizer.normalize("wss://nos.lol")
+    val mom = RelayUrlNormalizer.normalize("wss://nostr.mom")
+    val primal = RelayUrlNormalizer.normalize("wss://relay.primal.net")
+    val damus = RelayUrlNormalizer.normalize("wss://relay.damus.io")
+    val wine = RelayUrlNormalizer.normalize("wss://nostr.wine")
+    val band = RelayUrlNormalizer.normalize("wss://relay.nostr.band")
+
+    val where = RelayUrlNormalizer.normalize("wss://relay.noswhere.com")
+    val elites = RelayUrlNormalizer.normalize("wss://nostrelites.org")
+
+    val bitcoiner = RelayUrlNormalizer.normalize("wss://nostr.bitcoiner.social")
+    val bg = RelayUrlNormalizer.normalize("wss://relay.nostr.bg")
+    val oxtr = RelayUrlNormalizer.normalize("wss://nostr.oxtr.dev")
+    val fmtwiz = RelayUrlNormalizer.normalize("wss://nostr.fmt.wiz.biz")
+
+    val nostoday = RelayUrlNormalizer.normalize("wss://search.nos.today")
+
+    val auth = RelayUrlNormalizer.normalize("wss://auth.nostr1.com")
+    val oxchat = RelayUrlNormalizer.normalize("wss://relay.0xchat.com")
+
+    val purplepages = RelayUrlNormalizer.normalize("wss://purplepag.es")
+    val coracle = RelayUrlNormalizer.normalize("wss://indexer.coracle.social")
+    val userkinds = RelayUrlNormalizer.normalize("wss://user.kindpag.es")
+
+    val eventFinderRelays = setOf(band, wine, damus, primal, mom, nos, bitcoiner, oxtr, fmtwiz, bg)
+
+    val defaultSearchRelaySet = setOf(band, wine, where)
+}

amethyst/src/main/java/com/vitorpamplona/amethyst/model/HashtagIcon.kt

@@ -49,20 +49,22 @@ import com.vitorpamplona.amethyst.commons.richtext.HashTagSegment
 import com.vitorpamplona.amethyst.commons.richtext.RegularTextSegment
 import com.vitorpamplona.amethyst.ui.components.HashTag
 import com.vitorpamplona.amethyst.ui.components.RenderRegular
-import com.vitorpamplona.amethyst.ui.navigation.EmptyNav
+import com.vitorpamplona.amethyst.ui.navigation.navs.EmptyNav
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.mockAccountViewModel
 import com.vitorpamplona.amethyst.ui.theme.ThemeComparisonColumn
 import com.vitorpamplona.quartz.nip02FollowList.EmptyTagList
 
 @Preview
 @Composable
 fun RenderHashTagIconsPreview() {
+    val accountViewModel = mockAccountViewModel()
     ThemeComparisonColumn {
         RenderRegular(
             "Testing rendering of hashtags: #flowerstr #Bitcoin, #nostr, #lightning, #zap, #amethyst, #cashu, #plebs, #coffee, #skullofsatoshi, #grownostr, #footstr, #tunestr, #weed, #mate, #gamestr, #gamechain",
             EmptyTagList,
         ) { word, state ->
             when (word) {
-                is HashTagSegment -> HashTag(word, EmptyNav)
+                is HashTagSegment -> HashTag(word, accountViewModel, EmptyNav)
                 is RegularTextSegment -> Text(word.segmentText)
             }
         }

amethyst/src/main/java/com/vitorpamplona/amethyst/model/MediaAspectRatioCache.kt

@@ -23,7 +23,7 @@ package com.vitorpamplona.amethyst.model
 import android.util.LruCache
 
 interface MutableMediaAspectRatioCache {
-    fun get(url: String): Float
+    fun get(url: String): Float?
 
     fun add(
         url: String,
@@ -35,7 +35,7 @@ interface MutableMediaAspectRatioCache {
 object MediaAspectRatioCache : MutableMediaAspectRatioCache {
     val mediaAspectRatioCacheByUrl = LruCache<String, Float>(1000)
 
-    override fun get(url: String) = mediaAspectRatioCacheByUrl.get(url)
+    override fun get(url: String): Float? = mediaAspectRatioCacheByUrl.get(url)
 
     override fun add(
         url: String,

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

@@ -22,22 +22,20 @@ package com.vitorpamplona.amethyst.model
 
 import androidx.compose.runtime.Immutable
 import androidx.compose.runtime.Stable
-import com.vitorpamplona.amethyst.launchAndWaitAll
+import com.vitorpamplona.amethyst.model.nip47WalletConnect.NwcSignerState
+import com.vitorpamplona.amethyst.model.nip51Lists.HiddenUsersState
 import com.vitorpamplona.amethyst.service.checkNotInMainThread
 import com.vitorpamplona.amethyst.service.firstFullCharOrEmoji
 import com.vitorpamplona.amethyst.service.replace
-import com.vitorpamplona.amethyst.tryAndWait
-import com.vitorpamplona.amethyst.ui.note.toShortenHex
-import com.vitorpamplona.ammolite.relays.RelayBriefInfoCache
+import com.vitorpamplona.amethyst.ui.note.toShortDisplay
 import com.vitorpamplona.quartz.experimental.bounties.addedRewardValue
 import com.vitorpamplona.quartz.experimental.bounties.hasAdditionalReward
-import com.vitorpamplona.quartz.experimental.ephemChat.chat.EphemeralChatEvent
 import com.vitorpamplona.quartz.lightning.LnInvoiceUtil
 import com.vitorpamplona.quartz.nip01Core.core.AddressableEvent
 import com.vitorpamplona.quartz.nip01Core.core.Event
 import com.vitorpamplona.quartz.nip01Core.core.HexKey
 import com.vitorpamplona.quartz.nip01Core.hints.EventHintBundle
-import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
+import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl
 import com.vitorpamplona.quartz.nip01Core.tags.addressables.ATag
 import com.vitorpamplona.quartz.nip01Core.tags.addressables.Address
 import com.vitorpamplona.quartz.nip01Core.tags.events.ETag
@@ -52,16 +50,14 @@ import com.vitorpamplona.quartz.nip19Bech32.entities.NAddress
 import com.vitorpamplona.quartz.nip19Bech32.entities.NEvent
 import com.vitorpamplona.quartz.nip22Comments.CommentEvent
 import com.vitorpamplona.quartz.nip23LongContent.LongTextNoteEvent
-import com.vitorpamplona.quartz.nip28PublicChat.admin.ChannelCreateEvent
-import com.vitorpamplona.quartz.nip28PublicChat.admin.ChannelMetadataEvent
 import com.vitorpamplona.quartz.nip28PublicChat.message.ChannelMessageEvent
 import com.vitorpamplona.quartz.nip36SensitiveContent.isSensitiveOrNSFW
 import com.vitorpamplona.quartz.nip37Drafts.DraftEvent
 import com.vitorpamplona.quartz.nip47WalletConnect.LnZapPaymentRequestEvent
 import com.vitorpamplona.quartz.nip47WalletConnect.LnZapPaymentResponseEvent
+import com.vitorpamplona.quartz.nip47WalletConnect.PayInvoiceMethod
 import com.vitorpamplona.quartz.nip47WalletConnect.PayInvoiceSuccessResponse
 import com.vitorpamplona.quartz.nip53LiveActivities.chat.LiveActivitiesChatMessageEvent
-import com.vitorpamplona.quartz.nip53LiveActivities.streaming.LiveActivitiesEvent
 import com.vitorpamplona.quartz.nip54Wiki.WikiNoteEvent
 import com.vitorpamplona.quartz.nip56Reports.ReportEvent
 import com.vitorpamplona.quartz.nip56Reports.ReportType
@@ -71,16 +67,19 @@ import com.vitorpamplona.quartz.nip59Giftwrap.WrappedEvent
 import com.vitorpamplona.quartz.nip71Video.VideoEvent
 import com.vitorpamplona.quartz.nip72ModCommunities.approval.CommunityPostApprovalEvent
 import com.vitorpamplona.quartz.nip99Classifieds.ClassifiedsEvent
-import com.vitorpamplona.quartz.utils.Hex
 import com.vitorpamplona.quartz.utils.TimeUtils
+import com.vitorpamplona.quartz.utils.anyAsync
 import com.vitorpamplona.quartz.utils.containsAny
+import com.vitorpamplona.quartz.utils.launchAndWaitAll
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.flatMapLatest
 import java.math.BigDecimal
-import kotlin.coroutines.Continuation
-import kotlin.coroutines.resume
+
+interface NotesGatherer {
+    fun removeNote(note: Note)
+}
 
 @Stable
 class AddressableNote(
@@ -90,7 +89,7 @@ class AddressableNote(
 
     override fun toNEvent() = toNAddr()
 
-    override fun idDisplayNote() = idNote().toShortenHex()
+    override fun idDisplayNote() = idNote().toShortDisplay()
 
     override fun address() = address
 
@@ -129,13 +128,34 @@ class AddressableNote(
 @Stable
 open class Note(
     val idHex: String,
-) {
+) : NotesGatherer {
     // 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 replyTo: List<Note>? = null
 
+    var inGatherers: List<NotesGatherer>? = null
+
+    fun inGatherers() = inGatherers ?: listOf<NotesGatherer>().also { inGatherers = it }
+
+    fun addGatherer(gatherer: NotesGatherer) {
+        inGatherers = inGatherers() + gatherer
+    }
+
+    fun removeGatherer(gatherer: NotesGatherer) {
+        inGatherers = inGatherers() - gatherer
+    }
+
+    override fun removeNote(note: Note) {
+        removeReply(note)
+        removeBoost(note)
+        removeReaction(note)
+        removeZap(note)
+        removeZapPayment(note)
+        removeReport(note)
+    }
+
     // These fields are updated every time an event related to this note is received.
     var replies = listOf<Note>()
         private set
@@ -157,11 +177,9 @@ open class Note(
     var zapPayments = mapOf<Note, Note?>()
         private set
 
-    var relays = listOf<RelayBriefInfoCache.RelayBriefInfo>()
+    var relays = listOf<NormalizedRelayUrl>()
         private set
 
-    fun id() = Hex.decode(idHex)
-
     open fun idNote() = toNEvent()
 
     open fun toNEvent(): String {
@@ -183,14 +201,26 @@ open class Note(
         }
     }
 
-    fun relayHintUrl(): String? {
+    fun relayUrls(): List<NormalizedRelayUrl> {
+        val authorRelay = author?.relayHints()?.ifEmpty { null }
+
+        return authorRelay ?: relays
+    }
+
+    fun relayUrlsForReactions(): List<NormalizedRelayUrl> {
+        val authorRelay = author?.inboxRelays()?.ifEmpty { null }
+
+        return authorRelay ?: relays
+    }
+
+    fun relayHintUrl(): NormalizedRelayUrl? {
         val authorRelay = author?.latestMetadataRelay
 
         return if (relays.isNotEmpty()) {
-            if (authorRelay != null && relays.any { it.url == authorRelay }) {
+            if (authorRelay != null && relays.any { it == authorRelay }) {
                 authorRelay
             } else {
-                relays.firstOrNull()?.url
+                relays.firstOrNull()
             }
         } else {
             null
@@ -199,26 +229,7 @@ open class Note(
 
     fun toNostrUri(): String = "nostr:${toNEvent()}"
 
-    open fun idDisplayNote() = idNote().toShortenHex()
-
-    fun channelHex(): HexKey? =
-        if (
-            event is ChannelMessageEvent ||
-            event is ChannelMetadataEvent ||
-            event is ChannelCreateEvent ||
-            event is LiveActivitiesChatMessageEvent ||
-            event is LiveActivitiesEvent ||
-            event is EphemeralChatEvent
-        ) {
-            (event as? ChannelMessageEvent)?.channelId()
-                ?: (event as? ChannelMetadataEvent)?.channelId()
-                ?: (event as? ChannelCreateEvent)?.id
-                ?: (event as? LiveActivitiesChatMessageEvent)?.activity()?.toTag()
-                ?: (event as? LiveActivitiesEvent)?.aTag()?.toTag()
-                ?: (event as? EphemeralChatEvent)?.roomId()?.toKey()
-        } else {
-            null
-        }
+    open fun idDisplayNote() = idNote().toShortDisplay()
 
     open fun address(): Address? = null
 
@@ -293,7 +304,7 @@ open class Note(
         zaps = mapOf<Note, Note?>()
         zapPayments = mapOf<Note, Note?>()
         zapsAmount = BigDecimal.ZERO
-        relays = listOf<RelayBriefInfoCache.RelayBriefInfo>()
+        relays = listOf<NormalizedRelayUrl>()
 
         if (repliesChanged) flowSet?.replies?.invalidateData()
         if (reactionsChanged) flowSet?.reactions?.invalidateData()
@@ -445,17 +456,17 @@ open class Note(
     }
 
     @Synchronized
-    fun addRelaySync(briefInfo: RelayBriefInfoCache.RelayBriefInfo) {
-        if (briefInfo !in relays) {
-            relays = relays + briefInfo
+    fun addRelaySync(relay: NormalizedRelayUrl) {
+        if (relay !in relays) {
+            relays = relays + relay
         }
     }
 
-    fun hasRelay(relay: RelayBriefInfoCache.RelayBriefInfo) = relay !in relays
+    fun hasRelay(relay: NormalizedRelayUrl) = relay in relays
 
-    fun addRelay(brief: RelayBriefInfoCache.RelayBriefInfo) {
-        if (brief !in relays) {
-            addRelaySync(brief)
+    fun addRelay(relay: NormalizedRelayUrl) {
+        if (relay !in relays) {
+            addRelaySync(relay)
             flowSet?.relays?.invalidateData()
         }
     }
@@ -475,21 +486,13 @@ open class Note(
             val zapResponseEvent = next.second?.event as? LnZapPaymentResponseEvent
 
             if (zapResponseEvent != null) {
-                val result =
-                    tryAndWait { continuation ->
-                        account.decryptZapPaymentResponseEvent(zapResponseEvent) { response ->
-                            if (
-                                response is PayInvoiceSuccessResponse &&
-                                account.isNIP47Author(zapResponseEvent.requestAuthor())
-                            ) {
-                                continuation.resume(true)
-                            }
-                        }
-                    }
+                account.nip47SignerState.decryptResponse(zapResponseEvent)?.let { response ->
+                    val result = response is PayInvoiceSuccessResponse && account.nip47SignerState.isNIP47Author(zapResponseEvent.requestAuthor())
 
-                if (!hasSentOne && result == true) {
-                    hasSentOne = true
-                    onWasZappedByAuthor()
+                    if (!hasSentOne && result == true) {
+                        hasSentOne = true
+                        onWasZappedByAuthor()
+                    }
                 }
             }
         }
@@ -506,6 +509,8 @@ open class Note(
             return
         }
 
+        val parallelDecrypt = mutableListOf<Pair<LnZapRequestEvent, LnZapEvent?>>()
+
         zapEvents.forEach { next ->
             val zapRequest = next.key.event as LnZapRequestEvent
             val zapEvent = next.value?.event as? LnZapEvent
@@ -520,7 +525,7 @@ open class Note(
                 // private events
 
                 // if has already decrypted
-                val privateZap = zapRequest.cachedPrivateZap()
+                val privateZap = account.privateZapsDecryptionCache.cachedPrivateZap(zapRequest)
                 if (privateZap != null) {
                     if (privateZap.pubKey == user.pubkeyHex && (option == null || option == zapEvent?.zappedPollOption())) {
                         onWasZappedByAuthor()
@@ -528,21 +533,22 @@ open class Note(
                     }
                 } else {
                     if (account.isWriteable()) {
-                        val result =
-                            tryAndWait { continuation ->
-                                zapRequest.decryptPrivateZap(account.signer) {
-                                    continuation.resume(it)
-                                }
-                            }
-
-                        if (result?.pubKey == user.pubkeyHex && (option == null || option == zapEvent?.zappedPollOption())) {
-                            onWasZappedByAuthor()
-                            return
-                        }
+                        parallelDecrypt.add(Pair(zapRequest, zapEvent))
                     }
                 }
             }
         }
+
+        val result =
+            anyAsync(parallelDecrypt) { pair ->
+                val result = account.privateZapsDecryptionCache.decryptPrivateZap(pair.first)
+
+                result?.pubKey == user.pubkeyHex && (option == null || option == pair.second?.zappedPollOption())
+            }
+
+        if (result) {
+            onWasZappedByAuthor()
+        }
     }
 
     suspend fun isZappedBy(
@@ -608,26 +614,21 @@ open class Note(
         startAmount: BigDecimal,
         paidInvoiceSet: LinkedHashSet<String>,
         zapPayments: List<Pair<Note, Note?>>,
-        signer: NostrSigner,
-        onReady: (BigDecimal) -> Unit,
-    ) {
+        signerState: NwcSignerState,
+    ): BigDecimal {
         if (zapPayments.isEmpty()) {
-            onReady(startAmount)
-            return
+            return startAmount
         }
 
         var output: BigDecimal = startAmount
 
         launchAndWaitAll(zapPayments) { next ->
             val result =
-                tryAndWait { continuation ->
-                    processZapAmountFromResponse(
-                        next.first,
-                        next.second,
-                        continuation,
-                        signer,
-                    )
-                }
+                processZapAmountFromResponse(
+                    next.first,
+                    next.second,
+                    signerState,
+                )
 
             if (result != null && !paidInvoiceSet.contains(result.invoice)) {
                 paidInvoiceSet.add(result.invoice)
@@ -635,27 +636,25 @@ open class Note(
             }
         }
 
-        onReady(output)
+        return output
     }
 
-    private fun processZapAmountFromResponse(
+    private suspend fun processZapAmountFromResponse(
         paymentRequest: Note,
         paymentResponse: Note?,
-        continuation: Continuation<InvoiceAmount?>,
-        signer: NostrSigner,
-    ) {
+        signerState: NwcSignerState,
+    ): InvoiceAmount? {
         val nwcRequest = paymentRequest.event as? LnZapPaymentRequestEvent
         val nwcResponse = paymentResponse?.event as? LnZapPaymentResponseEvent
 
-        if (nwcRequest != null && nwcResponse != null) {
+        return if (nwcRequest != null && nwcResponse != null) {
             processZapAmountFromResponse(
                 nwcRequest,
                 nwcResponse,
-                continuation,
-                signer,
+                signerState,
             )
         } else {
-            continuation.resume(null)
+            null
         }
     }
 
@@ -664,18 +663,19 @@ open class Note(
         val amount: BigDecimal,
     )
 
-    private fun processZapAmountFromResponse(
+    private suspend fun processZapAmountFromResponse(
         nwcRequest: LnZapPaymentRequestEvent,
         nwcResponse: LnZapPaymentResponseEvent,
-        continuation: Continuation<InvoiceAmount?>,
-        signer: NostrSigner,
-    ) {
+        signerState: NwcSignerState,
+    ): InvoiceAmount? {
         // if we can decrypt the reply
-        nwcResponse.response(signer) { noteEvent ->
+        return signerState.decryptResponse(nwcResponse)?.let { noteEvent ->
             // if it is a sucess
             if (noteEvent is PayInvoiceSuccessResponse) {
                 // if we can decrypt the invoice
-                nwcRequest.lnInvoice(signer) { invoice ->
+                val request = signerState.decryptRequest(nwcRequest)
+                val invoice = (request as? PayInvoiceMethod)?.params?.invoice
+                if (invoice != null) {
                     // if we can parse the amount
                     val amount =
                         try {
@@ -687,34 +687,32 @@ open class Note(
 
                     // avoid double counting
                     if (amount != null) {
-                        continuation.resume(InvoiceAmount(invoice, amount))
+                        InvoiceAmount(invoice, amount)
                     } else {
-                        continuation.resume(null)
+                        null
                     }
+                } else {
+                    null
                 }
             } else {
-                continuation.resume(null)
+                null
             }
         }
     }
 
-    suspend fun zappedAmountWithNWCPayments(
-        signer: NostrSigner,
-        onReady: (BigDecimal) -> Unit,
-    ) {
+    suspend fun zappedAmountWithNWCPayments(signerState: NwcSignerState): BigDecimal {
         if (zapPayments.isEmpty()) {
-            onReady(zapsAmount)
+            return zapsAmount
         }
 
         val invoiceSet = LinkedHashSet<String>(zaps.size + zapPayments.size)
         zaps.forEach { (it.value?.event as? LnZapEvent)?.lnInvoice()?.let { invoiceSet.add(it) } }
 
-        zappedAmountCalculation(
+        return zappedAmountCalculation(
             zapsAmount,
             invoiceSet,
             zapPayments.toList(),
-            signer,
-            onReady,
+            signerState,
         )
     }
 
@@ -769,19 +767,27 @@ open class Note(
     fun hasReacted(
         loggedIn: User,
         content: String,
-    ): Boolean = reactedBy(loggedIn, content).isNotEmpty()
+    ): Boolean = allReactionsOfContentByAuthor(loggedIn, content).isNotEmpty()
 
-    fun reactedBy(
+    fun allReactionsOfContentByAuthor(
         loggedIn: User,
         content: String,
     ): List<Note> = reactions[content]?.filter { it.author == loggedIn } ?: emptyList()
 
-    fun reactedBy(loggedIn: User): List<String> = reactions.filter { it.value.any { it.author == loggedIn } }.mapNotNull { it.key }
+    fun allReactionsByAuthor(loggedIn: User): List<String> = reactions.filter { it.value.any { it.author == loggedIn } }.mapNotNull { it.key }
 
     fun hasBoostedInTheLast5Minutes(loggedIn: User): Boolean {
-        return boosts.firstOrNull {
-            it.author == loggedIn && (it.createdAt() ?: 0) > TimeUtils.fiveMinutesAgo()
-        } != null // 5 minute protection
+        val fiveMinsAgo = TimeUtils.fiveMinutesAgo()
+        return boosts.any {
+            it.author == loggedIn && (it.createdAt() ?: 0) > fiveMinsAgo
+        }
+    }
+
+    fun hasBoostedInTheLast5Minutes(loggedIn: HexKey): Boolean {
+        val fiveMinsAgo = TimeUtils.fiveMinutesAgo()
+        return boosts.any {
+            (it.createdAt() ?: 0) > fiveMinsAgo && it.author?.pubkeyHex == loggedIn
+        }
     }
 
     fun boostedBy(loggedIn: User): List<Note> = boosts.filter { it.author == loggedIn }
@@ -823,7 +829,7 @@ open class Note(
         zapsAmount = BigDecimal.ZERO
     }
 
-    fun isHiddenFor(accountChoices: Account.LiveHiddenUsers): Boolean {
+    fun isHiddenFor(accountChoices: HiddenUsersState.LiveHiddenUsers): Boolean {
         val thisEvent = event ?: return false
         val hash = thisEvent.pubKey.hashCode()
 
@@ -971,7 +977,6 @@ class NoteFlowSet(
         metadata.hasObservers() ||
             reports.hasObservers() ||
             relays.hasObservers() ||
-            metadata.hasObservers() ||
             reactions.hasObservers() ||
             boosts.hasObservers() ||
             replies.hasObservers() ||

amethyst/src/main/java/com/vitorpamplona/amethyst/model/ParticipantListBuilder.kt

@@ -96,7 +96,7 @@ class ParticipantListBuilder {
             it.replyTo?.forEach { addFollowsThatDirectlyParticipateOnToSet(it, followingSet, mySet) }
         }
 
-        LocalCache.getChannelIfExists(baseNote.idHex)?.notes?.forEach { key, it ->
+        LocalCache.getPublicChatChannelIfExists(baseNote.idHex)?.notes?.forEach { key, it ->
             addFollowsThatDirectlyParticipateOnToSet(it, followingSet, mySet)
         }
 

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

@@ -22,23 +22,21 @@ package com.vitorpamplona.amethyst.model
 
 import androidx.compose.runtime.Immutable
 import androidx.compose.runtime.Stable
-import com.vitorpamplona.amethyst.service.checkNotInMainThread
-import com.vitorpamplona.amethyst.ui.note.toShortenHex
-import com.vitorpamplona.ammolite.relays.RelayBriefInfoCache.RelayBriefInfo
+import com.vitorpamplona.amethyst.ui.note.toShortDisplay
 import com.vitorpamplona.quartz.lightning.Lud06
 import com.vitorpamplona.quartz.nip01Core.core.HexKey
 import com.vitorpamplona.quartz.nip01Core.metadata.MetadataEvent
 import com.vitorpamplona.quartz.nip01Core.metadata.UserMetadata
+import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl
 import com.vitorpamplona.quartz.nip01Core.tags.geohash.isTaggedGeoHash
 import com.vitorpamplona.quartz.nip01Core.tags.hashtags.isTaggedHash
 import com.vitorpamplona.quartz.nip01Core.tags.people.PTag
 import com.vitorpamplona.quartz.nip01Core.tags.people.isTaggedUser
 import com.vitorpamplona.quartz.nip02FollowList.ContactListEvent
 import com.vitorpamplona.quartz.nip02FollowList.toImmutableListOfLists
-import com.vitorpamplona.quartz.nip17Dm.base.ChatroomKey
+import com.vitorpamplona.quartz.nip17Dm.settings.ChatMessageRelayListEvent
 import com.vitorpamplona.quartz.nip19Bech32.entities.NProfile
 import com.vitorpamplona.quartz.nip19Bech32.toNpub
-import com.vitorpamplona.quartz.nip51Lists.BookmarkListEvent
 import com.vitorpamplona.quartz.nip56Reports.ReportEvent
 import com.vitorpamplona.quartz.nip56Reports.ReportType
 import com.vitorpamplona.quartz.nip57Zaps.LnZapEvent
@@ -46,7 +44,6 @@ import com.vitorpamplona.quartz.nip65RelayList.AdvertisedRelayListEvent
 import com.vitorpamplona.quartz.utils.DualCase
 import com.vitorpamplona.quartz.utils.Hex
 import com.vitorpamplona.quartz.utils.containsAny
-import kotlinx.collections.immutable.persistentSetOf
 import kotlinx.coroutines.flow.MutableStateFlow
 import java.math.BigDecimal
 
@@ -57,9 +54,8 @@ class User(
     var info: UserMetadata? = null
 
     var latestMetadata: MetadataEvent? = null
-    var latestMetadataRelay: String? = null
+    var latestMetadataRelay: NormalizedRelayUrl? = null
     var latestContactList: ContactListEvent? = null
-    var latestBookmarkList: BookmarkListEvent? = null
 
     var reports = mapOf<User, Set<Note>>()
         private set
@@ -67,32 +63,35 @@ class User(
     var zaps = mapOf<Note, Note?>()
         private set
 
-    var relaysBeingUsed = mapOf<String, RelayInfo>()
-        private set
-
-    var privateChatrooms = mapOf<ChatroomKey, Chatroom>()
+    var relaysBeingUsed = mapOf<NormalizedRelayUrl, RelayInfo>()
         private set
 
     fun pubkey() = Hex.decode(pubkeyHex)
 
     fun pubkeyNpub() = pubkey().toNpub()
 
-    fun pubkeyDisplayHex() = pubkeyNpub().toShortenHex()
+    fun pubkeyDisplayHex() = pubkeyNpub().toShortDisplay()
+
+    fun dmInboxRelayList() = (LocalCache.getAddressableNoteIfExists(ChatMessageRelayListEvent.createAddressTag(pubkeyHex))?.event as? ChatMessageRelayListEvent)
 
     fun authorRelayList() = (LocalCache.getAddressableNoteIfExists(AdvertisedRelayListEvent.createAddressTag(pubkeyHex))?.event as? AdvertisedRelayListEvent)
 
     fun toNProfile() = NProfile.create(pubkeyHex, relayHints())
 
-    fun relayHints() = authorRelayList()?.writeRelays()?.take(3) ?: listOfNotNull(latestMetadataRelay)
+    fun outboxRelays() = authorRelayList()?.writeRelaysNorm() ?: listOfNotNull(latestMetadataRelay)
 
-    fun bestRelayHint() = authorRelayList()?.writeRelays()?.firstOrNull() ?: latestMetadataRelay
+    fun relayHints() = authorRelayList()?.writeRelaysNorm()?.take(3) ?: listOfNotNull(latestMetadataRelay)
+
+    fun inboxRelays() = authorRelayList()?.readRelaysNorm() ?: listOfNotNull(latestMetadataRelay)
+
+    fun dmInboxRelays() = dmInboxRelayList()?.relays()?.ifEmpty { null } ?: inboxRelays()
+
+    fun bestRelayHint() = authorRelayList()?.writeRelaysNorm()?.firstOrNull() ?: latestMetadataRelay
 
     fun toPTag() = PTag(pubkeyHex, bestRelayHint())
 
     fun toNostrUri() = "nostr:${toNProfile()}"
 
-    override fun toString(): String = pubkeyHex
-
     fun toBestShortFirstName(): String {
         val fullName = toBestDisplayName()
 
@@ -115,13 +114,6 @@ class User(
 
     fun profilePicture(): String? = info?.picture
 
-    fun updateBookmark(event: BookmarkListEvent) {
-        if (event.id == latestBookmarkList?.id) return
-
-        latestBookmarkList = event
-        flowSet?.bookmarks?.invalidateData()
-    }
-
     fun updateContactList(event: ContactListEvent) {
         if (event.id == latestContactList?.id) return
 
@@ -221,80 +213,13 @@ class User(
                 }
             }.flatten()
 
-    @Synchronized
-    private fun getOrCreatePrivateChatroomSync(key: ChatroomKey): Chatroom =
-        privateChatrooms[key]
-            ?: run {
-                val privateChatroom = Chatroom()
-                privateChatrooms = privateChatrooms + Pair(key, privateChatroom)
-                privateChatroom
-            }
-
-    private fun getOrCreatePrivateChatroom(user: User): Chatroom {
-        val key = ChatroomKey(persistentSetOf(user.pubkeyHex))
-        return getOrCreatePrivateChatroom(key)
-    }
-
-    private fun getOrCreatePrivateChatroom(key: ChatroomKey): Chatroom = privateChatrooms[key] ?: getOrCreatePrivateChatroomSync(key)
-
-    fun addMessage(
-        room: ChatroomKey,
-        msg: Note,
-    ) {
-        val privateChatroom = getOrCreatePrivateChatroom(room)
-        if (msg !in privateChatroom.roomMessages) {
-            privateChatroom.addMessageSync(msg)
-            flowSet?.messages?.invalidateData()
-        }
-    }
-
-    fun addMessage(
-        user: User,
-        msg: Note,
-    ) {
-        val privateChatroom = getOrCreatePrivateChatroom(user)
-        if (msg !in privateChatroom.roomMessages) {
-            privateChatroom.addMessageSync(msg)
-            flowSet?.messages?.invalidateData()
-        }
-    }
-
-    fun createChatroom(withKey: ChatroomKey) {
-        getOrCreatePrivateChatroom(withKey)
-    }
-
-    fun removeMessage(
-        user: User,
-        msg: Note,
-    ) {
-        checkNotInMainThread()
-
-        val privateChatroom = getOrCreatePrivateChatroom(user)
-        if (msg in privateChatroom.roomMessages) {
-            privateChatroom.removeMessageSync(msg)
-            flowSet?.messages?.invalidateData()
-        }
-    }
-
-    fun removeMessage(
-        room: ChatroomKey,
-        msg: Note,
-    ) {
-        checkNotInMainThread()
-        val privateChatroom = getOrCreatePrivateChatroom(room)
-        if (msg in privateChatroom.roomMessages) {
-            privateChatroom.removeMessageSync(msg)
-            flowSet?.messages?.invalidateData()
-        }
-    }
-
     fun addRelayBeingUsed(
-        relay: RelayBriefInfo,
+        relay: NormalizedRelayUrl,
         eventTime: Long,
     ) {
-        val here = relaysBeingUsed[relay.url]
+        val here = relaysBeingUsed[relay]
         if (here == null) {
-            relaysBeingUsed = relaysBeingUsed + Pair(relay.url, RelayInfo(relay.url, eventTime, 1))
+            relaysBeingUsed = relaysBeingUsed + Pair(relay, RelayInfo(relay, eventTime, 1))
         } else {
             if (eventTime > here.lastEvent) {
                 here.lastEvent = eventTime
@@ -334,19 +259,12 @@ class User(
 
     suspend fun transientFollowerCount(): Int = LocalCache.users.count { _, it -> it.latestContactList?.isTaggedUser(pubkeyHex) ?: false }
 
-    fun hasSentMessagesTo(key: ChatroomKey?): Boolean {
-        val messagesToUser = privateChatrooms[key] ?: return false
-
-        return messagesToUser.authors.any { this == it }
-    }
-
     fun hasReport(
         loggedIn: User,
         type: ReportType,
     ): Boolean =
         reports[loggedIn]?.firstOrNull {
-            it.event is ReportEvent &&
-                (it.event as ReportEvent).reportedAuthor().any { it.type == type }
+            (it.event as? ReportEvent)?.reportedAuthor()?.any { it.type == type } ?: false
         } != null
 
     fun containsAny(hiddenWordsCase: List<DualCase>): Boolean {
@@ -424,10 +342,8 @@ class UserFlowSet(
     val relays = UserBundledRefresherFlow(u)
     val followers = UserBundledRefresherFlow(u)
     val reports = UserBundledRefresherFlow(u)
-    val messages = UserBundledRefresherFlow(u)
     val relayInfo = UserBundledRefresherFlow(u)
     val zaps = UserBundledRefresherFlow(u)
-    val bookmarks = UserBundledRefresherFlow(u)
     val statuses = UserBundledRefresherFlow(u)
 
     fun isInUse(): Boolean =
@@ -436,16 +352,14 @@ class UserFlowSet(
             follows.hasObservers() ||
             followers.hasObservers() ||
             reports.hasObservers() ||
-            messages.hasObservers() ||
             relayInfo.hasObservers() ||
             zaps.hasObservers() ||
-            bookmarks.hasObservers() ||
             statuses.hasObservers()
 }
 
 @Immutable
 data class RelayInfo(
-    val url: String,
+    val url: NormalizedRelayUrl,
     var lastEvent: Long,
     var counter: Long,
 )

amethyst/src/main/java/com/vitorpamplona/amethyst/model/edits/PrivateStorageRelayListDecryptionCache.kt

@@ -0,0 +1,29 @@
+/**
+ * Copyright (c) 2025 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 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.
+ */
+package com.vitorpamplona.amethyst.model.edits
+
+import com.vitorpamplona.amethyst.model.nip51Lists.relayLists.GenericRelayListCache
+import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
+import com.vitorpamplona.quartz.nip37Drafts.privateOutbox.PrivateOutboxRelayListEvent
+
+class PrivateStorageRelayListDecryptionCache(
+    signer: NostrSigner,
+) : GenericRelayListCache<PrivateOutboxRelayListEvent>(signer)

amethyst/src/main/java/com/vitorpamplona/amethyst/model/edits/PrivateStorageRelayListState.kt

@@ -0,0 +1,112 @@
+/**
+ * Copyright (c) 2025 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 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.
+ */
+package com.vitorpamplona.amethyst.model.edits
+
+import android.util.Log
+import com.vitorpamplona.amethyst.model.AccountSettings
+import com.vitorpamplona.amethyst.model.AddressableNote
+import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.model.NoteState
+import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl
+import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
+import com.vitorpamplona.quartz.nip37Drafts.privateOutbox.PrivateOutboxRelayListEvent
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.DelicateCoroutinesApi
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.flowOn
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.onStart
+import kotlinx.coroutines.flow.stateIn
+import kotlinx.coroutines.launch
+
+class PrivateStorageRelayListState(
+    val signer: NostrSigner,
+    val cache: LocalCache,
+    val decryptionCache: PrivateStorageRelayListDecryptionCache,
+    val scope: CoroutineScope,
+    val settings: AccountSettings,
+) {
+    fun getPrivateOutboxRelayListAddress() = PrivateOutboxRelayListEvent.createAddress(signer.pubKey)
+
+    fun getPrivateOutboxRelayListNote(): AddressableNote = LocalCache.getOrCreateAddressableNote(getPrivateOutboxRelayListAddress())
+
+    fun getPrivateOutboxRelayListFlow(): StateFlow<NoteState> = getPrivateOutboxRelayListNote().flow().metadata.stateFlow
+
+    fun getPrivateOutboxRelayList(): PrivateOutboxRelayListEvent? = getPrivateOutboxRelayListNote().event as? PrivateOutboxRelayListEvent
+
+    suspend fun normalizePrivateOutboxRelayListWithBackup(note: Note): Set<NormalizedRelayUrl> {
+        val event = note.event as? PrivateOutboxRelayListEvent ?: settings.backupPrivateHomeRelayList
+        return event?.let { decryptionCache.relays(it) } ?: emptySet()
+    }
+
+    val flow =
+        getPrivateOutboxRelayListFlow()
+            .map { normalizePrivateOutboxRelayListWithBackup(it.note) }
+            .onStart {
+                emit(normalizePrivateOutboxRelayListWithBackup(getPrivateOutboxRelayListNote()))
+            }.flowOn(Dispatchers.Default)
+            .stateIn(
+                scope,
+                SharingStarted.Eagerly,
+                emptySet(),
+            )
+
+    suspend fun saveRelayList(relays: List<NormalizedRelayUrl>): PrivateOutboxRelayListEvent {
+        val relayListForPrivateOutbox = getPrivateOutboxRelayList()
+
+        return if (relayListForPrivateOutbox != null) {
+            PrivateOutboxRelayListEvent.updateRelayList(
+                earlierVersion = relayListForPrivateOutbox,
+                relays = relays,
+                signer = signer,
+            )
+        } else {
+            PrivateOutboxRelayListEvent.create(
+                relays = relays,
+                signer = signer,
+            )
+        }
+    }
+
+    init {
+        settings.backupPrivateHomeRelayList?.let { event ->
+            Log.d("AccountRegisterObservers", "Loading saved private home relay list ${event.toJson()}")
+            @OptIn(DelicateCoroutinesApi::class)
+            GlobalScope.launch(Dispatchers.IO) {
+                LocalCache.justConsumeMyOwnEvent(event)
+            }
+        }
+
+        scope.launch(Dispatchers.Default) {
+            Log.d("AccountRegisterObservers", "Private Home Relay List Collector Start")
+            getPrivateOutboxRelayListFlow().collect { noteState ->
+                Log.d("AccountRegisterObservers", "Updating Private Home Relay List for ${signer.pubKey}")
+                (noteState.note.event as? PrivateOutboxRelayListEvent)?.let {
+                    settings.updatePrivateHomeRelayList(it)
+                }
+            }
+        }
+    }
+}

amethyst/src/main/java/com/vitorpamplona/amethyst/model/emphChat/EphemeralChatChannel.kt

@@ -0,0 +1,36 @@
+/**
+ * Copyright (c) 2025 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 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.
+ */
+package com.vitorpamplona.amethyst.model.emphChat
+
+import androidx.compose.runtime.Stable
+import com.vitorpamplona.amethyst.model.Channel
+import com.vitorpamplona.quartz.experimental.ephemChat.chat.RoomId
+
+@Stable
+class EphemeralChatChannel(
+    val roomId: RoomId,
+) : Channel() {
+    override fun relays() = setOf(roomId.relayUrl)
+
+    override fun toBestDisplayName() = roomId.toDisplayKey()
+
+    fun anyNameStartsWith(prefix: String): Boolean = roomId.id.contains(prefix, true)
+}

amethyst/src/main/java/com/vitorpamplona/amethyst/model/emphChat/EphemeralChatListDecryptionCache.kt

@@ -0,0 +1,41 @@
+/**
+ * Copyright (c) 2025 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 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.
+ */
+package com.vitorpamplona.amethyst.model.emphChat
+
+import com.vitorpamplona.quartz.experimental.ephemChat.list.EphemeralChatListEvent
+import com.vitorpamplona.quartz.experimental.ephemChat.list.roomSet
+import com.vitorpamplona.quartz.experimental.ephemChat.list.rooms
+import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
+import com.vitorpamplona.quartz.nip51Lists.PrivateTagArrayEventCache
+
+class EphemeralChatListDecryptionCache(
+    val signer: NostrSigner,
+) {
+    val cachedPrivateLists = PrivateTagArrayEventCache<EphemeralChatListEvent>(signer)
+
+    fun cachedRoomSet(event: EphemeralChatListEvent) = cachedPrivateLists.mergeTagListPrecached(event).roomSet()
+
+    fun cachedRooms(event: EphemeralChatListEvent) = cachedPrivateLists.mergeTagListPrecached(event).rooms()
+
+    suspend fun roomSet(event: EphemeralChatListEvent) = cachedPrivateLists.mergeTagList(event).roomSet()
+
+    suspend fun rooms(event: EphemeralChatListEvent) = cachedPrivateLists.mergeTagList(event).rooms()
+}

amethyst/src/main/java/com/vitorpamplona/amethyst/model/emphChat/EphemeralChatListState.kt

@@ -20,29 +20,34 @@
  */
 package com.vitorpamplona.amethyst.model.emphChat
 
+import android.util.Log
+import com.vitorpamplona.amethyst.model.AccountSettings
 import com.vitorpamplona.amethyst.model.AddressableNote
-import com.vitorpamplona.amethyst.model.EphemeralChatChannel
 import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.model.NoteState
-import com.vitorpamplona.amethyst.tryAndWait
 import com.vitorpamplona.quartz.experimental.ephemChat.chat.RoomId
 import com.vitorpamplona.quartz.experimental.ephemChat.list.EphemeralChatListEvent
 import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.DelicateCoroutinesApi
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.flowOn
 import kotlinx.coroutines.flow.onStart
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.flow.transformLatest
-import kotlin.coroutines.resume
+import kotlinx.coroutines.launch
 
 class EphemeralChatListState(
     val signer: NostrSigner,
     val cache: LocalCache,
+    val decryptionCache: EphemeralChatListDecryptionCache,
     val scope: CoroutineScope,
+    val settings: AccountSettings,
 ) {
     fun getEphemeralChatListAddress() = EphemeralChatListEvent.createAddress(signer.pubKey)
 
@@ -52,77 +57,74 @@ class EphemeralChatListState(
 
     fun getEphemeralChatList(): EphemeralChatListEvent? = getEphemeralChatListNote().event as? EphemeralChatListEvent
 
+    suspend fun ephemeralChatListWithBackup(note: Note): Set<RoomId> {
+        val event = note.event as? EphemeralChatListEvent ?: settings.backupEphemeralChatList
+        return event?.let { decryptionCache.roomSet(it) } ?: emptySet()
+    }
+
     @OptIn(ExperimentalCoroutinesApi::class)
-    val liveEphemeralChatList: StateFlow<Set<RoomId>> by lazy {
+    val liveEphemeralChatList: StateFlow<Set<RoomId>> =
         getEphemeralChatListFlow()
             .transformLatest { noteState ->
-                val set =
-                    tryAndWait { continuation ->
-                        (noteState.note.event as? EphemeralChatListEvent)?.publicAndPrivateRoomIds(signer) {
-                            continuation.resume(it)
-                        }
-                    }
-
-                if (set != null) {
-                    emit(set)
-                }
+                emit(ephemeralChatListWithBackup(noteState.note))
             }.onStart {
-                val set =
-                    tryAndWait { continuation ->
-                        getEphemeralChatList()?.publicAndPrivateRoomIds(signer) {
-                            continuation.resume(it)
-                        }
-                    }
-
-                if (set != null) {
-                    emit(set)
-                }
+                emit(ephemeralChatListWithBackup(getEphemeralChatListNote()))
             }.flowOn(Dispatchers.Default)
             .stateIn(
                 scope,
                 SharingStarted.Eagerly,
                 emptySet(),
             )
-    }
 
-    fun follow(
-        channel: EphemeralChatChannel,
-        onDone: (EphemeralChatListEvent) -> Unit,
-    ) {
+    suspend fun follow(channel: EphemeralChatChannel): EphemeralChatListEvent {
         val ephemeralChatList = getEphemeralChatList()
 
-        if (ephemeralChatList == null) {
-            EphemeralChatListEvent.createRoom(
+        return if (ephemeralChatList == null) {
+            EphemeralChatListEvent.create(
                 room = channel.roomId,
                 isPrivate = true,
                 signer = signer,
-                onReady = onDone,
             )
         } else {
-            EphemeralChatListEvent.addRoom(
+            EphemeralChatListEvent.add(
                 earlierVersion = ephemeralChatList,
                 room = channel.roomId,
                 isPrivate = true,
                 signer = signer,
-                onReady = onDone,
             )
         }
     }
 
-    fun unfollow(
-        channel: EphemeralChatChannel,
-        onDone: (EphemeralChatListEvent) -> Unit,
-    ) {
+    suspend fun unfollow(channel: EphemeralChatChannel): EphemeralChatListEvent? {
         val ephemeralChatList = getEphemeralChatList()
-
-        if (ephemeralChatList != null) {
-            EphemeralChatListEvent.removeRoom(
+        return if (ephemeralChatList != null) {
+            EphemeralChatListEvent.remove(
                 earlierVersion = ephemeralChatList,
                 room = channel.roomId,
-                isPrivate = true,
                 signer = signer,
-                onReady = onDone,
             )
+        } else {
+            null
+        }
+    }
+
+    init {
+        settings.backupEphemeralChatList?.let { event ->
+            Log.d("AccountRegisterObservers", "Loading saved ephemeral chat list")
+            @OptIn(DelicateCoroutinesApi::class)
+            GlobalScope.launch(Dispatchers.IO) {
+                LocalCache.justConsumeMyOwnEvent(event)
+            }
+        }
+
+        scope.launch(Dispatchers.Default) {
+            Log.d("AccountRegisterObservers", "EphemeralChatList Collector Start")
+            getEphemeralChatListFlow().collect { noteState ->
+                Log.d("AccountRegisterObservers", "EphemeralChatList List for ${signer.pubKey}")
+                (noteState.note.event as? EphemeralChatListEvent)?.let {
+                    settings.updateEphemeralChatListTo(it)
+                }
+            }
         }
     }
 }

amethyst/src/main/java/com/vitorpamplona/amethyst/model/localRelays/LocalRelayListState.kt

@@ -0,0 +1,60 @@
+/**
+ * Copyright (c) 2025 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 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.
+ */
+package com.vitorpamplona.amethyst.model.localRelays
+
+import com.vitorpamplona.amethyst.model.AccountSettings
+import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl
+import com.vitorpamplona.quartz.nip01Core.relay.normalizer.RelayUrlNormalizer
+import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.flowOn
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.stateIn
+
+class LocalRelayListState(
+    val signer: NostrSigner,
+    val cache: LocalCache,
+    val scope: CoroutineScope,
+    val settings: AccountSettings,
+) {
+    fun normalizeLocalRelayListWithBackup(relayList: Set<String>): Set<NormalizedRelayUrl> = relayList.mapNotNull { RelayUrlNormalizer.normalizeOrNull(it) }.toSet()
+
+    val flow =
+        settings.localRelayServers
+            .map { normalizeLocalRelayListWithBackup(it) }
+            .flowOn(Dispatchers.Default)
+            .stateIn(
+                scope,
+                SharingStarted.Eagerly,
+                normalizeLocalRelayListWithBackup(settings.localRelayServers.value),
+            )
+
+    fun saveRelayList(
+        relays: List<NormalizedRelayUrl>,
+        onDone: () -> Unit,
+    ) {
+        settings.updateLocalRelayServers(relays.map { it.url }.toSet())
+        onDone()
+    }
+}

amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip01UserMetadata/AccountOutboxRelayState.kt

@@ -0,0 +1,58 @@
+/**
+ * Copyright (c) 2025 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 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.
+ */
+package com.vitorpamplona.amethyst.model.nip01UserMetadata
+
+import com.vitorpamplona.amethyst.model.edits.PrivateStorageRelayListState
+import com.vitorpamplona.amethyst.model.localRelays.LocalRelayListState
+import com.vitorpamplona.amethyst.model.nip51Lists.broadcastRelays.BroadcastRelayListState
+import com.vitorpamplona.amethyst.model.nip65RelayList.Nip65RelayListState
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.flowOn
+import kotlinx.coroutines.flow.stateIn
+
+class AccountOutboxRelayState(
+    nip65: Nip65RelayListState,
+    privateStorage: PrivateStorageRelayListState,
+    local: LocalRelayListState,
+    broadcast: BroadcastRelayListState,
+    scope: CoroutineScope,
+) {
+    val flow =
+        combine(
+            nip65.outboxFlow,
+            privateStorage.flow,
+            local.flow,
+            broadcast.flow,
+        ) { nip65Inbox, privateOutBox, localRelays, broadcastRelays ->
+            nip65Inbox + privateOutBox + localRelays + broadcastRelays
+        }.flowOn(Dispatchers.Default)
+            .stateIn(
+                scope,
+                SharingStarted.Eagerly,
+                nip65.outboxFlow.value +
+                    privateStorage.flow.value +
+                    local.flow.value +
+                    broadcast.flow.value,
+            )
+}

amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip01UserMetadata/NotificationInboxRelayState.kt

@@ -18,39 +18,32 @@
  * 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.
  */
-package com.vitorpamplona.amethyst.service.relays
+package com.vitorpamplona.amethyst.model.nip01UserMetadata
 
-import android.app.Application
-import com.vitorpamplona.amethyst.service.connectivity.ConnectivityManager
-import com.vitorpamplona.amethyst.ui.tor.TorManager
+import com.vitorpamplona.amethyst.model.localRelays.LocalRelayListState
+import com.vitorpamplona.amethyst.model.nip65RelayList.Nip65RelayListState
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.SharingStarted
-import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.flowOn
 import kotlinx.coroutines.flow.stateIn
 
-/**
- * There should be only one instance of the Tor binding per app.
- *
- * Tor will connect as soon as status is listened to.
- */
-class RelayManager(
-    app: Application,
+class NotificationInboxRelayState(
+    nip65RelayList: Nip65RelayListState,
+    localRelayList: LocalRelayListState,
     scope: CoroutineScope,
-    torManager: TorManager,
-    connManager: ConnectivityManager,
 ) {
-    val relayService =
+    val flow =
         combine(
-            torManager.status,
-            connManager.status,
-        ) { torStatus, connManager ->
-        }
-
-    val status: StateFlow<RelayServiceStatus> =
-        RelayService(app).status.stateIn(
-            scope,
-            SharingStarted.WhileSubscribed(30000),
-            RelayServiceStatus.Off,
-        )
+            nip65RelayList.inboxFlow,
+            localRelayList.flow,
+        ) { nip65Inbox, localRelays ->
+            nip65Inbox + localRelays
+        }.flowOn(Dispatchers.Default)
+            .stateIn(
+                scope,
+                SharingStarted.Eagerly,
+                nip65RelayList.inboxFlow.value + localRelayList.flow.value,
+            )
 }

amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip01UserMetadata/UserMetadataState.kt

@@ -0,0 +1,123 @@
+/**
+ * Copyright (c) 2025 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 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.
+ */
+package com.vitorpamplona.amethyst.model.nip01UserMetadata
+
+import android.util.Log
+import com.vitorpamplona.amethyst.model.AccountSettings
+import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.model.User
+import com.vitorpamplona.amethyst.model.UserState
+import com.vitorpamplona.quartz.nip01Core.metadata.MetadataEvent
+import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.DelicateCoroutinesApi
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.launch
+
+class UserMetadataState(
+    val signer: NostrSigner,
+    val cache: LocalCache,
+    val scope: CoroutineScope,
+    val settings: AccountSettings,
+) {
+    // fun getEphemeralChatListAddress() = cache.getOrCreateUser(signer.pubKey)
+
+    fun getUserMetadataUser(): User = cache.getOrCreateUser(signer.pubKey)
+
+    fun getUserMetadataFlow(): StateFlow<UserState> = getUserMetadataUser().flow().metadata.stateFlow
+
+    fun getUserMetadataEvent(): MetadataEvent? = getUserMetadataUser().latestMetadata
+
+    suspend fun sendNewUserMetadata(
+        name: String? = null,
+        picture: String? = null,
+        banner: String? = null,
+        website: String? = null,
+        pronouns: String? = null,
+        about: String? = null,
+        nip05: String? = null,
+        lnAddress: String? = null,
+        lnURL: String? = null,
+        twitter: String? = null,
+        mastodon: String? = null,
+        github: String? = null,
+    ): MetadataEvent {
+        val latest = getUserMetadataEvent()
+
+        val template =
+            if (latest != null) {
+                MetadataEvent.updateFromPast(
+                    latest = latest,
+                    name = name,
+                    displayName = name,
+                    picture = picture,
+                    banner = banner,
+                    website = website,
+                    pronouns = pronouns,
+                    about = about,
+                    nip05 = nip05,
+                    lnAddress = lnAddress,
+                    lnURL = lnURL,
+                    twitter = twitter,
+                    mastodon = mastodon,
+                    github = github,
+                )
+            } else {
+                MetadataEvent.createNew(
+                    name = name,
+                    displayName = name,
+                    picture = picture,
+                    banner = banner,
+                    website = website,
+                    pronouns = pronouns,
+                    about = about,
+                    nip05 = nip05,
+                    lnAddress = lnAddress,
+                    lnURL = lnURL,
+                    twitter = twitter,
+                    mastodon = mastodon,
+                    github = github,
+                )
+            }
+
+        return signer.sign(template)
+    }
+
+    init {
+        settings.backupUserMetadata?.let {
+            Log.d("AccountRegisterObservers", "Loading saved user metadata ${it.toJson()}")
+
+            @OptIn(DelicateCoroutinesApi::class)
+            GlobalScope.launch(Dispatchers.IO) { LocalCache.justConsumeMyOwnEvent(it) }
+        }
+
+        // saves contact list for the next time.
+        scope.launch(Dispatchers.Default) {
+            Log.d("AccountRegisterObservers", "Kind 0 Collector Start")
+            getUserMetadataFlow().collect {
+                Log.d("AccountRegisterObservers", "Updating Kind 0 ${it.user.toBestDisplayName()}")
+                settings.updateUserMetadata(it.user.latestMetadata)
+            }
+        }
+    }
+}

amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip02FollowLists/FollowListOutboxOrProxyRelays.kt

@@ -0,0 +1,143 @@
+/**
+ * Copyright (c) 2025 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 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.
+ */
+package com.vitorpamplona.amethyst.model.nip02FollowLists
+
+import com.vitorpamplona.amethyst.model.AddressableNote
+import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.model.NoteState
+import com.vitorpamplona.amethyst.model.nip51Lists.blockedRelays.BlockedRelayListState
+import com.vitorpamplona.amethyst.model.nip51Lists.proxyRelays.ProxyRelayListState
+import com.vitorpamplona.quartz.nip01Core.core.HexKey
+import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl
+import com.vitorpamplona.quartz.nip65RelayList.AdvertisedRelayListEvent
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.emitAll
+import kotlinx.coroutines.flow.flatMapLatest
+import kotlinx.coroutines.flow.flowOn
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.onStart
+import kotlinx.coroutines.flow.stateIn
+import kotlinx.coroutines.flow.transformLatest
+import kotlin.collections.flatten
+
+class FollowListOutboxOrProxyRelays(
+    kind3Follows: FollowListState,
+    blockedRelayList: BlockedRelayListState,
+    proxyRelayList: ProxyRelayListState,
+    val cache: LocalCache,
+    scope: CoroutineScope,
+) {
+    fun getNIP65RelayListAddress(pubkey: HexKey) = AdvertisedRelayListEvent.createAddress(pubkey)
+
+    fun getNIP65RelayListNote(pubkey: HexKey): AddressableNote = cache.getOrCreateAddressableNote(getNIP65RelayListAddress(pubkey))
+
+    fun getNIP65RelayListFlow(pubkey: HexKey): StateFlow<NoteState> = getNIP65RelayListNote(pubkey).flow().metadata.stateFlow
+
+    fun getNIP65RelayList(pubkey: HexKey): AdvertisedRelayListEvent? = getNIP65RelayListNote(pubkey).event as? AdvertisedRelayListEvent
+
+    fun allRelayListFlows(followList: Set<HexKey>): List<StateFlow<NoteState>> = followList.map { getNIP65RelayListFlow(it) }
+
+    fun combineAllFlows(flows: List<StateFlow<NoteState>>): Flow<Set<NormalizedRelayUrl>> =
+        combine(flows) { relayListNotes: Array<NoteState> ->
+            relayListNotes
+                .mapNotNull {
+                    (it.note.event as? AdvertisedRelayListEvent)?.writeRelaysNorm()
+                }.flatten()
+                .toSet()
+        }
+
+    @OptIn(ExperimentalCoroutinesApi::class)
+    val outboxRelayFlow: StateFlow<Set<NormalizedRelayUrl>> =
+        kind3Follows.flow
+            .transformLatest {
+                emitAll(combineAllFlows(allRelayListFlows(it.authors)))
+            }.onStart {
+                emit(
+                    kind3Follows.flow.value.authors
+                        .mapNotNull {
+                            getNIP65RelayList(it)?.writeRelaysNorm()
+                        }.flatten()
+                        .toSet(),
+                )
+            }.distinctUntilChanged()
+            .flowOn(Dispatchers.Default)
+            .stateIn(
+                scope,
+                SharingStarted.Eagerly,
+                emptySet(),
+            )
+
+    val outboxRelayMinusBlockedFlow: StateFlow<Set<NormalizedRelayUrl>> =
+        combine(outboxRelayFlow, blockedRelayList.flow) { followList, blockedRelays ->
+            followList.minus(blockedRelays)
+        }.onStart {
+            emit(outboxRelayFlow.value.minus(blockedRelayList.flow.value.toSet()))
+        }.flowOn(Dispatchers.Default)
+            .stateIn(
+                scope,
+                SharingStarted.Eagerly,
+                emptySet(),
+            )
+
+    @OptIn(ExperimentalCoroutinesApi::class)
+    val flow: StateFlow<Set<NormalizedRelayUrl>> =
+        proxyRelayList.flow
+            .flatMapLatest { proxyRelays ->
+                if (proxyRelays.isEmpty()) {
+                    outboxRelayMinusBlockedFlow
+                } else {
+                    MutableStateFlow(proxyRelays)
+                }
+            }.onStart {
+                emit(
+                    proxyRelayList.flow.value.ifEmpty {
+                        outboxRelayMinusBlockedFlow.value
+                    },
+                )
+            }.flowOn(Dispatchers.Default)
+            .stateIn(
+                scope,
+                SharingStarted.Eagerly,
+                emptySet(),
+            )
+
+    @OptIn(ExperimentalCoroutinesApi::class)
+    val flowSet: StateFlow<Set<String>> =
+        flow
+            .map { relayList ->
+                relayList.map { it.url }.toSet()
+            }.onStart {
+                emit(flow.value.map { it.url }.toSet())
+            }.flowOn(Dispatchers.Default)
+            .stateIn(
+                scope,
+                SharingStarted.Eagerly,
+                emptySet(),
+            )
+}

amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip02FollowLists/FollowListState.kt

@@ -0,0 +1,161 @@
+/**
+ * Copyright (c) 2025 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 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.
+ */
+package com.vitorpamplona.amethyst.model.nip02FollowLists
+
+import android.util.Log
+import androidx.compose.runtime.Immutable
+import com.vitorpamplona.amethyst.model.AccountSettings
+import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.model.User
+import com.vitorpamplona.amethyst.model.UserState
+import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
+import com.vitorpamplona.quartz.nip01Core.tags.geohash.geohashes
+import com.vitorpamplona.quartz.nip02FollowList.ContactListEvent
+import com.vitorpamplona.quartz.nip02FollowList.tags.ContactTag
+import com.vitorpamplona.quartz.nip73ExternalIds.location.GeohashId
+import com.vitorpamplona.quartz.nip73ExternalIds.topics.HashtagId
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.DelicateCoroutinesApi
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.flowOn
+import kotlinx.coroutines.flow.stateIn
+import kotlinx.coroutines.flow.transformLatest
+import kotlinx.coroutines.launch
+
+class FollowListState(
+    val signer: NostrSigner,
+    val cache: LocalCache,
+    val scope: CoroutineScope,
+    val settings: AccountSettings,
+) {
+    // fun getEphemeralChatListAddress() = cache.getOrCreateUser(signer.pubKey)
+
+    fun getFollowListUser(): User = cache.getOrCreateUser(signer.pubKey)
+
+    fun getFollowListFlow(): StateFlow<UserState> = getFollowListUser().flow().follows.stateFlow
+
+    fun getFollowListEvent(): ContactListEvent? = getFollowListUser().latestContactList
+
+    @OptIn(ExperimentalCoroutinesApi::class)
+    private val innerFlow: Flow<Kind3Follows> =
+        getFollowListFlow().transformLatest {
+            emit(buildKind3Follows(it.user.latestContactList ?: settings.backupContactList))
+        }
+
+    val flow =
+        innerFlow
+            .flowOn(Dispatchers.Default)
+            .stateIn(
+                scope,
+                SharingStarted.Eagerly,
+                // this has priority.
+                buildKind3Follows(getFollowListEvent() ?: settings.backupContactList),
+            )
+
+    /**
+     This contains a big OR of everything the user wants to see in the a single feed.
+     */
+    @Immutable
+    class Kind3Follows(
+        val authors: Set<String> = emptySet(),
+        val authorsPlusMe: Set<String>,
+        val hashtags: Set<String> = emptySet(),
+        val geotags: Set<String> = emptySet(),
+        val communities: Set<String> = emptySet(),
+    ) {
+        val geotagScopes: Set<String> = geotags.mapTo(mutableSetOf<String>()) { GeohashId.toScope(it) }
+        val hashtagScopes: Set<String> = hashtags.mapTo(mutableSetOf<String>()) { HashtagId.toScope(it) }
+    }
+
+    fun buildKind3Follows(latestContactList: ContactListEvent?): Kind3Follows {
+        // makes sure the output include only valid p tags
+        val verifiedFollowingUsers = latestContactList?.verifiedFollowKeySet() ?: emptySet()
+
+        return Kind3Follows(
+            authors = verifiedFollowingUsers,
+            authorsPlusMe = verifiedFollowingUsers + signer.pubKey,
+            hashtags =
+                latestContactList
+                    ?.unverifiedFollowTagSet()
+                    ?.map { it.lowercase() }
+                    ?.toSet() ?: emptySet(),
+            geotags =
+                latestContactList
+                    ?.geohashes()
+                    ?.toSet() ?: emptySet(),
+            communities =
+                latestContactList
+                    ?.verifiedFollowAddressSet()
+                    ?.toSet() ?: emptySet(),
+        )
+    }
+
+    suspend fun follow(user: User): ContactListEvent {
+        val contactList = getFollowListEvent()
+
+        return if (contactList != null) {
+            ContactListEvent.followUser(contactList, user.pubkeyHex, signer)
+        } else {
+            ContactListEvent.createFromScratch(
+                followUsers = listOf(ContactTag(user.pubkeyHex, user.bestRelayHint(), null)),
+                relayUse = emptyMap(),
+                signer = signer,
+            )
+        }
+    }
+
+    suspend fun unfollow(user: User): ContactListEvent? {
+        val contactList = getFollowListEvent()
+
+        return if (contactList != null && contactList.tags.isNotEmpty()) {
+            ContactListEvent.unfollowUser(
+                contactList,
+                user.pubkeyHex,
+                signer,
+            )
+        } else {
+            null
+        }
+    }
+
+    init {
+        settings.backupContactList?.let {
+            Log.d("AccountRegisterObservers", "Loading saved contacts ${it.toJson()}")
+
+            @OptIn(DelicateCoroutinesApi::class)
+            GlobalScope.launch(Dispatchers.IO) { LocalCache.justConsumeMyOwnEvent(it) }
+        }
+
+        // saves contact list for the next time.
+        scope.launch(Dispatchers.Default) {
+            Log.d("AccountRegisterObservers", "Kind 3 Collector Start")
+            getFollowListFlow().collect {
+                Log.d("AccountRegisterObservers", "Updating Kind 3 ${signer.pubKey}")
+                settings.updateContactListTo(it.user.latestContactList)
+            }
+        }
+    }
+}

amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip02FollowLists/FollowsPerOutboxRelay.kt

@@ -0,0 +1,137 @@
+/**
+ * Copyright (c) 2025 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 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.
+ */
+package com.vitorpamplona.amethyst.model.nip02FollowLists
+
+import com.vitorpamplona.amethyst.model.AddressableNote
+import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.model.NoteState
+import com.vitorpamplona.amethyst.model.nip51Lists.blockedRelays.BlockedRelayListState
+import com.vitorpamplona.amethyst.model.nip51Lists.proxyRelays.ProxyRelayListState
+import com.vitorpamplona.amethyst.ui.navigation.navs.EmptyNav.scope
+import com.vitorpamplona.quartz.nip01Core.core.HexKey
+import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl
+import com.vitorpamplona.quartz.nip65RelayList.AdvertisedRelayListEvent
+import com.vitorpamplona.quartz.utils.mapOfSet
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.emitAll
+import kotlinx.coroutines.flow.flatMapLatest
+import kotlinx.coroutines.flow.flowOn
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.onStart
+import kotlinx.coroutines.flow.stateIn
+import kotlinx.coroutines.flow.transformLatest
+
+class FollowsPerOutboxRelay(
+    kind3Follows: FollowListState,
+    blockedRelayList: BlockedRelayListState,
+    proxyRelayList: ProxyRelayListState,
+    val cache: LocalCache,
+    scope: CoroutineScope,
+) {
+    fun getNIP65RelayListAddress(pubkey: HexKey) = AdvertisedRelayListEvent.createAddress(pubkey)
+
+    fun getNIP65RelayListNote(pubkey: HexKey): AddressableNote = cache.getOrCreateAddressableNote(getNIP65RelayListAddress(pubkey))
+
+    fun getNIP65RelayListFlow(pubkey: HexKey): StateFlow<NoteState> = getNIP65RelayListNote(pubkey).flow().metadata.stateFlow
+
+    fun getNIP65RelayList(pubkey: HexKey): AdvertisedRelayListEvent? = getNIP65RelayListNote(pubkey).event as? AdvertisedRelayListEvent
+
+    fun allRelayListFlows(followList: Set<HexKey>): List<StateFlow<NoteState>> = followList.map { getNIP65RelayListFlow(it) }
+
+    fun combineAllRelayListFlows(flows: List<StateFlow<NoteState>>): Flow<Map<NormalizedRelayUrl, Set<HexKey>>> =
+        combine(flows) { relayListNotes: Array<NoteState> ->
+            mapOfSet {
+                relayListNotes.forEach { noteState ->
+                    noteState.note.author?.pubkeyHex?.let { authorHex ->
+                        (noteState.note.event as? AdvertisedRelayListEvent)?.writeRelaysNorm()?.forEach { relay ->
+                            add(relay, authorHex)
+                        }
+                    }
+                }
+            }
+        }
+
+    @OptIn(ExperimentalCoroutinesApi::class)
+    val outboxPerRelayFlow: StateFlow<Map<NormalizedRelayUrl, Set<HexKey>>> =
+        kind3Follows.flow
+            .transformLatest {
+                emitAll(combineAllRelayListFlows(allRelayListFlows(it.authors)))
+            }.onStart {
+                emit(
+                    mapOfSet {
+                        kind3Follows.flow.value.authors.map { authorHex ->
+                            getNIP65RelayList(authorHex)?.writeRelaysNorm()?.forEach { relay ->
+                                add(relay, authorHex)
+                            }
+                        }
+                    },
+                )
+            }.distinctUntilChanged()
+            .flowOn(Dispatchers.Default)
+            .stateIn(
+                scope,
+                SharingStarted.Eagerly,
+                emptyMap(),
+            )
+
+    val outboxPerRelayMinusBlockedFlow: StateFlow<Map<NormalizedRelayUrl, Set<HexKey>>> =
+        combine(outboxPerRelayFlow, blockedRelayList.flow) { followList, blockedRelays ->
+            followList.minus(blockedRelays)
+        }.onStart {
+            emit(outboxPerRelayFlow.value.minus(blockedRelayList.flow.value.toSet()))
+        }.flowOn(Dispatchers.Default)
+            .stateIn(
+                scope,
+                SharingStarted.Eagerly,
+                emptyMap(),
+            )
+
+    @OptIn(ExperimentalCoroutinesApi::class)
+    val flow: StateFlow<Map<NormalizedRelayUrl, Set<HexKey>>> =
+        proxyRelayList.flow
+            .flatMapLatest { proxyRelays ->
+                if (proxyRelays.isEmpty()) {
+                    outboxPerRelayMinusBlockedFlow
+                } else {
+                    kind3Follows.flow.map { follows ->
+                        proxyRelays.associateWith { follows.authors }
+                    }
+                }
+            }.onStart {
+                if (proxyRelayList.flow.value.isEmpty()) {
+                    emit(outboxPerRelayMinusBlockedFlow.value)
+                } else {
+                    emit(proxyRelayList.flow.value.associateWith { kind3Follows.flow.value.authors })
+                }
+            }.flowOn(Dispatchers.Default)
+            .stateIn(
+                scope,
+                SharingStarted.Eagerly,
+                emptyMap(),
+            )
+}

amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip03Timestamp/OtsState.kt

@@ -0,0 +1,89 @@
+/**
+ * Copyright (c) 2025 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 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.
+ */
+package com.vitorpamplona.amethyst.model.nip03Timestamp
+
+import android.util.Log
+import com.vitorpamplona.amethyst.model.AccountSettings
+import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.service.ots.OkHttpOtsResolverBuilder
+import com.vitorpamplona.quartz.nip01Core.core.Event
+import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
+import com.vitorpamplona.quartz.nip03Timestamp.OtsEvent
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.flow.update
+import java.util.Base64
+
+class OtsState(
+    val signer: NostrSigner,
+    val cache: LocalCache,
+    val otsResolver: OkHttpOtsResolverBuilder,
+    val scope: CoroutineScope,
+    val settings: AccountSettings,
+) {
+    suspend fun updateAttestations(): List<OtsEvent> {
+        Log.d("Pending Attestations", "Updating ${settings.pendingAttestations.value.size} pending attestations")
+
+        return settings.pendingAttestations.value.toList().mapNotNull { (key, value) ->
+            val otsState = OtsEvent.upgrade(Base64.getDecoder().decode(value), key, otsResolver.build())
+
+            if (otsState != null) {
+                val hint = cache.getNoteIfExists(key)?.toEventHint<Event>()
+                val template =
+                    if (hint != null) {
+                        OtsEvent.build(hint, otsState)
+                    } else {
+                        OtsEvent.build(key, otsState)
+                    }
+
+                val otsEvent = signer.sign(template)
+
+                settings.pendingAttestations.update { it - key }
+
+                otsEvent
+            } else {
+                null
+            }
+        }
+    }
+
+    fun hasPendingAttestations(note: Note): Boolean {
+        val id = note.event?.id ?: note.idHex
+        return settings.pendingAttestations.value[id] != null
+    }
+
+    fun timestamp(note: Note) {
+        if (note.isDraft()) return
+
+        val id = note.event?.id ?: note.idHex
+
+        settings.addPendingAttestation(
+            id = id,
+            stamp =
+                Base64.getEncoder().encodeToString(
+                    OtsEvent.stamp(
+                        id,
+                        otsResolver.build(),
+                    ),
+                ),
+        )
+    }
+}

amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip17Dms/DmInboxRelayState.kt

@@ -0,0 +1,59 @@
+/**
+ * Copyright (c) 2025 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 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.
+ */
+package com.vitorpamplona.amethyst.model.nip17Dms
+
+import com.vitorpamplona.amethyst.model.edits.PrivateStorageRelayListState
+import com.vitorpamplona.amethyst.model.localRelays.LocalRelayListState
+import com.vitorpamplona.amethyst.model.nip65RelayList.Nip65RelayListState
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.flowOn
+import kotlinx.coroutines.flow.stateIn
+
+class DmInboxRelayState(
+    // main relay
+    dmRelayList: DmRelayListState,
+    // backup relays
+    nip65RelayList: Nip65RelayListState,
+    privateOutbox: PrivateStorageRelayListState,
+    localRelayList: LocalRelayListState,
+    scope: CoroutineScope,
+) {
+    val flow =
+        combine(
+            nip65RelayList.inboxFlow,
+            dmRelayList.flow,
+            privateOutbox.flow,
+            localRelayList.flow,
+        ) { nip65Inbox, dmRelayList, privateOutBox, localRelays ->
+            nip65Inbox + dmRelayList + privateOutBox + localRelays
+        }.flowOn(Dispatchers.Default)
+            .stateIn(
+                scope,
+                SharingStarted.Eagerly,
+                nip65RelayList.inboxFlow.value +
+                    dmRelayList.flow.value +
+                    privateOutbox.flow.value +
+                    localRelayList.flow.value,
+            )
+}

amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip17Dms/DmRelayListState.kt

@@ -0,0 +1,109 @@
+/**
+ * Copyright (c) 2025 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 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.
+ */
+package com.vitorpamplona.amethyst.model.nip17Dms
+
+import android.util.Log
+import com.vitorpamplona.amethyst.model.AccountSettings
+import com.vitorpamplona.amethyst.model.AddressableNote
+import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.model.NoteState
+import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl
+import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
+import com.vitorpamplona.quartz.nip17Dm.settings.ChatMessageRelayListEvent
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.DelicateCoroutinesApi
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.flowOn
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.onStart
+import kotlinx.coroutines.flow.stateIn
+import kotlinx.coroutines.launch
+
+class DmRelayListState(
+    val signer: NostrSigner,
+    val cache: LocalCache,
+    val scope: CoroutineScope,
+    val settings: AccountSettings,
+) {
+    fun getDMRelayListAddress() = ChatMessageRelayListEvent.createAddress(signer.pubKey)
+
+    fun getDMRelayListNote(): AddressableNote = LocalCache.getOrCreateAddressableNote(getDMRelayListAddress())
+
+    fun getDMRelayListFlow(): StateFlow<NoteState> = getDMRelayListNote().flow().metadata.stateFlow
+
+    fun getDMRelayList(): ChatMessageRelayListEvent? = getDMRelayListNote().event as? ChatMessageRelayListEvent
+
+    fun normalizeDMRelayListWithBackup(note: Note): Set<NormalizedRelayUrl> {
+        val event = note.event as? ChatMessageRelayListEvent ?: settings.backupDMRelayList
+        return event?.relays()?.toSet() ?: emptySet()
+    }
+
+    val flow =
+        getDMRelayListFlow()
+            .map { normalizeDMRelayListWithBackup(it.note) }
+            .onStart { emit(normalizeDMRelayListWithBackup(getDMRelayListNote())) }
+            .flowOn(Dispatchers.Default)
+            .stateIn(
+                scope,
+                SharingStarted.Eagerly,
+                emptySet(),
+            )
+
+    suspend fun saveRelayList(dmRelays: List<NormalizedRelayUrl>): ChatMessageRelayListEvent {
+        val relayListForDMs = getDMRelayList()
+        return if (relayListForDMs != null && relayListForDMs.tags.isNotEmpty()) {
+            ChatMessageRelayListEvent.updateRelayList(
+                earlierVersion = relayListForDMs,
+                relays = dmRelays,
+                signer = signer,
+            )
+        } else {
+            ChatMessageRelayListEvent.create(
+                relays = dmRelays,
+                signer = signer,
+            )
+        }
+    }
+
+    init {
+        settings.backupDMRelayList?.let {
+            Log.d("AccountRegisterObservers", "Loading saved DM Relay List ${it.toJson()}")
+            @OptIn(DelicateCoroutinesApi::class)
+            GlobalScope.launch(Dispatchers.IO) {
+                LocalCache.justConsumeMyOwnEvent(it)
+            }
+        }
+
+        scope.launch(Dispatchers.Default) {
+            Log.d("AccountRegisterObservers", "NIP-17 Relay List Collector Start")
+            getDMRelayListFlow().collect {
+                Log.d("AccountRegisterObservers", "Updating DM Relay List for ${signer.pubKey}")
+                (it.note.event as? ChatMessageRelayListEvent)?.let {
+                    settings.updateDMRelayList(it)
+                }
+            }
+        }
+    }
+}

amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip18Reposts/RepostAction.kt

@@ -0,0 +1,55 @@
+/**
+ * Copyright (c) 2025 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 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.
+ */
+package com.vitorpamplona.amethyst.model.nip18Reposts
+
+import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.quartz.nip01Core.core.Event
+import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
+import com.vitorpamplona.quartz.nip18Reposts.GenericRepostEvent
+import com.vitorpamplona.quartz.nip18Reposts.RepostEvent
+
+class RepostAction {
+    companion object {
+        suspend fun repost(
+            note: Note,
+            signer: NostrSigner,
+        ): Event? {
+            val noteEvent = note.event ?: return null
+
+            if (note.hasBoostedInTheLast5Minutes(signer.pubKey)) {
+                // has already bosted in the past 5mins
+                return null
+            }
+
+            val noteHint = note.relayHintUrl()
+            val authorHint = note.author?.bestRelayHint()
+
+            val template =
+                if (noteEvent.kind == 1) {
+                    RepostEvent.build(noteEvent, noteHint, authorHint)
+                } else {
+                    GenericRepostEvent.build(noteEvent, noteHint, authorHint)
+                }
+
+            return signer.sign(template)
+        }
+    }
+}

amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip25Reactions/ReactionAction.kt

@@ -0,0 +1,103 @@
+/**
+ * Copyright (c) 2025 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 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.
+ */
+package com.vitorpamplona.amethyst.model.nip25Reactions
+
+import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.model.User
+import com.vitorpamplona.quartz.nip01Core.core.Event
+import com.vitorpamplona.quartz.nip01Core.hints.EventHintBundle
+import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
+import com.vitorpamplona.quartz.nip17Dm.NIP17Factory
+import com.vitorpamplona.quartz.nip17Dm.base.NIP17Group
+import com.vitorpamplona.quartz.nip25Reactions.ReactionEvent
+import com.vitorpamplona.quartz.nip30CustomEmoji.EmojiUrlTag
+
+class ReactionAction {
+    companion object {
+        suspend fun reactTo(
+            note: Note,
+            reaction: String,
+            by: User,
+            signer: NostrSigner,
+            onPublic: (ReactionEvent) -> Unit,
+            onPrivate: suspend (NIP17Factory.Result) -> Unit,
+        ) {
+            if (!signer.isWriteable()) return
+
+            if (note.hasReacted(by, reaction)) {
+                // has already liked this note
+                return
+            }
+
+            val noteEvent = note.event
+            if (noteEvent is NIP17Group) {
+                val users = noteEvent.groupMembers().toList()
+
+                if (reaction.startsWith(":")) {
+                    val emojiUrl = EmojiUrlTag.decode(reaction)
+                    if (emojiUrl != null) {
+                        note.toEventHint<Event>()?.let {
+                            onPrivate(
+                                NIP17Factory().createReactionWithinGroup(
+                                    emojiUrl = emojiUrl,
+                                    originalNote = it,
+                                    to = users,
+                                    signer = signer,
+                                ),
+                            )
+                        }
+
+                        return
+                    }
+                }
+
+                note.toEventHint<Event>()?.let {
+                    onPrivate(
+                        NIP17Factory().createReactionWithinGroup(
+                            content = reaction,
+                            originalNote = it,
+                            to = users,
+                            signer = signer,
+                        ),
+                    )
+                }
+                return
+            } else {
+                if (reaction.startsWith(":")) {
+                    val emojiUrl = EmojiUrlTag.decode(reaction)
+                    if (emojiUrl != null) {
+                        note.event?.let {
+                            val template = ReactionEvent.build(emojiUrl, EventHintBundle(it, note.relayHintUrl()))
+
+                            onPublic(signer.sign(template))
+                        }
+
+                        return
+                    }
+                }
+
+                note.toEventHint<Event>()?.let {
+                    onPublic(signer.sign(ReactionEvent.build(reaction, it)))
+                }
+            }
+        }
+    }
+}

amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip28PublicChats/PublicChatChannel.kt

@@ -0,0 +1,101 @@
+/**
+ * Copyright (c) 2025 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 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.
+ */
+package com.vitorpamplona.amethyst.model.nip28PublicChats
+
+import androidx.compose.runtime.Stable
+import com.vitorpamplona.amethyst.model.Channel
+import com.vitorpamplona.amethyst.model.User
+import com.vitorpamplona.amethyst.ui.note.toShortDisplay
+import com.vitorpamplona.quartz.nip01Core.hints.EventHintBundle
+import com.vitorpamplona.quartz.nip01Core.hints.types.EventIdHintOptional
+import com.vitorpamplona.quartz.nip02FollowList.EmptyTagList
+import com.vitorpamplona.quartz.nip02FollowList.toImmutableListOfLists
+import com.vitorpamplona.quartz.nip19Bech32.entities.NEvent
+import com.vitorpamplona.quartz.nip28PublicChat.admin.ChannelCreateEvent
+import com.vitorpamplona.quartz.nip28PublicChat.admin.ChannelMetadataEvent
+import com.vitorpamplona.quartz.nip28PublicChat.base.ChannelDataNorm
+
+@Stable
+class PublicChatChannel(
+    val idHex: String,
+) : Channel() {
+    var creator: User? = null
+    var event: ChannelCreateEvent? = null
+
+    var info = ChannelDataNorm(null, null, null, null)
+    var infoTags = EmptyTagList
+    var updatedMetadataAt: Long = 0
+
+    override fun relays() = info.relays?.toSet() ?: super.relays()
+
+    fun relayHintUrls() = relays().take(3)
+
+    fun relayHintUrl() = relays().firstOrNull()
+
+    fun toNEvent() = NEvent.create(idHex, event?.pubKey, ChannelCreateEvent.KIND, relayHintUrls())
+
+    fun toNostrUri() = "nostr:${toNEvent()}"
+
+    fun toEventHint() = event?.let { EventHintBundle(it, relayHintUrl(), null) }
+
+    fun toEventId() = EventIdHintOptional(idHex, relayHintUrl())
+
+    fun updateChannelInfo(
+        creator: User,
+        event: ChannelCreateEvent,
+    ) {
+        this.creator = creator
+        this.event = event
+
+        this.info = event.channelInfo()
+        this.infoTags = event.tags.toImmutableListOfLists()
+        this.updatedMetadataAt = event.createdAt
+
+        updateChannelInfo()
+    }
+
+    fun updateChannelInfo(
+        creator: User,
+        event: ChannelMetadataEvent,
+    ) {
+        this.creator = creator
+
+        this.info = event.channelInfo()
+        this.infoTags = event.tags.toImmutableListOfLists()
+        this.updatedMetadataAt = event.createdAt
+
+        super.updateChannelInfo()
+    }
+
+    override fun toBestDisplayName(): String = info.name ?: toNEvent().toShortDisplay()
+
+    fun summary(): String? = info.about
+
+    fun profilePicture(): String? {
+        if (info.picture.isNullOrBlank()) return creator?.info?.banner
+        return info.picture ?: creator?.info?.banner
+    }
+
+    fun anyNameStartsWith(prefix: String): Boolean =
+        idHex.startsWith(prefix) ||
+            info.name?.contains(prefix, true) == true ||
+            info.about?.contains(prefix, true) == true
+}

amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip28PublicChats/PublicChatListDecryptionCache.kt

@@ -0,0 +1,41 @@
+/**
+ * Copyright (c) 2025 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 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.
+ */
+package com.vitorpamplona.amethyst.model.nip28PublicChats
+
+import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
+import com.vitorpamplona.quartz.nip28PublicChat.list.ChannelListEvent
+import com.vitorpamplona.quartz.nip28PublicChat.list.channelSet
+import com.vitorpamplona.quartz.nip28PublicChat.list.channels
+import com.vitorpamplona.quartz.nip51Lists.PrivateTagArrayEventCache
+
+class PublicChatListDecryptionCache(
+    val signer: NostrSigner,
+) {
+    val cachedPrivateLists = PrivateTagArrayEventCache<ChannelListEvent>(signer)
+
+    fun cachedChannelSet(event: ChannelListEvent) = cachedPrivateLists.mergeTagListPrecached(event).channelSet()
+
+    fun cachedChannels(event: ChannelListEvent) = cachedPrivateLists.mergeTagListPrecached(event).channels()
+
+    suspend fun channelSet(event: ChannelListEvent) = cachedPrivateLists.mergeTagList(event).channelSet()
+
+    suspend fun channels(event: ChannelListEvent) = cachedPrivateLists.mergeTagList(event).channels()
+}

amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip28PublicChats/PublicChatListState.kt

@@ -20,18 +20,21 @@
  */
 package com.vitorpamplona.amethyst.model.nip28PublicChats
 
+import android.util.Log
+import com.vitorpamplona.amethyst.model.AccountSettings
 import com.vitorpamplona.amethyst.model.AddressableNote
 import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.model.NoteState
-import com.vitorpamplona.amethyst.model.PublicChatChannel
-import com.vitorpamplona.amethyst.tryAndWait
 import com.vitorpamplona.quartz.nip01Core.core.HexKey
-import com.vitorpamplona.quartz.nip01Core.hints.types.EventIdHint
 import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
 import com.vitorpamplona.quartz.nip28PublicChat.list.ChannelListEvent
+import com.vitorpamplona.quartz.nip28PublicChat.list.tags.ChannelTag
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.DelicateCoroutinesApi
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.flowOn
@@ -39,12 +42,14 @@ import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.onStart
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.flow.transformLatest
-import kotlin.coroutines.resume
+import kotlinx.coroutines.launch
 
 class PublicChatListState(
     val signer: NostrSigner,
     val cache: LocalCache,
+    val decryptionCache: PublicChatListDecryptionCache,
     val scope: CoroutineScope,
+    val settings: AccountSettings,
 ) {
     fun getChannelListAddress() = ChannelListEvent.createAddress(signer.pubKey)
 
@@ -54,97 +59,87 @@ class PublicChatListState(
 
     fun getChannelList(): ChannelListEvent? = getChannelListNote().event as? ChannelListEvent
 
+    suspend fun publicChatListWithBackup(note: Note): Set<ChannelTag> {
+        val event = note.event as? ChannelListEvent ?: settings.backupChannelList
+        return event?.let { decryptionCache.channelSet(it) } ?: emptySet()
+    }
+
     @OptIn(ExperimentalCoroutinesApi::class)
-    val livePublicChatList: StateFlow<Set<EventIdHint>> by lazy {
+    val flow: StateFlow<Set<ChannelTag>> =
         getChannelListFlow()
             .transformLatest { noteState ->
-                val set =
-                    tryAndWait { continuation ->
-                        (noteState.note.event as? ChannelListEvent)?.publicAndPrivateChannels(signer) {
-                            continuation.resume(it)
-                        }
-                    }
-
-                if (set != null) {
-                    emit(set)
-                }
+                emit(publicChatListWithBackup(noteState.note))
             }.onStart {
-                val set =
-                    tryAndWait { continuation ->
-                        getChannelList()?.publicAndPrivateChannels(signer) {
-                            continuation.resume(it)
-                        }
-                    }
-
-                if (set != null) {
-                    emit(set)
-                }
+                emit(publicChatListWithBackup(getChannelListNote()))
             }.flowOn(Dispatchers.Default)
             .stateIn(
                 scope,
                 SharingStarted.Eagerly,
                 emptySet(),
             )
-    }
 
     @OptIn(ExperimentalCoroutinesApi::class)
-    val livePublicChatEventIdSet: StateFlow<Set<HexKey>> by lazy {
-        livePublicChatList
+    val flowSet: StateFlow<Set<HexKey>> =
+        flow
             .map {
                 it.mapTo(mutableSetOf()) { it.eventId }
+            }.onStart {
+                emit(flow.value.mapTo(mutableSetOf()) { it.eventId })
             }.flowOn(Dispatchers.Default)
             .stateIn(
                 scope,
                 SharingStarted.Eagerly,
                 emptySet(),
             )
-    }
 
-    fun follow(
-        channel: PublicChatChannel,
-        onDone: (ChannelListEvent) -> Unit,
-    ) {
+    suspend fun follow(channel: PublicChatChannel): ChannelListEvent {
         val publicChatList = getChannelList()
 
-        val fullHint = channel.toEventHint()
-        if (fullHint != null) {
-            if (publicChatList == null) {
-                ChannelListEvent.createChannel(fullHint, true, signer, onReady = onDone)
-            } else {
-                ChannelListEvent.addChannel(publicChatList, fullHint, true, signer, onReady = onDone)
-            }
+        return if (publicChatList == null) {
+            ChannelListEvent.create(ChannelTag(channel.idHex, channel.relayHintUrl()), true, signer)
         } else {
-            val partialHint = channel.toEventId()
-            if (publicChatList == null) {
-                ChannelListEvent.createChannel(partialHint, true, signer, onReady = onDone)
-            } else {
-                ChannelListEvent.addChannel(publicChatList, partialHint, true, signer, onReady = onDone)
-            }
+            ChannelListEvent.add(publicChatList, ChannelTag(channel.idHex, channel.relayHintUrl()), true, signer)
         }
     }
 
-    fun follow(
-        channels: List<PublicChatChannel>,
-        onDone: (ChannelListEvent) -> Unit,
-    ) {
+    suspend fun follow(channels: List<PublicChatChannel>): ChannelListEvent {
         val publicChatList = getChannelList()
 
-        val partialHint = channels.map { it.toEventId() }
-        if (publicChatList == null) {
-            ChannelListEvent.createChannels(partialHint, true, signer, onReady = onDone)
+        val channelTags = channels.map { ChannelTag(it.idHex, it.relayHintUrl()) }
+        return if (publicChatList == null) {
+            ChannelListEvent.create(channelTags, true, signer)
         } else {
-            ChannelListEvent.addChannels(publicChatList, partialHint, true, signer, onReady = onDone)
+            ChannelListEvent.add(publicChatList, channelTags, true, signer)
         }
     }
 
-    fun unfollow(
-        channel: PublicChatChannel,
-        onDone: (ChannelListEvent) -> Unit,
-    ) {
+    suspend fun unfollow(channel: PublicChatChannel): ChannelListEvent? {
         val publicChatList = getChannelList()
 
-        if (publicChatList != null) {
-            ChannelListEvent.removeChannel(publicChatList, channel.idHex, signer, onReady = onDone)
+        return if (publicChatList != null) {
+            ChannelListEvent.remove(publicChatList, ChannelTag(channel.idHex, channel.relayHintUrl()), signer)
+        } else {
+            null
+        }
+    }
+
+    init {
+        settings.backupChannelList?.let { event ->
+            Log.d("AccountRegisterObservers", "Loading saved channel list ${event.toJson()}")
+            @OptIn(DelicateCoroutinesApi::class)
+            GlobalScope.launch(Dispatchers.IO) {
+                LocalCache.justConsumeMyOwnEvent(event)
+            }
+        }
+
+        scope.launch(Dispatchers.Default) {
+            Log.d("AccountRegisterObservers", "Channel List Collector Start")
+            getChannelListFlow().collect {
+                Log.d("AccountRegisterObservers", "Channel List for ${signer.pubKey}")
+                (it.note.event as? ChannelListEvent)?.let {
+                    settings.updateChannelListTo(it)
+                }
+            }
         }
     }
 }

amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip30CustomEmojis/EmojiPackState.kt

@@ -23,6 +23,7 @@ package com.vitorpamplona.amethyst.model.nip30CustomEmojis
 import com.vitorpamplona.amethyst.commons.richtext.MediaUrlImage
 import com.vitorpamplona.amethyst.model.AddressableNote
 import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.model.NoteState
 import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
 import com.vitorpamplona.quartz.nip01Core.tags.addressables.taggedAddresses
@@ -37,6 +38,7 @@ import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.combineTransform
 import kotlinx.coroutines.flow.emitAll
 import kotlinx.coroutines.flow.flowOn
+import kotlinx.coroutines.flow.onStart
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.flow.transformLatest
 
@@ -67,17 +69,18 @@ class EmojiPackState(
         }
 
     @OptIn(ExperimentalCoroutinesApi::class)
-    val liveEmojiSelectionPack: StateFlow<List<StateFlow<NoteState>>?> by lazy {
+    val flow: StateFlow<List<StateFlow<NoteState>>?> =
         getEmojiPackSelectionFlow()
             .transformLatest {
                 emit(convertEmojiSelectionPack(it.note.event as? EmojiPackSelectionEvent))
+            }.onStart {
+                emit(convertEmojiSelectionPack(getEmojiPackSelection()))
             }.flowOn(Dispatchers.Default)
             .stateIn(
                 scope,
                 SharingStarted.Eagerly,
-                convertEmojiSelectionPack(getEmojiPackSelection()),
+                emptyList(),
             )
-    }
 
     fun convertEmojiPack(pack: EmojiPackEvent): List<EmojiMedia> =
         pack.taggedEmojis().map {
@@ -97,8 +100,8 @@ class EmojiPackState(
             .distinctBy { it.link }
 
     @OptIn(ExperimentalCoroutinesApi::class)
-    val myEmojis by lazy {
-        liveEmojiSelectionPack
+    val myEmojis =
+        flow
             .transformLatest { emojiList ->
                 if (emojiList != null) {
                     emitAll(
@@ -109,11 +112,44 @@ class EmojiPackState(
                 } else {
                     emit(emptyList())
                 }
+            }.onStart {
+                emit(
+                    mergePack(
+                        convertEmojiSelectionPack(
+                            getEmojiPackSelection(),
+                        )?.map { it.value }?.toTypedArray() ?: emptyArray(),
+                    ),
+                )
             }.flowOn(Dispatchers.Default)
             .stateIn(
                 scope,
                 SharingStarted.Eagerly,
-                mergePack(convertEmojiSelectionPack(getEmojiPackSelection())?.map { it.value }?.toTypedArray() ?: emptyArray()),
+                emptyList(),
             )
+
+    suspend fun addEmojiPack(emojiPack: Note): EmojiPackSelectionEvent {
+        val emojiPackEvent = emojiPack.event
+        if (emojiPackEvent !is EmojiPackEvent) throw IllegalArgumentException("Cannot add an emoji pack to this kind of event.")
+
+        val eventHint = emojiPack.toEventHint<EmojiPackEvent>() ?: throw IllegalArgumentException("Cannot add an emoji pack to this kind of event.")
+
+        val usersEmojiList = getEmojiPackSelection()
+        return if (usersEmojiList == null) {
+            val template = EmojiPackSelectionEvent.build(listOf(eventHint))
+            signer.sign(template)
+        } else {
+            val template = EmojiPackSelectionEvent.add(usersEmojiList, eventHint)
+            signer.sign(template)
+        }
+    }
+
+    suspend fun removeEmojiPack(emojiPack: Note): EmojiPackSelectionEvent? {
+        val usersEmojiList = getEmojiPackSelection() ?: throw IllegalArgumentException("Cannot remove an emoji pack to this kind of event.")
+
+        val emojiPackEvent = emojiPack.event
+        if (emojiPackEvent !is EmojiPackEvent) return null
+
+        val template = EmojiPackSelectionEvent.remove(usersEmojiList, emojiPackEvent)
+        return signer.sign(template)
     }
 }

amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip38UserStatuses/UserStatusAction.kt

@@ -0,0 +1,62 @@
+/**
+ * Copyright (c) 2025 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 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.
+ */
+package com.vitorpamplona.amethyst.model.nip38UserStatuses
+
+import com.vitorpamplona.amethyst.model.AddressableNote
+import com.vitorpamplona.quartz.nip01Core.core.Event
+import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
+import com.vitorpamplona.quartz.nip09Deletions.DeletionEvent
+import com.vitorpamplona.quartz.nip38UserStatus.StatusEvent
+
+class UserStatusAction {
+    companion object {
+        suspend fun create(
+            newStatus: String,
+            signer: NostrSigner,
+        ): StatusEvent = StatusEvent.create(newStatus, "general", expiration = null, signer)
+
+        suspend fun update(
+            oldStatus: AddressableNote,
+            newStatus: String,
+            signer: NostrSigner,
+        ): StatusEvent {
+            val oldEvent = oldStatus.event as? StatusEvent ?: throw IllegalStateException("Tried to update a non-status event")
+
+            return StatusEvent.update(oldEvent, newStatus, signer)
+        }
+
+        suspend fun delete(
+            oldStatus: AddressableNote,
+            signer: NostrSigner,
+        ): List<Event> {
+            val oldEvent = oldStatus.event as? StatusEvent ?: throw IllegalStateException("Tried to update a non-status event")
+
+            val event = StatusEvent.clear(oldEvent, signer)
+
+            val deletion =
+                signer.sign(
+                    DeletionEvent.buildForVersionOnly(listOf(event)),
+                )
+
+            return listOf(event, deletion)
+        }
+    }
+}

amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip47WalletConnect/NwcSignerState.kt

@@ -0,0 +1,181 @@
+/**
+ * Copyright (c) 2025 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 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.
+ */
+package com.vitorpamplona.amethyst.model.nip47WalletConnect
+
+import com.vitorpamplona.amethyst.Amethyst
+import com.vitorpamplona.amethyst.model.AccountSettings
+import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.service.relayClient.reqCommand.nwc.NWCPaymentQueryState
+import com.vitorpamplona.quartz.nip01Core.core.hexToByteArray
+import com.vitorpamplona.quartz.nip01Core.crypto.KeyPair
+import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl
+import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
+import com.vitorpamplona.quartz.nip01Core.signers.NostrSignerInternal
+import com.vitorpamplona.quartz.nip47WalletConnect.LnZapPaymentRequestEvent
+import com.vitorpamplona.quartz.nip47WalletConnect.LnZapPaymentResponseEvent
+import com.vitorpamplona.quartz.nip47WalletConnect.Nip47WalletConnect
+import com.vitorpamplona.quartz.nip47WalletConnect.NostrWalletConnectRequestCache
+import com.vitorpamplona.quartz.nip47WalletConnect.NostrWalletConnectResponseCache
+import com.vitorpamplona.quartz.nip47WalletConnect.Request
+import com.vitorpamplona.quartz.nip47WalletConnect.Response
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.flowOn
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.stateIn
+import kotlinx.coroutines.launch
+
+/**
+ * Manages NIP-47 (Nostr Wallet Connect) related signing operations and decryption cache for a given account.
+ *
+ * Key Responsibilities:
+ *
+ * - Dynamically creates a NIP-47 signer if the wallet setup changes in the account settings.
+ * - Provides decryption caches to manage decrypted NIP-47 requests and responses efficiently.
+ * - Handles creating of zap payment requests and waits for responses.
+ *
+ * @property signer the main Nostr signer used for general Nostr operations
+ * @property cache the local cache for handling notes and events
+ * @property scope the coroutine scope used for async operations
+ * @property settings the account settings containing NIP-47 configuration
+ */
+class NwcSignerState(
+    val signer: NostrSigner,
+    val cache: LocalCache,
+    val scope: CoroutineScope,
+    val settings: AccountSettings,
+) {
+    /**
+     * Derives a NIP-47 signer from the zap payment request in settings.
+     * If there's no valid configuration, it defaults to the main signer.
+     * Flows updates whenever settings change.
+     */
+    val nip47Signer =
+        settings.zapPaymentRequest
+            .map {
+                buildSigner(it) ?: signer
+            }.flowOn(Dispatchers.Default)
+            .stateIn(
+                scope,
+                SharingStarted.Eagerly,
+                buildSigner(settings.zapPaymentRequest.value) ?: signer,
+            )
+
+    /**
+     * Creates a dedicated request decryption cache for the NIP-47 signer.
+     * Flows updates whenever the signer changes.
+     */
+    val zapPaymentRequestDecryptionCache =
+        nip47Signer
+            .map {
+                NostrWalletConnectRequestCache(it)
+            }.flowOn(Dispatchers.Default)
+            .stateIn(scope, SharingStarted.Eagerly, NostrWalletConnectRequestCache(nip47Signer.value))
+
+    /**
+     * Creates a dedicated response decryption cache for the NIP-47 signer.
+     * Flows updates whenever the signer changes.
+     */
+    val zapPaymentResponseDecryptionCache =
+        nip47Signer
+            .map {
+                NostrWalletConnectResponseCache(it)
+            }.flowOn(Dispatchers.Default)
+            .stateIn(scope, SharingStarted.Eagerly, NostrWalletConnectResponseCache(nip47Signer.value))
+
+    fun buildSigner(uri: Nip47WalletConnect.Nip47URINorm?) =
+        uri?.secret?.hexToByteArray()?.let {
+            NostrSignerInternal(KeyPair(it))
+        }
+
+    fun hasWalletConnectSetup(): Boolean = settings.zapPaymentRequest.value != null
+
+    fun isNIP47Author(pubkeyHex: String?): Boolean = nip47Signer.value.pubKey == pubkeyHex
+
+    /**
+     * Decrypts a NIP-47 payment request using the current signer.
+     *
+     * @param nwcRequest the NIP-47 payment request event to decrypt
+     * @return the decrypted request or null if not set up or decryption fails
+     */
+    suspend fun decryptRequest(nwcRequest: LnZapPaymentRequestEvent): Request? {
+        if (!hasWalletConnectSetup()) return null
+        return zapPaymentRequestDecryptionCache.value.decryptRequest(nwcRequest)
+    }
+
+    /**
+     * Decrypts a NIP-47 payment response using the current signer.
+     *
+     * @param nwsResponse the NIP-47 payment response event to decrypt
+     * @return the decrypted response or null if not set up or decryption fails
+     */
+    suspend fun decryptResponse(nwsResponse: LnZapPaymentResponseEvent): Response? {
+        if (!hasWalletConnectSetup()) return null
+        return zapPaymentResponseDecryptionCache.value.decryptResponse(nwsResponse)
+    }
+
+    /**
+     * Sends a zap payment request to a connected Lightning wallet.
+     * Subscribes to responses and waits up to 60s for a reply.
+     *
+     * @param bolt11 the BOLT-11 invoice to pay
+     * @param zappedNote the note being zapped (if any)
+     * @param onResponse callback to handle the response from the wallet
+     * @return a pair containing the payment request event and target relay URL
+     * @throws IllegalArgumentException if no NIP-47 wallet is set up
+     */
+    suspend fun sendZapPaymentRequestFor(
+        bolt11: String,
+        zappedNote: Note?,
+        onResponse: (Response?) -> Unit,
+    ): Pair<LnZapPaymentRequestEvent, NormalizedRelayUrl> {
+        val walletService = settings.zapPaymentRequest.value
+        if (walletService == null) throw IllegalArgumentException("No NIP47 setup")
+
+        val event = LnZapPaymentRequestEvent.create(bolt11, walletService.pubKeyHex, signer)
+
+        val filter =
+            NWCPaymentQueryState(
+                fromServiceHex = walletService.pubKeyHex,
+                toUserHex = event.pubKey,
+                replyingToHex = event.id,
+                relay = walletService.relayUri,
+            )
+
+        Amethyst.instance.sources.nwc
+            .subscribe(filter)
+
+        scope.launch(Dispatchers.IO) {
+            delay(60000) // waits 1 minute to complete payment.
+            Amethyst.instance.sources.nwc
+                .unsubscribe(filter)
+        }
+
+        cache.consume(event, zappedNote, true, walletService.relayUri) {
+            onResponse(decryptResponse(it))
+        }
+
+        return Pair(event, walletService.relayUri)
+    }
+}

amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip51Lists/BookmarkListState.kt

@@ -0,0 +1,276 @@
+/**
+ * Copyright (c) 2025 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 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.
+ */
+package com.vitorpamplona.amethyst.model.nip51Lists
+
+import com.vitorpamplona.amethyst.model.AddressableNote
+import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.model.NoteState
+import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
+import com.vitorpamplona.quartz.nip51Lists.bookmarkList.BookmarkListEvent
+import com.vitorpamplona.quartz.nip51Lists.bookmarkList.tags.AddressBookmark
+import com.vitorpamplona.quartz.nip51Lists.bookmarkList.tags.BookmarkIdTag
+import com.vitorpamplona.quartz.nip51Lists.bookmarkList.tags.EventBookmark
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.FlowPreview
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.combineTransform
+import kotlinx.coroutines.flow.debounce
+import kotlinx.coroutines.flow.flowOn
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.onStart
+import kotlinx.coroutines.flow.stateIn
+
+class BookmarkListState(
+    val signer: NostrSigner,
+    val cache: LocalCache,
+    val scope: CoroutineScope,
+) {
+    class BookmarkList(
+        val public: List<Note> = emptyList(),
+        val private: List<Note> = emptyList(),
+    )
+
+    fun getBookmarkListAddress() = BookmarkListEvent.createBookmarkAddress(signer.pubKey)
+
+    fun getBookmarkListNote() = cache.getOrCreateAddressableNote(getBookmarkListAddress())
+
+    fun getBookmarkListFlow(): StateFlow<NoteState> = getBookmarkListNote().flow().metadata.stateFlow
+
+    fun getBookmarkList(): BookmarkListEvent? = getBookmarkListNote().event as? BookmarkListEvent
+
+    suspend fun publicBookmarks(note: Note): List<BookmarkIdTag> {
+        val noteEvent = note.event as? BookmarkListEvent
+        return noteEvent?.publicBookmarks() ?: emptyList()
+    }
+
+    suspend fun privateBookmarks(note: Note): List<BookmarkIdTag> {
+        val noteEvent = note.event as? BookmarkListEvent
+        return noteEvent?.privateBookmarks(signer) ?: emptyList()
+    }
+
+    @OptIn(FlowPreview::class)
+    val publicBookmarks: StateFlow<List<BookmarkIdTag>> =
+        getBookmarkListFlow()
+            .map { noteState ->
+                publicBookmarks(noteState.note)
+            }.onStart {
+                emit(publicBookmarks(getBookmarkListNote()))
+            }.debounce(100)
+            .flowOn(Dispatchers.Default)
+            .stateIn(
+                scope,
+                SharingStarted.Eagerly,
+                emptyList(),
+            )
+
+    @OptIn(FlowPreview::class)
+    val privateBookmarks: StateFlow<List<BookmarkIdTag>> =
+        getBookmarkListFlow()
+            .map { noteState ->
+                privateBookmarks(noteState.note)
+            }.onStart {
+                emit(privateBookmarks(getBookmarkListNote()))
+            }.debounce(100)
+            .flowOn(Dispatchers.Default)
+            .stateIn(
+                scope,
+                SharingStarted.Eagerly,
+                emptyList(),
+            )
+
+    val publicBookmarkEventIdSet =
+        publicBookmarks
+            .map { bookmark ->
+                bookmark
+                    .mapNotNull {
+                        if (it is EventBookmark) it.eventId else null
+                    }.toSet()
+            }.flowOn(Dispatchers.Default)
+            .stateIn(
+                scope,
+                SharingStarted.Eagerly,
+                emptyList(),
+            )
+
+    val publicBookmarkAddressIdSet =
+        publicBookmarks
+            .map { bookmark ->
+                bookmark
+                    .mapNotNull {
+                        if (it is AddressBookmark) it.address else null
+                    }.toSet()
+            }.flowOn(Dispatchers.Default)
+            .stateIn(
+                scope,
+                SharingStarted.Eagerly,
+                emptyList(),
+            )
+
+    val privateBookmarkEventIdSet =
+        privateBookmarks
+            .map { bookmark ->
+                bookmark
+                    .mapNotNull {
+                        if (it is EventBookmark) it.eventId else null
+                    }.toSet()
+            }.flowOn(Dispatchers.Default)
+            .stateIn(
+                scope,
+                SharingStarted.Eagerly,
+                emptyList(),
+            )
+
+    val privateBookmarkAddressIdSet =
+        privateBookmarks
+            .map { bookmark ->
+                bookmark
+                    .mapNotNull {
+                        if (it is AddressBookmark) it.address else null
+                    }.toSet()
+            }.flowOn(Dispatchers.Default)
+            .stateIn(
+                scope,
+                SharingStarted.Eagerly,
+                emptyList(),
+            )
+
+    fun bookmarkList(
+        privateBookmarks: List<BookmarkIdTag>,
+        publicBookmarks: List<BookmarkIdTag>,
+    ): BookmarkList =
+        BookmarkList(
+            public =
+                publicBookmarks
+                    .mapNotNull {
+                        when (it) {
+                            is EventBookmark -> cache.checkGetOrCreateNote(it.eventId)
+                            is AddressBookmark -> cache.getOrCreateAddressableNote(it.address)
+                        }
+                    }.reversed(),
+            private =
+                privateBookmarks
+                    .mapNotNull {
+                        when (it) {
+                            is EventBookmark -> cache.checkGetOrCreateNote(it.eventId)
+                            is AddressBookmark -> cache.getOrCreateAddressableNote(it.address)
+                        }
+                    }.reversed(),
+        )
+
+    @OptIn(FlowPreview::class)
+    val bookmarks: StateFlow<BookmarkList> =
+        combineTransform(privateBookmarks, publicBookmarks) { private, public ->
+            emit(bookmarkList(private, public))
+        }.onStart {
+            emit(bookmarkList(privateBookmarks.value, publicBookmarks.value))
+        }.flowOn(Dispatchers.Default)
+            .stateIn(
+                scope,
+                SharingStarted.Eagerly,
+                BookmarkList(),
+            )
+
+    fun isInPrivateBookmarks(note: Note): Boolean {
+        if (!signer.isWriteable()) return false
+
+        return if (note is AddressableNote) {
+            privateBookmarkAddressIdSet.value.contains(note.address)
+        } else {
+            privateBookmarkEventIdSet.value.contains(note.idHex)
+        }
+    }
+
+    fun isInPublicBookmarks(note: Note): Boolean =
+        if (note is AddressableNote) {
+            publicBookmarkAddressIdSet.value.contains(note.address)
+        } else {
+            publicBookmarkEventIdSet.value.contains(note.idHex)
+        }
+
+    suspend fun addBookmark(
+        note: Note,
+        isPrivate: Boolean,
+    ): BookmarkListEvent {
+        val bookmarkList = getBookmarkList()
+
+        return if (bookmarkList == null) {
+            if (note is AddressableNote) {
+                BookmarkListEvent.create(
+                    bookmarkIdTag = AddressBookmark(note.address, note.relayHintUrl()),
+                    isPrivate = isPrivate,
+                    signer = signer,
+                )
+            } else {
+                BookmarkListEvent.create(
+                    bookmarkIdTag = EventBookmark(note.idHex, note.relayHintUrl()),
+                    isPrivate = isPrivate,
+                    signer = signer,
+                )
+            }
+        } else {
+            if (note is AddressableNote) {
+                BookmarkListEvent.add(
+                    earlierVersion = bookmarkList,
+                    bookmarkIdTag = AddressBookmark(note.address, note.relayHintUrl()),
+                    isPrivate = isPrivate,
+                    signer = signer,
+                )
+            } else {
+                BookmarkListEvent.add(
+                    earlierVersion = bookmarkList,
+                    bookmarkIdTag = EventBookmark(note.idHex, note.relayHintUrl()),
+                    isPrivate = isPrivate,
+                    signer = signer,
+                )
+            }
+        }
+    }
+
+    suspend fun removeBookmark(
+        note: Note,
+        isPrivate: Boolean,
+    ): BookmarkListEvent? {
+        val bookmarkList = getBookmarkList()
+
+        return if (bookmarkList != null) {
+            if (note is AddressableNote) {
+                BookmarkListEvent.remove(
+                    earlierVersion = bookmarkList,
+                    bookmarkIdTag = AddressBookmark(note.address, note.relayHintUrl()),
+                    isPrivate = isPrivate,
+                    signer = signer,
+                )
+            } else {
+                BookmarkListEvent.remove(
+                    earlierVersion = bookmarkList,
+                    bookmarkIdTag = EventBookmark(note.idHex, note.relayHintUrl()),
+                    isPrivate = isPrivate,
+                    signer = signer,
+                )
+            }
+        } else {
+            null
+        }
+    }
+}

amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip51Lists/HiddenUsersState.kt

@@ -0,0 +1,118 @@
+/**
+ * Copyright (c) 2025 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 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.
+ */
+package com.vitorpamplona.amethyst.model.nip51Lists
+
+import androidx.compose.runtime.Immutable
+import com.vitorpamplona.amethyst.model.AccountSettings
+import com.vitorpamplona.amethyst.service.checkNotInMainThread
+import com.vitorpamplona.quartz.nip01Core.core.HexKey
+import com.vitorpamplona.quartz.nip51Lists.muteList.tags.MuteTag
+import com.vitorpamplona.quartz.nip51Lists.muteList.tags.UserTag
+import com.vitorpamplona.quartz.nip51Lists.muteList.tags.WordTag
+import com.vitorpamplona.quartz.utils.DualCase
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.combineTransform
+import kotlinx.coroutines.flow.flowOn
+import kotlinx.coroutines.flow.onStart
+import kotlinx.coroutines.flow.stateIn
+import kotlinx.coroutines.flow.update
+
+class HiddenUsersState(
+    val muteList: StateFlow<List<MuteTag>>,
+    val blockList: StateFlow<List<MuteTag>>,
+    val scope: CoroutineScope,
+    val settings: AccountSettings,
+) {
+    var transientHiddenUsers: MutableStateFlow<Set<String>> = MutableStateFlow(setOf())
+
+    @Immutable
+    class LiveHiddenUsers(
+        val hiddenUsers: Set<String>,
+        val spammers: Set<String>,
+        val hiddenWords: Set<String>,
+        val showSensitiveContent: Boolean?,
+    ) {
+        // speeds up isHidden calculations
+        val hiddenUsersHashCodes = hiddenUsers.mapTo(HashSet()) { it.hashCode() }
+        val spammersHashCodes = spammers.mapTo(HashSet()) { it.hashCode() }
+        val hiddenWordsCase = hiddenWords.map { DualCase(it.lowercase(), it.uppercase()) }
+
+        fun isUserHidden(userHex: HexKey) = hiddenUsers.contains(userHex) || spammers.contains(userHex)
+    }
+
+    suspend fun assembleLiveHiddenUsers(
+        blockList: List<MuteTag>,
+        muteList: List<MuteTag>,
+        transientHiddenUsers: Set<String>,
+        showSensitiveContent: Boolean?,
+    ): LiveHiddenUsers =
+        LiveHiddenUsers(
+            hiddenUsers = blockList.mapNotNullTo(mutableSetOf()) { if (it is UserTag) it.pubKey else null } + muteList.mapNotNull { if (it is UserTag) it.pubKey else null },
+            hiddenWords = blockList.mapNotNullTo(mutableSetOf()) { if (it is WordTag) it.word else null } + muteList.mapNotNull { if (it is WordTag) it.word else null },
+            spammers = transientHiddenUsers,
+            showSensitiveContent = showSensitiveContent,
+        )
+
+    val flow: StateFlow<LiveHiddenUsers> =
+        combineTransform(
+            blockList,
+            muteList,
+            transientHiddenUsers,
+            settings.syncedSettings.security.showSensitiveContent,
+        ) { blockList, muteList, transientHiddenUsers, showSensitiveContent ->
+            checkNotInMainThread()
+            emit(assembleLiveHiddenUsers(blockList, muteList, transientHiddenUsers, showSensitiveContent))
+        }.onStart {
+            emit(
+                assembleLiveHiddenUsers(
+                    blockList.value,
+                    muteList.value,
+                    transientHiddenUsers.value,
+                    settings.syncedSettings.security.showSensitiveContent.value,
+                ),
+            )
+        }.flowOn(Dispatchers.Default)
+            .stateIn(
+                scope,
+                SharingStarted.Eagerly,
+                LiveHiddenUsers(emptySet(), emptySet(), emptySet(), null),
+            )
+
+    fun resetTransientUsers() {
+        transientHiddenUsers.update {
+            emptySet()
+        }
+    }
+
+    fun showUser(pubkeyHex: HexKey) {
+        transientHiddenUsers.update { it - pubkeyHex }
+    }
+
+    fun hideUser(pubkeyHex: HexKey) {
+        transientHiddenUsers.update { it + pubkeyHex }
+    }
+
+    fun isHidden(pubkeyHex: HexKey) = pubkeyHex in transientHiddenUsers.value
+}

amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip51Lists/blockPeopleList/BlockPeopleListState.kt

@@ -0,0 +1,118 @@
+/**
+ * Copyright (c) 2025 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 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.
+ */
+package com.vitorpamplona.amethyst.model.nip51Lists.blockPeopleList
+
+import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.model.NoteState
+import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
+import com.vitorpamplona.quartz.nip51Lists.muteList.tags.MuteTag
+import com.vitorpamplona.quartz.nip51Lists.muteList.tags.UserTag
+import com.vitorpamplona.quartz.nip51Lists.muteList.tags.WordTag
+import com.vitorpamplona.quartz.nip51Lists.peopleList.PeopleListEvent
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.flowOn
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.onStart
+import kotlinx.coroutines.flow.stateIn
+
+class BlockPeopleListState(
+    val signer: NostrSigner,
+    val cache: LocalCache,
+    val decryptionCache: PeopleListDecryptionCache,
+    val scope: CoroutineScope,
+) {
+    fun getBlockListAddress() = PeopleListEvent.createBlockAddress(signer.pubKey)
+
+    fun getBlockListNote() = LocalCache.getOrCreateAddressableNote(getBlockListAddress())
+
+    fun getBlockListFlow(): StateFlow<NoteState> = getBlockListNote().flow().metadata.stateFlow
+
+    fun getBlockList(): PeopleListEvent? = getBlockListNote().event as? PeopleListEvent
+
+    suspend fun blockListWithBackup(note: Note): List<MuteTag> {
+        val event = note.event as? PeopleListEvent
+        return event?.let { decryptionCache.usersAndWords(it) } ?: emptyList()
+    }
+
+    val flow =
+        getBlockListFlow()
+            .map { blockListWithBackup(it.note) }
+            .onStart { emit(blockListWithBackup(getBlockListNote())) }
+            .flowOn(Dispatchers.Default)
+            .stateIn(
+                scope,
+                SharingStarted.Eagerly,
+                emptyList(),
+            )
+
+    suspend fun hideUser(pubkeyHex: String): PeopleListEvent {
+        val blockList = getBlockList()
+
+        return if (blockList != null) {
+            PeopleListEvent.add(
+                earlierVersion = blockList,
+                person = UserTag(pubkeyHex),
+                isPrivate = true,
+                signer = signer,
+            )
+        } else {
+            PeopleListEvent.create(
+                name = PeopleListEvent.BLOCK_LIST_D_TAG,
+                person = UserTag(pubkeyHex),
+                isPrivate = true,
+                signer = signer,
+                dTag = PeopleListEvent.BLOCK_LIST_D_TAG,
+            )
+        }
+    }
+
+    suspend fun showUser(pubkeyHex: String): PeopleListEvent? {
+        val blockList = getBlockList()
+
+        return if (blockList != null) {
+            PeopleListEvent.remove(
+                earlierVersion = blockList,
+                person = UserTag(pubkeyHex),
+                signer = signer,
+            )
+        } else {
+            null
+        }
+    }
+
+    suspend fun showWord(word: String): PeopleListEvent? {
+        val blockList = getBlockList()
+
+        return if (blockList != null) {
+            PeopleListEvent.remove(
+                earlierVersion = blockList,
+                person = WordTag(word),
+                signer = signer,
+            )
+        } else {
+            null
+        }
+    }
+}

amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip51Lists/blockPeopleList/PeopleListDecryptionCache.kt

@@ -0,0 +1,56 @@
+/**
+ * Copyright (c) 2025 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 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.
+ */
+package com.vitorpamplona.amethyst.model.nip51Lists.blockPeopleList
+
+import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
+import com.vitorpamplona.quartz.nip51Lists.PrivateTagArrayEventCache
+import com.vitorpamplona.quartz.nip51Lists.muteList.mutedUserIdSet
+import com.vitorpamplona.quartz.nip51Lists.muteList.mutedUsers
+import com.vitorpamplona.quartz.nip51Lists.muteList.mutedUsersAndWords
+import com.vitorpamplona.quartz.nip51Lists.muteList.mutedWordSet
+import com.vitorpamplona.quartz.nip51Lists.muteList.mutedWords
+import com.vitorpamplona.quartz.nip51Lists.peopleList.PeopleListEvent
+
+class PeopleListDecryptionCache(
+    val signer: NostrSigner,
+) {
+    val cachedPrivateLists = PrivateTagArrayEventCache<PeopleListEvent>(signer)
+
+    fun cachedUsersAndWords(event: PeopleListEvent) = cachedPrivateLists.mergeTagListPrecached(event).mutedUsersAndWords()
+
+    fun cachedUsers(event: PeopleListEvent) = cachedPrivateLists.mergeTagListPrecached(event).mutedUsers()
+
+    fun cachedUserIdSet(event: PeopleListEvent) = cachedPrivateLists.mergeTagListPrecached(event).mutedUserIdSet()
+
+    fun cachedWords(event: PeopleListEvent) = cachedPrivateLists.mergeTagListPrecached(event).mutedWords()
+
+    fun cachedWordSet(event: PeopleListEvent) = cachedPrivateLists.mergeTagListPrecached(event).mutedWordSet()
+
+    suspend fun usersAndWords(event: PeopleListEvent) = cachedPrivateLists.mergeTagList(event).mutedUsersAndWords()
+
+    suspend fun users(event: PeopleListEvent) = cachedPrivateLists.mergeTagList(event).mutedUsers()
+
+    suspend fun userIdSet(event: PeopleListEvent) = cachedPrivateLists.mergeTagList(event).mutedUserIdSet()
+
+    suspend fun words(event: PeopleListEvent) = cachedPrivateLists.mergeTagList(event).mutedWords()
+
+    suspend fun wordSet(event: PeopleListEvent) = cachedPrivateLists.mergeTagList(event).mutedWordSet()
+}

amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip51Lists/blockedRelays/BlockedRelayListDecryptionCache.kt

@@ -0,0 +1,29 @@
+/**
+ * Copyright (c) 2025 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 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.
+ */
+package com.vitorpamplona.amethyst.model.nip51Lists.blockedRelays
+
+import com.vitorpamplona.amethyst.model.nip51Lists.relayLists.GenericRelayListCache
+import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
+import com.vitorpamplona.quartz.nip51Lists.relayLists.BlockedRelayListEvent
+
+class BlockedRelayListDecryptionCache(
+    signer: NostrSigner,
+) : GenericRelayListCache<BlockedRelayListEvent>(signer)

amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip51Lists/blockedRelays/BlockedRelayListState.kt

@@ -0,0 +1,112 @@
+/**
+ * Copyright (c) 2025 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 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.
+ */
+package com.vitorpamplona.amethyst.model.nip51Lists.blockedRelays
+
+import android.util.Log
+import com.vitorpamplona.amethyst.model.AccountSettings
+import com.vitorpamplona.amethyst.model.AddressableNote
+import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.model.NoteState
+import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl
+import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
+import com.vitorpamplona.quartz.nip01Core.signers.SignerExceptions
+import com.vitorpamplona.quartz.nip51Lists.relayLists.BlockedRelayListEvent
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.DelicateCoroutinesApi
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.flowOn
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.onStart
+import kotlinx.coroutines.flow.stateIn
+import kotlinx.coroutines.launch
+
+class BlockedRelayListState(
+    val signer: NostrSigner,
+    val cache: LocalCache,
+    val decryptionCache: BlockedRelayListDecryptionCache,
+    val scope: CoroutineScope,
+    val settings: AccountSettings,
+) {
+    fun getBlockedRelayListAddress() = BlockedRelayListEvent.createAddress(signer.pubKey)
+
+    fun getBlockedRelayListNote(): AddressableNote = LocalCache.getOrCreateAddressableNote(getBlockedRelayListAddress())
+
+    fun getBlockedRelayListFlow(): StateFlow<NoteState> = getBlockedRelayListNote().flow().metadata.stateFlow
+
+    fun getBlockedRelayList(): BlockedRelayListEvent? = getBlockedRelayListNote().event as? BlockedRelayListEvent
+
+    suspend fun normalizeBlockedRelayListWithBackup(note: Note): Set<NormalizedRelayUrl> {
+        val event = note.event as? BlockedRelayListEvent ?: settings.backupBlockedRelayList
+        return event?.let { decryptionCache.relays(it) } ?: emptySet()
+    }
+
+    val flow =
+        getBlockedRelayListFlow()
+            .map {
+                normalizeBlockedRelayListWithBackup(it.note)
+            }.onStart { emit(normalizeBlockedRelayListWithBackup(getBlockedRelayListNote())) }
+            .flowOn(Dispatchers.Default)
+            .stateIn(
+                scope,
+                SharingStarted.Eagerly,
+                emptySet(),
+            )
+
+    suspend fun saveRelayList(blockedRelays: List<NormalizedRelayUrl>): BlockedRelayListEvent {
+        if (!signer.isWriteable()) throw SignerExceptions.ReadOnlyException()
+        val relayListForBlocked = getBlockedRelayList()
+
+        return if (relayListForBlocked != null && relayListForBlocked.tags.isNotEmpty()) {
+            BlockedRelayListEvent.updateRelayList(
+                earlierVersion = relayListForBlocked,
+                relays = blockedRelays,
+                signer = signer,
+            )
+        } else {
+            BlockedRelayListEvent.create(
+                relays = blockedRelays,
+                signer = signer,
+            )
+        }
+    }
+
+    init {
+        settings.backupBlockedRelayList?.let {
+            Log.d("AccountRegisterObservers", "Loading saved Blocked relay list ${it.toJson()}")
+            @OptIn(DelicateCoroutinesApi::class)
+            GlobalScope.launch(Dispatchers.IO) { LocalCache.justConsumeMyOwnEvent(it) }
+        }
+
+        scope.launch(Dispatchers.Default) {
+            Log.d("AccountRegisterObservers", "Blocked Relay List Collector Start")
+            getBlockedRelayListFlow().collect {
+                Log.d("AccountRegisterObservers", "Updating Blocked Relay List for ${signer.pubKey}")
+                (it.note.event as? BlockedRelayListEvent)?.let {
+                    settings.updateBlockedRelayList(it)
+                }
+            }
+        }
+    }
+}

amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip51Lists/broadcastRelays/BroadcastRelayListDecryptionCache.kt

@@ -0,0 +1,29 @@
+/**
+ * Copyright (c) 2025 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 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.
+ */
+package com.vitorpamplona.amethyst.model.nip51Lists.broadcastRelays
+
+import com.vitorpamplona.amethyst.model.nip51Lists.relayLists.GenericRelayListCache
+import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
+import com.vitorpamplona.quartz.nip51Lists.relayLists.BroadcastRelayListEvent
+
+class BroadcastRelayListDecryptionCache(
+    signer: NostrSigner,
+) : GenericRelayListCache<BroadcastRelayListEvent>(signer)

amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip51Lists/broadcastRelays/BroadcastRelayListState.kt

@@ -0,0 +1,87 @@
+/**
+ * Copyright (c) 2025 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 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.
+ */
+package com.vitorpamplona.amethyst.model.nip51Lists.broadcastRelays
+
+import com.vitorpamplona.amethyst.model.AccountSettings
+import com.vitorpamplona.amethyst.model.AddressableNote
+import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.model.NoteState
+import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl
+import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
+import com.vitorpamplona.quartz.nip51Lists.relayLists.BroadcastRelayListEvent
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.flowOn
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.onStart
+import kotlinx.coroutines.flow.stateIn
+
+class BroadcastRelayListState(
+    val signer: NostrSigner,
+    val cache: LocalCache,
+    val decryptionCache: BroadcastRelayListDecryptionCache,
+    val scope: CoroutineScope,
+    val settings: AccountSettings,
+) {
+    fun getBroadcastRelayListAddress() = BroadcastRelayListEvent.createAddress(signer.pubKey)
+
+    fun getBroadcastRelayListNote(): AddressableNote = cache.getOrCreateAddressableNote(getBroadcastRelayListAddress())
+
+    fun getBroadcastRelayListFlow(): StateFlow<NoteState> = getBroadcastRelayListNote().flow().metadata.stateFlow
+
+    fun getBroadcastRelayList(): BroadcastRelayListEvent? = getBroadcastRelayListNote().event as? BroadcastRelayListEvent
+
+    suspend fun normalizeBroadcastRelayListWithBackup(note: Note): Set<NormalizedRelayUrl> {
+        val event = note.event as? BroadcastRelayListEvent
+        return event?.let { decryptionCache.relays(it) } ?: emptySet()
+    }
+
+    val flow =
+        getBroadcastRelayListFlow()
+            .map { normalizeBroadcastRelayListWithBackup(it.note) }
+            .onStart { emit(normalizeBroadcastRelayListWithBackup(getBroadcastRelayListNote())) }
+            .flowOn(Dispatchers.Default)
+            .stateIn(
+                scope,
+                SharingStarted.Eagerly,
+                emptySet(),
+            )
+
+    suspend fun saveRelayList(broadcastRelays: List<NormalizedRelayUrl>): BroadcastRelayListEvent {
+        val relayListForBroadcast = getBroadcastRelayList()
+
+        return if (relayListForBroadcast != null && relayListForBroadcast.tags.isNotEmpty()) {
+            BroadcastRelayListEvent.updateRelayList(
+                earlierVersion = relayListForBroadcast,
+                relays = broadcastRelays,
+                signer = signer,
+            )
+        } else {
+            BroadcastRelayListEvent.create(
+                relays = broadcastRelays,
+                signer = signer,
+            )
+        }
+    }
+}

amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip51Lists/geohashLists/GeohashListCard.kt

@@ -18,16 +18,10 @@
  * 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.
  */
-package com.vitorpamplona.ammolite.relays.datasources
+package com.vitorpamplona.amethyst.model.nip51Lists.geohashLists
 
-interface SubscriptionControllerService {
-    fun start()
+data class GeohashListCard(
+    val relays: List<String>,
+)
 
-    fun stop()
-
-    fun invalidateFilters()
-
-    fun destroy()
-
-    fun printStats(tag: String)
-}
+val EmptyGeohashListCard = GeohashListCard(emptyList())

amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip51Lists/geohashLists/GeohashListDecryptionCache.kt

@@ -0,0 +1,76 @@
+/**
+ * Copyright (c) 2025 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 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.
+ */
+package com.vitorpamplona.amethyst.model.nip51Lists.geohashLists
+
+import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
+import com.vitorpamplona.quartz.nip51Lists.PrivateTagArrayEventCache
+import com.vitorpamplona.quartz.nip51Lists.geohashList.GeohashListEvent
+import com.vitorpamplona.quartz.nip51Lists.geohashList.geohashSet
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.flowOn
+import kotlinx.coroutines.flow.mapLatest
+import kotlinx.coroutines.flow.onStart
+
+class GeohashListDecryptionCache(
+    val signer: NostrSigner,
+) {
+    val cachedPrivateLists = PrivateTagArrayEventCache<GeohashListEvent>(signer)
+
+    fun cachedGeohashes(event: GeohashListEvent) = cachedPrivateLists.mergeTagListPrecached(event).geohashSet()
+
+    suspend fun geohashes(event: GeohashListEvent) = cachedPrivateLists.mergeTagList(event).geohashSet()
+
+    fun fastStartValueForGeohashList(note: Note): GeohashListCard {
+        val noteEvent = note.event as? GeohashListEvent
+        return if (noteEvent != null) {
+            GeohashListCard(cachedGeohashes(noteEvent).toList())
+        } else {
+            EmptyGeohashListCard
+        }
+    }
+
+    @OptIn(ExperimentalCoroutinesApi::class)
+    fun observeDecryptedGeohashList(note: Note): Flow<GeohashListCard> =
+        note
+            .flow()
+            .metadata.stateFlow
+            .mapLatest { noteState ->
+                val event = noteState.note.event as? GeohashListEvent
+                GeohashListCard(event?.let { geohashes(it).toList() } ?: emptyList())
+            }.onStart {
+                val event = note.event as? GeohashListEvent
+                if (event != null) {
+                    val list = geohashes(event)
+                    if (list.isNotEmpty()) {
+                        emit(GeohashListCard(list.toList()))
+                    } else {
+                        emit(EmptyGeohashListCard)
+                    }
+                } else {
+                    emit(EmptyGeohashListCard)
+                }
+            }.distinctUntilChanged()
+            .flowOn(Dispatchers.Default)
+}

amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip51Lists/geohashLists/GeohashListState.kt

@@ -0,0 +1,127 @@
+/**
+ * Copyright (c) 2025 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 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.
+ */
+package com.vitorpamplona.amethyst.model.nip51Lists.geohashLists
+
+import android.util.Log
+import com.vitorpamplona.amethyst.model.AccountSettings
+import com.vitorpamplona.amethyst.model.AddressableNote
+import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.model.NoteState
+import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
+import com.vitorpamplona.quartz.nip51Lists.geohashList.GeohashListEvent
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.DelicateCoroutinesApi
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.flowOn
+import kotlinx.coroutines.flow.onStart
+import kotlinx.coroutines.flow.stateIn
+import kotlinx.coroutines.flow.transformLatest
+import kotlinx.coroutines.launch
+
+class GeohashListState(
+    val signer: NostrSigner,
+    val cache: LocalCache,
+    val decryptionCache: GeohashListDecryptionCache,
+    val scope: CoroutineScope,
+    val settings: AccountSettings,
+) {
+    fun getGeohashListAddress() = GeohashListEvent.createAddress(signer.pubKey)
+
+    fun getGeohashListNote(): AddressableNote = cache.getOrCreateAddressableNote(getGeohashListAddress())
+
+    fun getGeohashListFlow(): StateFlow<NoteState> = getGeohashListNote().flow().metadata.stateFlow
+
+    fun getGeohashList(): GeohashListEvent? = getGeohashListNote().event as? GeohashListEvent
+
+    suspend fun geohashListWithBackup(note: Note): Set<String> {
+        val event = note.event as? GeohashListEvent ?: settings.backupGeohashList
+        return event?.let { decryptionCache.geohashes(it) } ?: emptySet()
+    }
+
+    @OptIn(ExperimentalCoroutinesApi::class)
+    val flow: StateFlow<Set<String>> =
+        getGeohashListFlow()
+            .transformLatest { noteState ->
+                emit(geohashListWithBackup(noteState.note))
+            }.onStart {
+                emit(geohashListWithBackup(getGeohashListNote()))
+            }.flowOn(Dispatchers.Default)
+            .stateIn(
+                scope,
+                SharingStarted.Eagerly,
+                emptySet(),
+            )
+
+    suspend fun follow(geohashes: List<String>): GeohashListEvent {
+        val geohashList = getGeohashList()
+
+        return if (geohashList == null) {
+            GeohashListEvent.create(geohashes, true, signer)
+        } else {
+            GeohashListEvent.add(geohashList, geohashes, true, signer)
+        }
+    }
+
+    suspend fun follow(geohash: String): GeohashListEvent {
+        val geohashList = getGeohashList()
+
+        return if (geohashList == null) {
+            GeohashListEvent.create(geohash, true, signer)
+        } else {
+            GeohashListEvent.add(geohashList, geohash, true, signer)
+        }
+    }
+
+    suspend fun unfollow(geohash: String): GeohashListEvent? {
+        val geohashList = getGeohashList()
+
+        return if (geohashList != null) {
+            GeohashListEvent.remove(geohashList, geohash, signer)
+        } else {
+            null
+        }
+    }
+
+    init {
+        settings.backupGeohashList?.let { event ->
+            Log.d("AccountRegisterObservers", "Loading saved Geohash list ${event.toJson()}")
+            @OptIn(DelicateCoroutinesApi::class)
+            GlobalScope.launch(Dispatchers.IO) {
+                LocalCache.justConsumeMyOwnEvent(event)
+            }
+        }
+
+        scope.launch(Dispatchers.Default) {
+            Log.d("AccountRegisterObservers", "Geohash List Collector Start")
+            getGeohashListFlow().collect { noteState ->
+                Log.d("AccountRegisterObservers", "Geohash List for ${signer.pubKey}")
+                (noteState.note.event as? GeohashListEvent)?.let {
+                    settings.updateGeohashListTo(it)
+                }
+            }
+        }
+    }
+}

amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip51Lists/hashtagLists/HashtagListDecryptionCache.kt

@@ -0,0 +1,36 @@
+/**
+ * Copyright (c) 2025 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 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.
+ */
+package com.vitorpamplona.amethyst.model.nip51Lists.hashtagLists
+
+import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
+import com.vitorpamplona.quartz.nip51Lists.PrivateTagArrayEventCache
+import com.vitorpamplona.quartz.nip51Lists.hashtagList.HashtagListEvent
+import com.vitorpamplona.quartz.nip51Lists.hashtagList.hashtagSet
+
+class HashtagListDecryptionCache(
+    val signer: NostrSigner,
+) {
+    val cachedPrivateLists = PrivateTagArrayEventCache<HashtagListEvent>(signer)
+
+    fun cachedHashtags(event: HashtagListEvent) = cachedPrivateLists.mergeTagListPrecached(event).hashtagSet()
+
+    suspend fun hashtags(event: HashtagListEvent) = cachedPrivateLists.mergeTagList(event).hashtagSet()
+}

amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip51Lists/hashtagLists/HashtagListState.kt

@@ -0,0 +1,127 @@
+/**
+ * Copyright (c) 2025 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 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.
+ */
+package com.vitorpamplona.amethyst.model.nip51Lists.hashtagLists
+
+import android.util.Log
+import com.vitorpamplona.amethyst.model.AccountSettings
+import com.vitorpamplona.amethyst.model.AddressableNote
+import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.model.NoteState
+import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
+import com.vitorpamplona.quartz.nip51Lists.hashtagList.HashtagListEvent
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.DelicateCoroutinesApi
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.flowOn
+import kotlinx.coroutines.flow.onStart
+import kotlinx.coroutines.flow.stateIn
+import kotlinx.coroutines.flow.transformLatest
+import kotlinx.coroutines.launch
+
+class HashtagListState(
+    val signer: NostrSigner,
+    val cache: LocalCache,
+    val decryptionCache: HashtagListDecryptionCache,
+    val scope: CoroutineScope,
+    val settings: AccountSettings,
+) {
+    fun getHashtagListAddress() = HashtagListEvent.createAddress(signer.pubKey)
+
+    fun getHashtagListNote(): AddressableNote = cache.getOrCreateAddressableNote(getHashtagListAddress())
+
+    fun getHashtagListFlow(): StateFlow<NoteState> = getHashtagListNote().flow().metadata.stateFlow
+
+    fun getHashtagList(): HashtagListEvent? = getHashtagListNote().event as? HashtagListEvent
+
+    suspend fun hashtagListWithBackup(note: Note): Set<String> {
+        val event = note.event as? HashtagListEvent ?: settings.backupHashtagList
+        return event?.let { decryptionCache.hashtags(it) } ?: emptySet()
+    }
+
+    @OptIn(ExperimentalCoroutinesApi::class)
+    val flow: StateFlow<Set<String>> =
+        getHashtagListFlow()
+            .transformLatest { noteState ->
+                emit(hashtagListWithBackup(noteState.note))
+            }.onStart {
+                emit(hashtagListWithBackup(getHashtagListNote()))
+            }.flowOn(Dispatchers.Default)
+            .stateIn(
+                scope,
+                SharingStarted.Companion.Eagerly,
+                emptySet(),
+            )
+
+    suspend fun follow(hashtags: List<String>): HashtagListEvent {
+        val hashtagList = getHashtagList()
+
+        return if (hashtagList == null) {
+            HashtagListEvent.Companion.create(hashtags, true, signer)
+        } else {
+            HashtagListEvent.Companion.add(hashtagList, hashtags, true, signer)
+        }
+    }
+
+    suspend fun follow(hashtag: String): HashtagListEvent {
+        val hashtagList = getHashtagList()
+
+        return if (hashtagList == null) {
+            HashtagListEvent.Companion.create(hashtag, true, signer)
+        } else {
+            HashtagListEvent.Companion.add(hashtagList, hashtag, true, signer)
+        }
+    }
+
+    suspend fun unfollow(hashtag: String): HashtagListEvent? {
+        val hashtagList = getHashtagList()
+
+        return if (hashtagList != null) {
+            HashtagListEvent.Companion.remove(hashtagList, hashtag, signer)
+        } else {
+            null
+        }
+    }
+
+    init {
+        settings.backupHashtagList?.let { event ->
+            Log.d("AccountRegisterObservers", "Loading saved Hashtag list ${event.toJson()}")
+            @OptIn(DelicateCoroutinesApi::class)
+            GlobalScope.launch(Dispatchers.IO) {
+                LocalCache.justConsumeMyOwnEvent(event)
+            }
+        }
+
+        scope.launch(Dispatchers.Default) {
+            Log.d("AccountRegisterObservers", "Hashtag List Collector Start")
+            getHashtagListFlow().collect {
+                Log.d("AccountRegisterObservers", "Hashtag List for ${signer.pubKey}")
+                (it.note.event as? HashtagListEvent)?.let {
+                    settings.updateHashtagListTo(it)
+                }
+            }
+        }
+    }
+}

amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip51Lists/indexerRelays/IndexerRelayListDecryptionCache.kt

@@ -0,0 +1,29 @@
+/**
+ * Copyright (c) 2025 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 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.
+ */
+package com.vitorpamplona.amethyst.model.nip51Lists.indexerRelays
+
+import com.vitorpamplona.amethyst.model.nip51Lists.relayLists.GenericRelayListCache
+import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
+import com.vitorpamplona.quartz.nip51Lists.relayLists.IndexerRelayListEvent
+
+class IndexerRelayListDecryptionCache(
+    signer: NostrSigner,
+) : GenericRelayListCache<IndexerRelayListEvent>(signer)

amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip51Lists/indexerRelays/IndexerRelayListState.kt

@@ -0,0 +1,88 @@
+/**
+ * Copyright (c) 2025 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 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.
+ */
+package com.vitorpamplona.amethyst.model.nip51Lists.indexerRelays
+
+import com.vitorpamplona.amethyst.model.AccountSettings
+import com.vitorpamplona.amethyst.model.AddressableNote
+import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.model.NoteState
+import com.vitorpamplona.amethyst.model.nip51Lists.indexerRelays.IndexerRelayListDecryptionCache
+import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl
+import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
+import com.vitorpamplona.quartz.nip51Lists.relayLists.IndexerRelayListEvent
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.flowOn
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.onStart
+import kotlinx.coroutines.flow.stateIn
+
+class IndexerRelayListState(
+    val signer: NostrSigner,
+    val cache: LocalCache,
+    val decryptionCache: IndexerRelayListDecryptionCache,
+    val scope: CoroutineScope,
+    val settings: AccountSettings,
+) {
+    fun getIndexerRelayListAddress() = IndexerRelayListEvent.createAddress(signer.pubKey)
+
+    fun getIndexerRelayListNote(): AddressableNote = cache.getOrCreateAddressableNote(getIndexerRelayListAddress())
+
+    fun getIndexerRelayListFlow(): StateFlow<NoteState> = getIndexerRelayListNote().flow().metadata.stateFlow
+
+    fun getIndexerRelayList(): IndexerRelayListEvent? = getIndexerRelayListNote().event as? IndexerRelayListEvent
+
+    suspend fun normalizeIndexerRelayListWithBackup(note: Note): Set<NormalizedRelayUrl> {
+        val event = note.event as? IndexerRelayListEvent
+        return event?.let { decryptionCache.relays(it) } ?: emptySet()
+    }
+
+    val flow =
+        getIndexerRelayListFlow()
+            .map { normalizeIndexerRelayListWithBackup(it.note) }
+            .onStart { emit(normalizeIndexerRelayListWithBackup(getIndexerRelayListNote())) }
+            .flowOn(Dispatchers.Default)
+            .stateIn(
+                scope,
+                SharingStarted.Eagerly,
+                emptySet(),
+            )
+
+    suspend fun saveRelayList(indexerRelays: List<NormalizedRelayUrl>): IndexerRelayListEvent {
+        val relayListForIndexer = getIndexerRelayList()
+
+        return if (relayListForIndexer != null && relayListForIndexer.tags.isNotEmpty()) {
+            IndexerRelayListEvent.updateRelayList(
+                earlierVersion = relayListForIndexer,
+                relays = indexerRelays,
+                signer = signer,
+            )
+        } else {
+            IndexerRelayListEvent.create(
+                relays = indexerRelays,
+                signer = signer,
+            )
+        }
+    }
+}

amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip51Lists/muteList/MuteListDecryptionCache.kt

@@ -0,0 +1,56 @@
+/**
+ * Copyright (c) 2025 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 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.
+ */
+package com.vitorpamplona.amethyst.model.nip51Lists.muteList
+
+import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
+import com.vitorpamplona.quartz.nip51Lists.PrivateTagArrayEventCache
+import com.vitorpamplona.quartz.nip51Lists.muteList.MuteListEvent
+import com.vitorpamplona.quartz.nip51Lists.muteList.mutedUserIdSet
+import com.vitorpamplona.quartz.nip51Lists.muteList.mutedUsers
+import com.vitorpamplona.quartz.nip51Lists.muteList.mutedUsersAndWords
+import com.vitorpamplona.quartz.nip51Lists.muteList.mutedWordSet
+import com.vitorpamplona.quartz.nip51Lists.muteList.mutedWords
+
+class MuteListDecryptionCache(
+    val signer: NostrSigner,
+) {
+    val cachedPrivateLists = PrivateTagArrayEventCache<MuteListEvent>(signer)
+
+    fun cachedUsersAndWords(event: MuteListEvent) = cachedPrivateLists.mergeTagListPrecached(event).mutedUsersAndWords()
+
+    fun cachedUsers(event: MuteListEvent) = cachedPrivateLists.mergeTagListPrecached(event).mutedUsers()
+
+    fun cachedUserIdSet(event: MuteListEvent) = cachedPrivateLists.mergeTagListPrecached(event).mutedUserIdSet()
+
+    fun cachedWords(event: MuteListEvent) = cachedPrivateLists.mergeTagListPrecached(event).mutedWords()
+
+    fun cachedWordSet(event: MuteListEvent) = cachedPrivateLists.mergeTagListPrecached(event).mutedWordSet()
+
+    suspend fun mutedUsersAndWords(event: MuteListEvent) = cachedPrivateLists.mergeTagList(event).mutedUsersAndWords()
+
+    suspend fun mutedUsers(event: MuteListEvent) = cachedPrivateLists.mergeTagList(event).mutedUsers()
+
+    suspend fun mutedUserIdSet(event: MuteListEvent) = cachedPrivateLists.mergeTagList(event).mutedUserIdSet()
+
+    suspend fun mutedWords(event: MuteListEvent) = cachedPrivateLists.mergeTagList(event).mutedWords()
+
+    suspend fun mutedWordSet(event: MuteListEvent) = cachedPrivateLists.mergeTagList(event).mutedWordSet()
+}

amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip51Lists/muteList/MuteListState.kt

@@ -0,0 +1,161 @@
+/**
+ * Copyright (c) 2025 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 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.
+ */
+package com.vitorpamplona.amethyst.model.nip51Lists.muteList
+
+import android.util.Log
+import com.vitorpamplona.amethyst.model.AccountSettings
+import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.model.NoteState
+import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
+import com.vitorpamplona.quartz.nip51Lists.muteList.MuteListEvent
+import com.vitorpamplona.quartz.nip51Lists.muteList.tags.MuteTag
+import com.vitorpamplona.quartz.nip51Lists.muteList.tags.UserTag
+import com.vitorpamplona.quartz.nip51Lists.muteList.tags.WordTag
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.DelicateCoroutinesApi
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.flowOn
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.onStart
+import kotlinx.coroutines.flow.stateIn
+import kotlinx.coroutines.launch
+
+class MuteListState(
+    val signer: NostrSigner,
+    val cache: LocalCache,
+    val decryptionCache: MuteListDecryptionCache,
+    val scope: CoroutineScope,
+    val settings: AccountSettings,
+) {
+    fun getMuteListAddress() = MuteListEvent.createAddress(signer.pubKey)
+
+    fun getMuteListNote() = cache.getOrCreateAddressableNote(getMuteListAddress())
+
+    fun getMuteListFlow(): StateFlow<NoteState> = getMuteListNote().flow().metadata.stateFlow
+
+    fun getMuteList(): MuteListEvent? = getMuteListNote().event as? MuteListEvent
+
+    suspend fun muteListWithBackup(note: Note): List<MuteTag> {
+        val event = note.event as? MuteListEvent ?: settings.backupMuteList
+        return event?.let { decryptionCache.mutedUsersAndWords(it) } ?: emptyList()
+    }
+
+    val flow =
+        getMuteListFlow()
+            .map { muteListWithBackup(it.note) }
+            .onStart { emit(muteListWithBackup(getMuteListNote())) }
+            .flowOn(Dispatchers.Default)
+            .stateIn(
+                scope,
+                SharingStarted.Eagerly,
+                emptyList(),
+            )
+
+    suspend fun hideUser(pubkeyHex: String): MuteListEvent {
+        val muteList = getMuteList()
+
+        return if (muteList != null) {
+            MuteListEvent.add(
+                earlierVersion = muteList,
+                mute = UserTag(pubkeyHex),
+                isPrivate = true,
+                signer = signer,
+            )
+        } else {
+            MuteListEvent.create(
+                mute = UserTag(pubkeyHex),
+                isPrivate = true,
+                signer = signer,
+            )
+        }
+    }
+
+    suspend fun showUser(pubkeyHex: String): MuteListEvent? {
+        val muteList = getMuteList()
+
+        return if (muteList != null) {
+            MuteListEvent.remove(
+                earlierVersion = muteList,
+                mute = UserTag(pubkeyHex),
+                signer = signer,
+            )
+        } else {
+            null
+        }
+    }
+
+    suspend fun hideWord(word: String): MuteListEvent {
+        val muteList = getMuteList()
+
+        return if (muteList != null) {
+            MuteListEvent.add(
+                earlierVersion = muteList,
+                mute = WordTag(word),
+                isPrivate = true,
+                signer = signer,
+            )
+        } else {
+            MuteListEvent.create(
+                mute = WordTag(word),
+                isPrivate = true,
+                signer = signer,
+            )
+        }
+    }
+
+    suspend fun showWord(word: String): MuteListEvent? {
+        val muteList = getMuteList()
+
+        return if (muteList != null) {
+            MuteListEvent.remove(
+                earlierVersion = muteList,
+                mute = WordTag(word),
+                signer = signer,
+            )
+        } else {
+            null
+        }
+    }
+
+    init {
+        settings.backupMuteList?.let { event ->
+            Log.d("AccountRegisterObservers", "Loading saved mute list ${event.toJson()}")
+            @OptIn(DelicateCoroutinesApi::class)
+            GlobalScope.launch(Dispatchers.IO) {
+                LocalCache.justConsumeMyOwnEvent(event)
+            }
+        }
+
+        scope.launch(Dispatchers.Default) {
+            Log.d("AccountRegisterObservers", "Mute List Collector Start")
+            getMuteListFlow().collect {
+                Log.d("AccountRegisterObservers", "Updating Mute List for ${signer.pubKey}")
+                (it.note.event as? MuteListEvent)?.let {
+                    settings.updateMuteList(it)
+                }
+            }
+        }
+    }
+}

amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip51Lists/proxyRelays/ProxyRelayListDecryptionCache.kt

@@ -0,0 +1,29 @@
+/**
+ * Copyright (c) 2025 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 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.
+ */
+package com.vitorpamplona.amethyst.model.nip51Lists.proxyRelays
+
+import com.vitorpamplona.amethyst.model.nip51Lists.relayLists.GenericRelayListCache
+import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
+import com.vitorpamplona.quartz.nip51Lists.relayLists.ProxyRelayListEvent
+
+class ProxyRelayListDecryptionCache(
+    signer: NostrSigner,
+) : GenericRelayListCache<ProxyRelayListEvent>(signer)

amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip51Lists/proxyRelays/ProxyRelayListState.kt

@@ -0,0 +1,87 @@
+/**
+ * Copyright (c) 2025 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 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.
+ */
+package com.vitorpamplona.amethyst.model.nip51Lists.proxyRelays
+
+import com.vitorpamplona.amethyst.model.AccountSettings
+import com.vitorpamplona.amethyst.model.AddressableNote
+import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.model.NoteState
+import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl
+import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
+import com.vitorpamplona.quartz.nip51Lists.relayLists.ProxyRelayListEvent
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.flowOn
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.onStart
+import kotlinx.coroutines.flow.stateIn
+
+class ProxyRelayListState(
+    val signer: NostrSigner,
+    val cache: LocalCache,
+    val decryptionCache: ProxyRelayListDecryptionCache,
+    val scope: CoroutineScope,
+    val settings: AccountSettings,
+) {
+    fun getProxyRelayListAddress() = ProxyRelayListEvent.createAddress(signer.pubKey)
+
+    fun getProxyRelayListNote(): AddressableNote = cache.getOrCreateAddressableNote(getProxyRelayListAddress())
+
+    fun getProxyRelayListFlow(): StateFlow<NoteState> = getProxyRelayListNote().flow().metadata.stateFlow
+
+    fun getProxyRelayList(): ProxyRelayListEvent? = getProxyRelayListNote().event as? ProxyRelayListEvent
+
+    suspend fun normalizeProxyRelayListWithBackup(note: Note): Set<NormalizedRelayUrl> {
+        val event = note.event as? ProxyRelayListEvent
+        return event?.let { decryptionCache.relays(it) } ?: emptySet()
+    }
+
+    val flow =
+        getProxyRelayListFlow()
+            .map { normalizeProxyRelayListWithBackup(it.note) }
+            .onStart { emit(normalizeProxyRelayListWithBackup(getProxyRelayListNote())) }
+            .flowOn(Dispatchers.Default)
+            .stateIn(
+                scope,
+                SharingStarted.Eagerly,
+                emptySet(),
+            )
+
+    suspend fun saveRelayList(proxyRelays: List<NormalizedRelayUrl>): ProxyRelayListEvent {
+        val relayListForProxy = getProxyRelayList()
+
+        return if (relayListForProxy != null && relayListForProxy.tags.isNotEmpty()) {
+            ProxyRelayListEvent.updateRelayList(
+                earlierVersion = relayListForProxy,
+                relays = proxyRelays,
+                signer = signer,
+            )
+        } else {
+            ProxyRelayListEvent.create(
+                relays = proxyRelays,
+                signer = signer,
+            )
+        }
+    }
+}

amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip51Lists/relayLists/GenericRelayListCache.kt

@@ -0,0 +1,76 @@
+/**
+ * Copyright (c) 2025 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 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.
+ */
+package com.vitorpamplona.amethyst.model.nip51Lists.relayLists
+
+import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
+import com.vitorpamplona.quartz.nip51Lists.PrivateTagArrayEvent
+import com.vitorpamplona.quartz.nip51Lists.PrivateTagArrayEventCache
+import com.vitorpamplona.quartz.nip51Lists.relayLists.tags.relaySet
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.flowOn
+import kotlinx.coroutines.flow.mapLatest
+import kotlinx.coroutines.flow.onStart
+
+open class GenericRelayListCache<T : PrivateTagArrayEvent>(
+    val signer: NostrSigner,
+) {
+    val cachedPrivateLists = PrivateTagArrayEventCache<T>(signer)
+
+    fun cachedRelays(event: T) = cachedPrivateLists.mergeTagListPrecached(event).relaySet()
+
+    suspend fun relays(event: T) = cachedPrivateLists.mergeTagList(event).relaySet()
+
+    fun fastStartValueForRelayList(note: Note): RelayListCard {
+        val noteEvent = note.event as? T
+        return if (noteEvent != null) {
+            RelayListCard(cachedRelays(noteEvent).toList())
+        } else {
+            EmptyRelayListCard
+        }
+    }
+
+    @OptIn(ExperimentalCoroutinesApi::class)
+    fun observeDecryptedRelayList(note: Note): Flow<RelayListCard> =
+        note
+            .flow()
+            .metadata.stateFlow
+            .mapLatest { noteState ->
+                val event = noteState.note.event as? T
+                RelayListCard(event?.let { relays(it).toList() } ?: emptyList())
+            }.onStart {
+                val event = note.event as? T
+                if (event != null) {
+                    val list = relays(event)
+                    if (list.isNotEmpty()) {
+                        emit(RelayListCard(list.toList()))
+                    } else {
+                        emit(EmptyRelayListCard)
+                    }
+                } else {
+                    emit(EmptyRelayListCard)
+                }
+            }.distinctUntilChanged()
+            .flowOn(Dispatchers.Default)
+}

amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip51Lists/relayLists/RelayListCard.kt

@@ -0,0 +1,31 @@
+/**
+ * Copyright (c) 2025 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 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.
+ */
+package com.vitorpamplona.amethyst.model.nip51Lists.relayLists
+
+import androidx.compose.runtime.Immutable
+import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl
+
+@Immutable
+data class RelayListCard(
+    val relays: List<NormalizedRelayUrl>,
+)
+
+val EmptyRelayListCard = RelayListCard(emptyList())

amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip51Lists/searchRelays/SearchRelayListDecryptionCache.kt

@@ -0,0 +1,29 @@
+/**
+ * Copyright (c) 2025 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 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.
+ */
+package com.vitorpamplona.amethyst.model.nip51Lists.searchRelays
+
+import com.vitorpamplona.amethyst.model.nip51Lists.relayLists.GenericRelayListCache
+import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
+import com.vitorpamplona.quartz.nip50Search.SearchRelayListEvent
+
+class SearchRelayListDecryptionCache(
+    signer: NostrSigner,
+) : GenericRelayListCache<SearchRelayListEvent>(signer)

amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip51Lists/searchRelays/SearchRelayListState.kt

@@ -0,0 +1,110 @@
+/**
+ * Copyright (c) 2025 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 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.
+ */
+package com.vitorpamplona.amethyst.model.nip51Lists.searchRelays
+
+import android.util.Log
+import com.vitorpamplona.amethyst.model.AccountSettings
+import com.vitorpamplona.amethyst.model.AddressableNote
+import com.vitorpamplona.amethyst.model.DefaultSearchRelayList
+import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.model.NoteState
+import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl
+import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
+import com.vitorpamplona.quartz.nip50Search.SearchRelayListEvent
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.DelicateCoroutinesApi
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.flowOn
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.onStart
+import kotlinx.coroutines.flow.stateIn
+import kotlinx.coroutines.launch
+
+class SearchRelayListState(
+    val signer: NostrSigner,
+    val cache: LocalCache,
+    val decryptionCache: SearchRelayListDecryptionCache,
+    val scope: CoroutineScope,
+    val settings: AccountSettings,
+) {
+    fun getSearchRelayListAddress() = SearchRelayListEvent.Companion.createAddress(signer.pubKey)
+
+    fun getSearchRelayListNote(): AddressableNote = LocalCache.getOrCreateAddressableNote(getSearchRelayListAddress())
+
+    fun getSearchRelayListFlow(): StateFlow<NoteState> = getSearchRelayListNote().flow().metadata.stateFlow
+
+    fun getSearchRelayList(): SearchRelayListEvent? = getSearchRelayListNote().event as? SearchRelayListEvent
+
+    suspend fun normalizeSearchRelayListWithBackup(note: Note): Set<NormalizedRelayUrl> {
+        val event = note.event as? SearchRelayListEvent ?: settings.backupSearchRelayList
+        return event?.let { decryptionCache.relays(it) } ?: DefaultSearchRelayList
+    }
+
+    val flow =
+        getSearchRelayListFlow()
+            .map { normalizeSearchRelayListWithBackup(it.note) }
+            .onStart { emit(normalizeSearchRelayListWithBackup(getSearchRelayListNote())) }
+            .flowOn(Dispatchers.Default)
+            .stateIn(
+                scope,
+                SharingStarted.Companion.Eagerly,
+                emptySet(),
+            )
+
+    suspend fun saveRelayList(searchRelays: List<NormalizedRelayUrl>): SearchRelayListEvent {
+        val relayListForSearch = getSearchRelayList()
+
+        return if (relayListForSearch != null && relayListForSearch.tags.isNotEmpty()) {
+            SearchRelayListEvent.Companion.updateRelayList(
+                earlierVersion = relayListForSearch,
+                relays = searchRelays,
+                signer = signer,
+            )
+        } else {
+            SearchRelayListEvent.Companion.create(
+                relays = searchRelays,
+                signer = signer,
+            )
+        }
+    }
+
+    init {
+        settings.backupSearchRelayList?.let {
+            Log.d("AccountRegisterObservers", "Loading saved search relay list ${it.toJson()}")
+            @OptIn(DelicateCoroutinesApi::class)
+            GlobalScope.launch(Dispatchers.IO) { LocalCache.justConsumeMyOwnEvent(it) }
+        }
+
+        scope.launch(Dispatchers.Default) {
+            Log.d("AccountRegisterObservers", "Search Relay List Collector Start")
+            getSearchRelayListFlow().collect {
+                Log.d("AccountRegisterObservers", "Updating Search Relay List for ${signer.pubKey}")
+                (it.note.event as? SearchRelayListEvent)?.let {
+                    settings.updateSearchRelayList(it)
+                }
+            }
+        }
+    }
+}

amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip51Lists/trustedRelays/TrustedRelayListDecryptionCache.kt

@@ -0,0 +1,29 @@
+/**
+ * Copyright (c) 2025 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 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.
+ */
+package com.vitorpamplona.amethyst.model.nip51Lists.trustedRelays
+
+import com.vitorpamplona.amethyst.model.nip51Lists.relayLists.GenericRelayListCache
+import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
+import com.vitorpamplona.quartz.nip51Lists.relayLists.TrustedRelayListEvent
+
+class TrustedRelayListDecryptionCache(
+    signer: NostrSigner,
+) : GenericRelayListCache<TrustedRelayListEvent>(signer)

amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip51Lists/trustedRelays/TrustedRelayListState.kt

@@ -0,0 +1,109 @@
+/**
+ * Copyright (c) 2025 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 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.
+ */
+package com.vitorpamplona.amethyst.model.nip51Lists.trustedRelays
+
+import android.util.Log
+import com.vitorpamplona.amethyst.model.AccountSettings
+import com.vitorpamplona.amethyst.model.AddressableNote
+import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.model.NoteState
+import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl
+import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
+import com.vitorpamplona.quartz.nip51Lists.relayLists.TrustedRelayListEvent
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.DelicateCoroutinesApi
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.flowOn
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.onStart
+import kotlinx.coroutines.flow.stateIn
+import kotlinx.coroutines.launch
+
+class TrustedRelayListState(
+    val signer: NostrSigner,
+    val cache: LocalCache,
+    val decryptionCache: TrustedRelayListDecryptionCache,
+    val scope: CoroutineScope,
+    val settings: AccountSettings,
+) {
+    fun getTrustedRelayListAddress() = TrustedRelayListEvent.Companion.createAddress(signer.pubKey)
+
+    fun getTrustedRelayListNote(): AddressableNote = cache.getOrCreateAddressableNote(getTrustedRelayListAddress())
+
+    fun getTrustedRelayListFlow(): StateFlow<NoteState> = getTrustedRelayListNote().flow().metadata.stateFlow
+
+    fun getTrustedRelayList(): TrustedRelayListEvent? = getTrustedRelayListNote().event as? TrustedRelayListEvent
+
+    suspend fun normalizeTrustedRelayListWithBackup(note: Note): Set<NormalizedRelayUrl> {
+        val event = note.event as? TrustedRelayListEvent ?: settings.backupTrustedRelayList
+        return event?.let { decryptionCache.relays(it) } ?: emptySet()
+    }
+
+    val flow =
+        getTrustedRelayListFlow()
+            .map { normalizeTrustedRelayListWithBackup(it.note) }
+            .onStart { emit(normalizeTrustedRelayListWithBackup(getTrustedRelayListNote())) }
+            .flowOn(Dispatchers.Default)
+            .stateIn(
+                scope,
+                SharingStarted.Companion.Eagerly,
+                emptySet(),
+            )
+
+    suspend fun saveRelayList(trustedRelays: List<NormalizedRelayUrl>): TrustedRelayListEvent {
+        val relayListForTrusted = getTrustedRelayList()
+
+        return if (relayListForTrusted != null && relayListForTrusted.tags.isNotEmpty()) {
+            TrustedRelayListEvent.Companion.updateRelayList(
+                earlierVersion = relayListForTrusted,
+                relays = trustedRelays,
+                signer = signer,
+            )
+        } else {
+            TrustedRelayListEvent.Companion.create(
+                relays = trustedRelays,
+                signer = signer,
+            )
+        }
+    }
+
+    init {
+        settings.backupTrustedRelayList?.let {
+            Log.d("AccountRegisterObservers", "Loading saved Trusted relay list ${it.toJson()}")
+            @OptIn(DelicateCoroutinesApi::class)
+            GlobalScope.launch(Dispatchers.IO) { cache.justConsumeMyOwnEvent(it) }
+        }
+
+        scope.launch(Dispatchers.Default) {
+            Log.d("AccountRegisterObservers", "Trusted Relay List Collector Start")
+            getTrustedRelayListFlow().collect {
+                Log.d("AccountRegisterObservers", "Updating Trusted Relay List for ${signer.pubKey}")
+                (it.note.event as? TrustedRelayListEvent)?.let {
+                    settings.updateTrustedRelayList(it)
+                }
+            }
+        }
+    }
+}

amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip53LiveActivities/LiveActivitiesChannel.kt

@@ -0,0 +1,73 @@
+/**
+ * Copyright (c) 2025 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 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.
+ */
+package com.vitorpamplona.amethyst.model.nip53LiveActivities
+
+import androidx.compose.runtime.Stable
+import com.vitorpamplona.amethyst.model.Channel
+import com.vitorpamplona.amethyst.model.User
+import com.vitorpamplona.amethyst.ui.note.toShortDisplay
+import com.vitorpamplona.quartz.nip01Core.tags.addressables.ATag
+import com.vitorpamplona.quartz.nip01Core.tags.addressables.Address
+import com.vitorpamplona.quartz.nip19Bech32.entities.NAddress
+import com.vitorpamplona.quartz.nip53LiveActivities.streaming.LiveActivitiesEvent
+
+@Stable
+class LiveActivitiesChannel(
+    val address: Address,
+) : Channel() {
+    var creator: User? = null
+    var info: LiveActivitiesEvent? = null
+
+    fun address() = address
+
+    override fun relays() = info?.allRelayUrls()?.toSet() ?: super.relays()
+
+    fun relayHintUrl() = relays().firstOrNull()
+
+    fun relayHintUrls() = relays().take(3)
+
+    fun updateChannelInfo(
+        creator: User,
+        channelInfo: LiveActivitiesEvent,
+    ) {
+        this.info = channelInfo
+        this.creator = creator
+        super.updateChannelInfo()
+    }
+
+    override fun toBestDisplayName(): String = info?.title() ?: toNAddr().toShortDisplay()
+
+    fun creatorName(): String? = creator?.toBestDisplayName()
+
+    fun summary(): String? = info?.summary()
+
+    fun profilePicture(): String? = info?.image()?.ifBlank { null }
+
+    fun anyNameStartsWith(prefix: String): Boolean =
+        info?.title()?.contains(prefix, true) == true ||
+            info?.summary()?.contains(prefix, true) == true
+
+    fun toNAddr() = NAddress.create(address.kind, address.pubKeyHex, address.dTag, relayHintUrls())
+
+    fun toATag() = ATag(address, relayHintUrl())
+
+    fun toNostrUri() = "nostr:${toNAddr()}"
+}

amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip56Reports/ReportAction.kt

@@ -0,0 +1,64 @@
+/**
+ * Copyright (c) 2025 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 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.
+ */
+package com.vitorpamplona.amethyst.model.nip56Reports
+
+import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.model.User
+import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
+import com.vitorpamplona.quartz.nip56Reports.ReportEvent
+import com.vitorpamplona.quartz.nip56Reports.ReportType
+
+class ReportAction {
+    companion object {
+        suspend fun report(
+            user: User,
+            type: ReportType,
+            by: User,
+            signer: NostrSigner,
+        ): ReportEvent? {
+            if (user.hasReport(by, type)) {
+                // has already reported this note
+                return null
+            }
+
+            val template = ReportEvent.build(user.pubkeyHex, type)
+
+            return signer.sign(template)
+        }
+
+        suspend fun report(
+            note: Note,
+            type: ReportType,
+            content: String = "",
+            by: User,
+            signer: NostrSigner,
+        ): ReportEvent? {
+            if (note.hasReport(by, type)) {
+                // has already reported this note
+                return null
+            }
+
+            return note.event?.let {
+                signer.sign(ReportEvent.build(it, type))
+            }
+        }
+    }
+}

amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip65RelayList/Nip65RelayListState.kt

@@ -0,0 +1,142 @@
+/**
+ * Copyright (c) 2025 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 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.
+ */
+package com.vitorpamplona.amethyst.model.nip65RelayList
+
+import android.util.Log
+import com.vitorpamplona.amethyst.model.AccountSettings
+import com.vitorpamplona.amethyst.model.AddressableNote
+import com.vitorpamplona.amethyst.model.Constants
+import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.model.NoteState
+import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl
+import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
+import com.vitorpamplona.quartz.nip65RelayList.AdvertisedRelayListEvent
+import com.vitorpamplona.quartz.nip65RelayList.tags.AdvertisedRelayInfo
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.DelicateCoroutinesApi
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.flowOn
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.onStart
+import kotlinx.coroutines.flow.stateIn
+import kotlinx.coroutines.launch
+
+class Nip65RelayListState(
+    val signer: NostrSigner,
+    val cache: LocalCache,
+    val scope: CoroutineScope,
+    val settings: AccountSettings,
+) {
+    fun getNIP65RelayListAddress() = AdvertisedRelayListEvent.createAddress(signer.pubKey)
+
+    fun getNIP65RelayListNote(): AddressableNote = cache.getOrCreateAddressableNote(getNIP65RelayListAddress())
+
+    fun getNIP65RelayListFlow(): StateFlow<NoteState> = getNIP65RelayListNote().flow().metadata.stateFlow
+
+    fun getNIP65RelayList(): AdvertisedRelayListEvent? = getNIP65RelayListNote().event as? AdvertisedRelayListEvent
+
+    fun normalizeNIP65WriteRelayListWithBackup(note: Note): Set<NormalizedRelayUrl> {
+        val event = note.event as? AdvertisedRelayListEvent ?: settings.backupNIP65RelayList
+        return event?.writeRelaysNorm()?.toSet() ?: Constants.eventFinderRelays
+    }
+
+    fun normalizeNIP65ReadRelayListWithBackup(note: Note): Set<NormalizedRelayUrl> {
+        val event = note.event as? AdvertisedRelayListEvent ?: settings.backupNIP65RelayList
+        return event?.readRelaysNorm()?.toSet() ?: Constants.eventFinderRelays
+    }
+
+    fun normalizeNIP65AllRelayListWithBackup(note: Note): Set<NormalizedRelayUrl> {
+        val event = note.event as? AdvertisedRelayListEvent ?: settings.backupNIP65RelayList
+        return event?.relays()?.map { it.relayUrl }?.toSet() ?: Constants.eventFinderRelays
+    }
+
+    val outboxFlow =
+        getNIP65RelayListFlow()
+            .map { normalizeNIP65WriteRelayListWithBackup(it.note) }
+            .onStart { emit(normalizeNIP65ReadRelayListWithBackup(getNIP65RelayListNote())) }
+            .flowOn(Dispatchers.Default)
+            .stateIn(
+                scope,
+                SharingStarted.Eagerly,
+                emptySet(),
+            )
+
+    val inboxFlow =
+        getNIP65RelayListFlow()
+            .map { normalizeNIP65ReadRelayListWithBackup(it.note) }
+            .onStart { emit(normalizeNIP65ReadRelayListWithBackup(getNIP65RelayListNote())) }
+            .flowOn(Dispatchers.Default)
+            .stateIn(
+                scope,
+                SharingStarted.Eagerly,
+                emptySet(),
+            )
+
+    val allFlow =
+        getNIP65RelayListFlow()
+            .map { normalizeNIP65AllRelayListWithBackup(it.note) }
+            .onStart { emit(normalizeNIP65AllRelayListWithBackup(getNIP65RelayListNote())) }
+            .flowOn(Dispatchers.Default)
+            .stateIn(
+                scope,
+                SharingStarted.Eagerly,
+                emptySet(),
+            )
+
+    suspend fun saveRelayList(relays: List<AdvertisedRelayInfo>): AdvertisedRelayListEvent {
+        val nip65RelayList = getNIP65RelayList()
+
+        return if (nip65RelayList != null) {
+            AdvertisedRelayListEvent.replaceRelayListWith(
+                earlierVersion = nip65RelayList,
+                newRelays = relays,
+                signer = signer,
+            )
+        } else {
+            AdvertisedRelayListEvent.createFromScratch(
+                relays = relays,
+                signer = signer,
+            )
+        }
+    }
+
+    init {
+        settings.backupNIP65RelayList?.let {
+            Log.d("AccountRegisterObservers", "Loading saved nip65 relay list ${it.toJson()}")
+            @OptIn(DelicateCoroutinesApi::class)
+            GlobalScope.launch(Dispatchers.IO) { cache.justConsumeMyOwnEvent(it) }
+        }
+
+        scope.launch(Dispatchers.Default) {
+            Log.d("AccountRegisterObservers", "NIP-65 Relay List Collector Start")
+            getNIP65RelayListFlow().collect {
+                Log.d("AccountRegisterObservers", "Updating NIP-65 List for ${signer.pubKey}")
+                (it.note.event as? AdvertisedRelayListEvent)?.let {
+                    settings.updateNIP65RelayList(it)
+                }
+            }
+        }
+    }
+}

amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip65RelayList/OutboxRelaySetState.kt

@@ -0,0 +1,109 @@
+/**
+ * Copyright (c) 2025 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 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.
+ */
+package com.vitorpamplona.amethyst.model.nip65RelayList
+
+import com.vitorpamplona.amethyst.model.AddressableNote
+import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.model.NoteState
+import com.vitorpamplona.quartz.nip01Core.core.HexKey
+import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl
+import com.vitorpamplona.quartz.nip65RelayList.AdvertisedRelayListEvent
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.emitAll
+import kotlinx.coroutines.flow.flowOn
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.onStart
+import kotlinx.coroutines.flow.stateIn
+import kotlinx.coroutines.flow.transformLatest
+
+class OutboxRelaySetState(
+    usersToLoad: MutableStateFlow<Set<HexKey>>,
+    val cache: LocalCache,
+    scope: CoroutineScope,
+) {
+    fun getNIP65RelayListAddress(pubkey: HexKey) = AdvertisedRelayListEvent.Companion.createAddress(pubkey)
+
+    fun getNIP65RelayListNote(pubkey: HexKey): AddressableNote = cache.getOrCreateAddressableNote(getNIP65RelayListAddress(pubkey))
+
+    fun getNIP65RelayListFlow(pubkey: HexKey): StateFlow<NoteState> = getNIP65RelayListNote(pubkey).flow().metadata.stateFlow
+
+    fun getNIP65RelayList(pubkey: HexKey): AdvertisedRelayListEvent? = getNIP65RelayListNote(pubkey).event as? AdvertisedRelayListEvent
+
+    fun allRelayListFlows(followList: Set<HexKey>): List<StateFlow<NoteState>> = followList.map { getNIP65RelayListFlow(it) }
+
+    fun combineAllFlows(flows: List<StateFlow<NoteState>>): Flow<Set<NormalizedRelayUrl>> =
+        combine(flows) { relayListNotes: Array<NoteState> ->
+            relayListNotes.mapNotNull {
+                (it.note.event as? AdvertisedRelayListEvent)?.writeRelaysNorm()
+            }
+        }.map {
+            it.flatten().toSet()
+        }
+
+    @OptIn(ExperimentalCoroutinesApi::class)
+    val flow: StateFlow<Set<NormalizedRelayUrl>> =
+        usersToLoad
+            .transformLatest { followList ->
+                val flows: List<StateFlow<NoteState>> = allRelayListFlows(followList)
+                val relayListFlows = combineAllFlows(flows)
+                emitAll(relayListFlows)
+            }.onStart {
+                emit(
+                    usersToLoad.value
+                        .mapNotNull {
+                            getNIP65RelayList(it)?.writeRelaysNorm()
+                        }.flatten()
+                        .toSet(),
+                )
+            }.flowOn(Dispatchers.Default)
+            .stateIn(
+                scope,
+                SharingStarted.Companion.Eagerly,
+                emptySet(),
+            )
+
+    @OptIn(ExperimentalCoroutinesApi::class)
+    val flowSet: StateFlow<Set<String>> =
+        flow
+            .map { relayList ->
+                relayList.map { it.url }.toSet()
+            }.onStart {
+                emit(
+                    usersToLoad.value
+                        .mapNotNull {
+                            getNIP65RelayList(it)?.writeRelaysNorm()?.map { it.url }?.toSet()
+                        }.flatten()
+                        .toSet(),
+                )
+            }.flowOn(Dispatchers.Default)
+            .stateIn(
+                scope,
+                SharingStarted.Companion.Eagerly,
+                emptySet(),
+            )
+}

amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip72Communities/CommunityListDecryptionCache.kt

@@ -0,0 +1,46 @@
+/**
+ * Copyright (c) 2025 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 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.
+ */
+package com.vitorpamplona.amethyst.model.nip72Communities
+
+import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
+import com.vitorpamplona.quartz.nip51Lists.PrivateTagArrayEventCache
+import com.vitorpamplona.quartz.nip72ModCommunities.follow.CommunityListEvent
+import com.vitorpamplona.quartz.nip72ModCommunities.follow.communities
+import com.vitorpamplona.quartz.nip72ModCommunities.follow.communityIdSet
+import com.vitorpamplona.quartz.nip72ModCommunities.follow.communityIds
+
+class CommunityListDecryptionCache(
+    val signer: NostrSigner,
+) {
+    val cachedPrivateLists = PrivateTagArrayEventCache<CommunityListEvent>(signer)
+
+    fun cachedCommunityIds(event: CommunityListEvent) = cachedPrivateLists.mergeTagListPrecached(event).communityIds()
+
+    fun cachedCommunityIdSet(event: CommunityListEvent) = cachedPrivateLists.mergeTagListPrecached(event).communityIdSet()
+
+    fun cachedCommunities(event: CommunityListEvent) = cachedPrivateLists.mergeTagListPrecached(event).communities()
+
+    suspend fun communityIds(event: CommunityListEvent) = cachedPrivateLists.mergeTagList(event).communityIds()
+
+    suspend fun communityIdSet(event: CommunityListEvent) = cachedPrivateLists.mergeTagList(event).communityIdSet()
+
+    suspend fun communities(event: CommunityListEvent) = cachedPrivateLists.mergeTagList(event).communities()
+}

amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip72Communities/CommunityListState.kt

@@ -0,0 +1,159 @@
+/**
+ * Copyright (c) 2025 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 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.
+ */
+package com.vitorpamplona.amethyst.model.nip72Communities
+
+import android.util.Log
+import com.vitorpamplona.amethyst.model.AccountSettings
+import com.vitorpamplona.amethyst.model.AddressableNote
+import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.model.NoteState
+import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
+import com.vitorpamplona.quartz.nip72ModCommunities.definition.CommunityDefinitionEvent
+import com.vitorpamplona.quartz.nip72ModCommunities.follow.CommunityListEvent
+import com.vitorpamplona.quartz.nip72ModCommunities.follow.tags.CommunityTag
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.DelicateCoroutinesApi
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.flowOn
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.onStart
+import kotlinx.coroutines.flow.stateIn
+import kotlinx.coroutines.flow.transformLatest
+import kotlinx.coroutines.launch
+
+class CommunityListState(
+    val signer: NostrSigner,
+    val cache: LocalCache,
+    val decryptionCache: CommunityListDecryptionCache,
+    val scope: CoroutineScope,
+    val settings: AccountSettings,
+) {
+    fun getCommunityListAddress() = CommunityListEvent.createAddress(signer.pubKey)
+
+    fun getCommunityListNote(): AddressableNote = cache.getOrCreateAddressableNote(getCommunityListAddress())
+
+    fun getCommunityListFlow(): StateFlow<NoteState> = getCommunityListNote().flow().metadata.stateFlow
+
+    fun getCommunityList(): CommunityListEvent? = getCommunityListNote().event as? CommunityListEvent
+
+    suspend fun communityListWithBackup(note: Note): Set<CommunityTag> {
+        val event = note.event as? CommunityListEvent ?: settings.backupCommunityList
+        return event?.let { decryptionCache.communities(it).toSet() } ?: emptySet()
+    }
+
+    @OptIn(ExperimentalCoroutinesApi::class)
+    val flow: StateFlow<Set<CommunityTag>> =
+        getCommunityListFlow()
+            .transformLatest { noteState ->
+                emit(communityListWithBackup(noteState.note))
+            }.onStart {
+                emit(communityListWithBackup(getCommunityListNote()))
+            }.flowOn(Dispatchers.Default)
+            .stateIn(
+                scope,
+                SharingStarted.Eagerly,
+                emptySet(),
+            )
+
+    @OptIn(ExperimentalCoroutinesApi::class)
+    val flowSet: StateFlow<Set<String>> =
+        flow
+            .map { hint ->
+                hint.mapTo(mutableSetOf()) { it.address.toValue() }
+            }.onStart {
+                emit(flow.value.mapTo(mutableSetOf()) { it.address.toValue() })
+            }.flowOn(Dispatchers.Default)
+            .stateIn(
+                scope,
+                SharingStarted.Eagerly,
+                emptySet(),
+            )
+
+    suspend fun follow(communities: List<AddressableNote>): CommunityListEvent {
+        val communityList = getCommunityList()
+
+        val communityTags =
+            communities.mapNotNull { community ->
+                if (community.address.kind == CommunityDefinitionEvent.KIND) {
+                    CommunityTag(community.address, community.relayHintUrl())
+                } else {
+                    null
+                }
+            }
+
+        return if (communityList == null) {
+            CommunityListEvent.create(communityTags, true, signer)
+        } else {
+            CommunityListEvent.add(communityList, communityTags, true, signer)
+        }
+    }
+
+    suspend fun follow(community: AddressableNote): CommunityListEvent? {
+        val communityList = getCommunityList()
+        if (community.address.kind != CommunityDefinitionEvent.KIND) return communityList
+
+        return if (communityList == null) {
+            CommunityListEvent.create(
+                CommunityTag(community.address, community.relayHintUrl()),
+                true,
+                signer,
+            )
+        } else {
+            CommunityListEvent.add(communityList, CommunityTag(community.address, community.relayHintUrl()), true, signer)
+        }
+    }
+
+    suspend fun unfollow(community: AddressableNote): CommunityListEvent? {
+        val communityList = getCommunityList()
+        if (community.address.kind != CommunityDefinitionEvent.KIND) return communityList
+
+        return if (communityList != null) {
+            CommunityListEvent.remove(communityList, CommunityTag(community.address, community.relayHintUrl()), signer)
+        } else {
+            null
+        }
+    }
+
+    init {
+        settings.backupCommunityList?.let { event ->
+            Log.d("AccountRegisterObservers", "Loading saved Community list ${event.toJson()}")
+            @OptIn(DelicateCoroutinesApi::class)
+            GlobalScope.launch(Dispatchers.IO) {
+                LocalCache.justConsumeMyOwnEvent(event)
+            }
+        }
+
+        scope.launch(Dispatchers.Default) {
+            Log.d("AccountRegisterObservers", "Community List Collector Start")
+            getCommunityListFlow().collect {
+                Log.d("AccountRegisterObservers", "Community List for ${signer.pubKey}")
+                (it.note.event as? CommunityListEvent)?.let {
+                    settings.updateCommunityListTo(it)
+                }
+            }
+        }
+    }
+}

amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip78AppSpecific/AppSpecificState.kt

@@ -0,0 +1,100 @@
+/**
+ * Copyright (c) 2025 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 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.
+ */
+package com.vitorpamplona.amethyst.model.nip78AppSpecific
+
+import android.util.Log
+import com.fasterxml.jackson.module.kotlin.readValue
+import com.vitorpamplona.amethyst.model.AccountSettings
+import com.vitorpamplona.amethyst.model.AccountSyncedSettingsInternal
+import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.model.NoteState
+import com.vitorpamplona.quartz.nip01Core.jackson.JsonMapper
+import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
+import com.vitorpamplona.quartz.nip78AppData.AppSpecificDataEvent
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.DelicateCoroutinesApi
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.launch
+import kotlin.coroutines.cancellation.CancellationException
+
+class AppSpecificState(
+    val signer: NostrSigner,
+    val cache: LocalCache,
+    val scope: CoroutineScope,
+    val settings: AccountSettings,
+) {
+    companion object {
+        const val APP_SPECIFIC_DATA_D_TAG = "AmethystSettings"
+    }
+
+    fun getAppSpecificDataAddress() = AppSpecificDataEvent.createAddress(signer.pubKey, APP_SPECIFIC_DATA_D_TAG)
+
+    fun getAppSpecificDataNote() = cache.getOrCreateAddressableNote(getAppSpecificDataAddress())
+
+    fun getAppSpecificDataFlow(): StateFlow<NoteState> = getAppSpecificDataNote().flow().metadata.stateFlow
+
+    suspend fun saveNewAppSpecificData(): AppSpecificDataEvent {
+        val toInternal = settings.syncedSettings.toInternal()
+        return AppSpecificDataEvent.create(
+            dTag = APP_SPECIFIC_DATA_D_TAG,
+            description = signer.nip44Encrypt(JsonMapper.mapper.writeValueAsString(toInternal), signer.pubKey),
+            otherTags = emptyArray(),
+            signer = signer,
+        )
+    }
+
+    init {
+        settings.backupAppSpecificData?.let { event ->
+            Log.d("AccountRegisterObservers", "Loading saved app specific data ${event.toJson()}")
+            @OptIn(DelicateCoroutinesApi::class)
+            GlobalScope.launch(Dispatchers.IO) {
+                LocalCache.justConsumeMyOwnEvent(event)
+                try {
+                    val decrypted = signer.decrypt(event.content, event.pubKey)
+                    val syncedSettings = JsonMapper.mapper.readValue<AccountSyncedSettingsInternal>(decrypted)
+                    settings.syncedSettings.updateFrom(syncedSettings)
+                } catch (e: Throwable) {
+                    if (e is CancellationException) throw e
+                    Log.w("LocalPreferences", "Error Decoding latestAppSpecificData from Preferences with value", e)
+                }
+            }
+        }
+
+        scope.launch(Dispatchers.Default) {
+            Log.d("AccountRegisterObservers", "AppSpecificData Collector Start")
+            getAppSpecificDataFlow().collect {
+                Log.d("AccountRegisterObservers", "Updating AppSpecificData for ${signer.pubKey}")
+                (it.note.event as? AppSpecificDataEvent)?.let {
+                    val decrypted = signer.decrypt(it.content, it.pubKey)
+                    try {
+                        val syncedSettings = JsonMapper.mapper.readValue<AccountSyncedSettingsInternal>(decrypted)
+                        settings.updateAppSpecificData(it, syncedSettings)
+                    } catch (e: Throwable) {
+                        if (e is CancellationException) throw e
+                        Log.w("LocalPreferences", "Error Decoding latestAppSpecificData from Preferences with value $decrypted", e)
+                    }
+                }
+            }
+        }
+    }
+}

amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip96FileStorage/FileStorageServerListState.kt

@@ -0,0 +1,81 @@
+/**
+ * Copyright (c) 2025 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 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.
+ */
+package com.vitorpamplona.amethyst.model.nip96FileStorage
+
+import com.vitorpamplona.amethyst.model.AccountSettings
+import com.vitorpamplona.amethyst.model.AddressableNote
+import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.model.NoteState
+import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
+import com.vitorpamplona.quartz.nip96FileStorage.config.FileServersEvent
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.flowOn
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.onStart
+import kotlinx.coroutines.flow.stateIn
+
+class FileStorageServerListState(
+    val signer: NostrSigner,
+    val cache: LocalCache,
+    val scope: CoroutineScope,
+    val settings: AccountSettings,
+) {
+    fun getFileServersAddress() = FileServersEvent.createAddress(signer.pubKey)
+
+    fun getFileServersNote(): AddressableNote = LocalCache.getOrCreateAddressableNote(getFileServersAddress())
+
+    fun getFileServersListFlow(): StateFlow<NoteState> = getFileServersNote().flow().metadata.stateFlow
+
+    fun getFileServersList(): FileServersEvent? = getFileServersNote().event as? FileServersEvent
+
+    fun normalizeServers(note: Note): List<String> {
+        val event = note.event as? FileServersEvent
+        return event?.servers() ?: emptyList()
+    }
+
+    val flow =
+        getFileServersListFlow()
+            .map { normalizeServers(it.note) }
+            .onStart { emit(normalizeServers(getFileServersNote())) }
+            .flowOn(Dispatchers.Default)
+            .stateIn(
+                scope,
+                SharingStarted.Eagerly,
+                emptyList(),
+            )
+
+    suspend fun saveFileServersList(servers: List<String>): FileServersEvent {
+        val serverList = getFileServersList()
+
+        val template =
+            if (serverList != null && serverList.tags.isNotEmpty()) {
+                FileServersEvent.replaceServers(serverList, servers)
+            } else {
+                FileServersEvent.build(servers)
+            }
+
+        return signer.sign(template)
+    }
+}

amethyst/src/main/java/com/vitorpamplona/amethyst/model/nipB7Blossom/BlossomServerListState.kt

@@ -0,0 +1,98 @@
+/**
+ * Copyright (c) 2025 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 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.
+ */
+package com.vitorpamplona.amethyst.model.nipB7Blossom
+
+import com.vitorpamplona.amethyst.model.AccountSettings
+import com.vitorpamplona.amethyst.model.AddressableNote
+import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.model.NoteState
+import com.vitorpamplona.quartz.nip01Core.core.HexKey
+import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
+import com.vitorpamplona.quartz.nipB7Blossom.BlossomAuthorizationEvent
+import com.vitorpamplona.quartz.nipB7Blossom.BlossomServersEvent
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.flowOn
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.onStart
+import kotlinx.coroutines.flow.stateIn
+
+class BlossomServerListState(
+    val signer: NostrSigner,
+    val cache: LocalCache,
+    val scope: CoroutineScope,
+    val settings: AccountSettings,
+) {
+    fun getBlossomServersAddress() = BlossomServersEvent.createAddress(signer.pubKey)
+
+    fun getBlossomServersNote(): AddressableNote = cache.getOrCreateAddressableNote(getBlossomServersAddress())
+
+    fun getBlossomServersListFlow(): StateFlow<NoteState> = getBlossomServersNote().flow().metadata.stateFlow
+
+    fun getBlossomServersList(): BlossomServersEvent? = getBlossomServersNote().event as? BlossomServersEvent
+
+    fun normalizeServers(note: Note): List<String> {
+        val event = note.event as? BlossomServersEvent
+        return event?.servers() ?: emptyList()
+    }
+
+    val flow =
+        getBlossomServersListFlow()
+            .map { normalizeServers(it.note) }
+            .onStart { emit(normalizeServers(getBlossomServersNote())) }
+            .flowOn(Dispatchers.Default)
+            .stateIn(
+                scope,
+                SharingStarted.Eagerly,
+                emptyList(),
+            )
+
+    suspend fun saveBlossomServersList(servers: List<String>): BlossomServersEvent {
+        val serverList = getBlossomServersList()
+
+        return if (serverList != null && serverList.tags.isNotEmpty()) {
+            BlossomServersEvent.updateRelayList(
+                earlierVersion = serverList,
+                relays = servers,
+                signer = signer,
+            )
+        } else {
+            BlossomServersEvent.createFromScratch(
+                relays = servers,
+                signer = signer,
+            )
+        }
+    }
+
+    suspend fun createBlossomUploadAuth(
+        hash: HexKey,
+        size: Long,
+        alt: String,
+    ): BlossomAuthorizationEvent = BlossomAuthorizationEvent.createUploadAuth(hash, size, alt, signer)
+
+    suspend fun createBlossomDeleteAuth(
+        hash: HexKey,
+        alt: String,
+    ): BlossomAuthorizationEvent? = BlossomAuthorizationEvent.createDeleteAuth(hash, alt, signer)
+}

amethyst/src/main/java/com/vitorpamplona/amethyst/model/observables/LatestByKindAndAuthor.kt

@@ -24,6 +24,7 @@ import com.vitorpamplona.amethyst.model.AddressableNote
 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.quartz.nip01Core.core.Event
+import com.vitorpamplona.quartz.nip01Core.tags.addressables.Address
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
 
@@ -51,10 +52,8 @@ class LatestByKindAndAuthor<T : Event>(
             if ((kind in 10000..19999) || (kind in 30000..39999)) {
                 LocalCache.addressables
                     .maxOrNullOf(
-                        filter = { idHex: String, note: AddressableNote ->
-                            note.event?.let {
-                                it.kind == kind && it.pubKey == pubkey
-                            } == true
+                        filter = { address: Address, note: AddressableNote ->
+                            address.kind == kind && address.pubKeyHex == pubkey
                         },
                         comparator = CreatedAtComparatorAddresses,
                     )?.event as? T

amethyst/src/main/java/com/vitorpamplona/amethyst/model/preferences/AccountPreferenceStores.kt

@@ -0,0 +1,82 @@
+/**
+ * Copyright (c) 2025 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 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.
+ */
+package com.vitorpamplona.amethyst.model.preferences
+
+import androidx.datastore.core.DataStore
+import androidx.datastore.preferences.core.PreferenceDataStoreFactory
+import androidx.datastore.preferences.core.Preferences
+import androidx.datastore.preferences.core.stringPreferencesKey
+import com.vitorpamplona.quartz.utils.LargeCache
+import java.io.File
+
+class AccountPreferenceStores(
+    val rootFilesDir: () -> File,
+) {
+    companion object {
+        val defaultHomeFollowList = stringPreferencesKey("defaultHomeFollowList")
+        val defaultStoriesFollowList = stringPreferencesKey("defaultStoriesFollowList")
+        val defaultNotificationFollowList = stringPreferencesKey("defaultNotificationFollowList")
+        val defaultDiscoveryFollowList = stringPreferencesKey("defaultDiscoveryFollowList")
+
+        val localRelayServers = stringPreferencesKey("localRelayServers")
+        val defaultFileServer = stringPreferencesKey("defaultFileServer")
+
+        val latestUserMetadata = stringPreferencesKey("latestUserMetadata")
+        val latestContactList = stringPreferencesKey("latestContactList")
+        val latestDMRelayList = stringPreferencesKey("latestDMRelayList")
+        val latestNIP65RelayList = stringPreferencesKey("latestNIP65RelayList")
+        val latestSearchRelayList = stringPreferencesKey("latestSearchRelayList")
+        val latestBlockedRelayList = stringPreferencesKey("latestBlockedRelayList")
+        val latestTrustedRelayList = stringPreferencesKey("latestTrustedRelayList")
+        val latestMuteList = stringPreferencesKey("latestMuteList")
+        val latestPrivateHomeRelayList = stringPreferencesKey("latestPrivateHomeRelayList")
+        val latestAppSpecificData = stringPreferencesKey("latestAppSpecificData")
+        val latestChannelList = stringPreferencesKey("latestChannelList")
+        val latestCommunityList = stringPreferencesKey("latestCommunityList")
+        val latestHashtagList = stringPreferencesKey("latestHashtagList")
+        val latestGeohashList = stringPreferencesKey("latestGeohashList")
+        val latestEphemeralChatList = stringPreferencesKey("latestEphemeralChatList")
+
+        val hideDeleteRequestDialog = stringPreferencesKey("hideDeleteRequestDialog")
+        val hideBlockAlertDialog = stringPreferencesKey("hideBlockAlertDialog")
+        val hideNip17WarningDialog = stringPreferencesKey("hideNip17WarningDialog")
+
+        val torSettings = stringPreferencesKey("tor_settings")
+
+        val hasDonatedInVersion = stringPreferencesKey("hasDonatedInVersion")
+    }
+
+    private val storeCache = LargeCache<String, DataStore<Preferences>>()
+
+    fun file(npub: String) = File(rootFilesDir(), "datastore/$npub.preferences")
+
+    private fun getDataStore(npub: String): DataStore<Preferences> =
+        storeCache.getOrCreate(npub) {
+            PreferenceDataStoreFactory.create(
+                produceFile = { file(npub) },
+            )
+        }
+
+    fun removeAccount(npub: String) {
+        file(npub).delete()
+        storeCache.remove(npub)
+    }
+}

amethyst/src/main/java/com/vitorpamplona/amethyst/model/preferences/AccountSecretsEncryptedStores.kt

@@ -0,0 +1,73 @@
+/**
+ * Copyright (c) 2025 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 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.
+ */
+package com.vitorpamplona.amethyst.model.preferences
+
+import androidx.datastore.preferences.core.PreferenceDataStoreFactory
+import androidx.datastore.preferences.core.stringPreferencesKey
+import com.vitorpamplona.quartz.nip01Core.core.HexKey
+import com.vitorpamplona.quartz.nip47WalletConnect.Nip47WalletConnect
+import com.vitorpamplona.quartz.utils.LargeCache
+import java.io.File
+
+class AccountSecretsEncryptedStores(
+    val rootFilesDir: () -> File,
+) {
+    companion object Companion {
+        val encryption = KeyStoreEncryption()
+        val key = stringPreferencesKey("privKey")
+        val nwc = stringPreferencesKey("nwc")
+    }
+
+    private val storeCache = LargeCache<String, EncryptedDataStore>()
+
+    fun file(npub: String) = File(rootFilesDir(), "datastore/$npub.secrets")
+
+    private fun getDataStore(npub: String): EncryptedDataStore =
+        storeCache.getOrCreate(npub) {
+            EncryptedDataStore(
+                PreferenceDataStoreFactory.create(
+                    produceFile = { file(npub) },
+                ),
+                encryption,
+            )
+        }
+
+    suspend fun getPrivateKey(npub: String): String? = getDataStore(npub).get(key)
+
+    suspend fun savePrivateKey(
+        npub: String,
+        value: HexKey,
+    ) {
+        getDataStore(npub).save(key, value)
+    }
+
+    suspend fun nwc(npub: String): UpdatablePropertyFlow<Nip47WalletConnect.Nip47URI> =
+        getDataStore(npub).getProperty(
+            key = nwc,
+            parser = Nip47WalletConnect.Nip47URI::parser,
+            serializer = Nip47WalletConnect.Nip47URI::serializer,
+        )
+
+    fun removeAccount(npub: String) {
+        file(npub).delete()
+        storeCache.remove(npub)
+    }
+}

amethyst/src/main/java/com/vitorpamplona/amethyst/model/preferences/DataStoreExt.kt

@@ -0,0 +1,70 @@
+/**
+ * Copyright (c) 2025 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 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.
+ */
+package com.vitorpamplona.amethyst.model.preferences
+
+import androidx.datastore.core.DataStore
+import androidx.datastore.preferences.core.Preferences
+import androidx.datastore.preferences.core.edit
+import androidx.datastore.preferences.core.emptyPreferences
+import com.vitorpamplona.amethyst.ui.navigation.navs.EmptyNav.scope
+import com.vitorpamplona.quartz.nip47WalletConnect.Nip47WalletConnect.Nip47URI.Companion.parser
+import kotlinx.coroutines.flow.catch
+import kotlinx.coroutines.flow.map
+import java.io.IOException
+
+suspend fun <T> DataStore<Preferences>.getProperty(
+    key: Preferences.Key<String>,
+    parser: (String) -> T,
+    serializer: (T) -> String,
+): UpdatablePropertyFlow<T> =
+    UpdatablePropertyFlow<T>(
+        flow =
+            data
+                .catch { e ->
+                    if (e is IOException) emit(emptyPreferences()) else throw e
+                }.map { prefs ->
+                    val value = prefs[key]
+                    if (value != null) {
+                        parser(value)
+                    } else {
+                        null
+                    }
+                },
+        update = { newValue ->
+            if (newValue != null) {
+                val serialized = serializer(newValue)
+                if (serialized.isNotBlank()) {
+                    edit { prefs ->
+                        prefs[key] = serialized
+                    }
+                } else {
+                    edit { prefs ->
+                        prefs.remove(key)
+                    }
+                }
+            } else {
+                edit { prefs ->
+                    prefs.remove(key)
+                }
+            }
+        },
+        scope = scope,
+    )

amethyst/src/main/java/com/vitorpamplona/amethyst/model/preferences/EncryptedDataStore.kt

@@ -0,0 +1,106 @@
+/**
+ * Copyright (c) 2025 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 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.
+ */
+package com.vitorpamplona.amethyst.model.preferences
+
+import androidx.datastore.core.DataStore
+import androidx.datastore.preferences.core.Preferences
+import androidx.datastore.preferences.core.edit
+import androidx.datastore.preferences.core.emptyPreferences
+import com.vitorpamplona.amethyst.ui.navigation.navs.EmptyNav.scope
+import kotlinx.coroutines.flow.catch
+import kotlinx.coroutines.flow.firstOrNull
+import kotlinx.coroutines.flow.map
+import java.io.IOException
+import java.util.Base64
+
+class EncryptedDataStore(
+    private val store: DataStore<Preferences>,
+    private val encryption: KeyStoreEncryption = KeyStoreEncryption(),
+) {
+    private fun decode(str: String): ByteArray = Base64.getDecoder().decode(str)
+
+    private fun encode(bytes: ByteArray): String = Base64.getEncoder().encodeToString(bytes)
+
+    private fun encrypt(value: String): String = encode(encryption.encrypt(value.toByteArray()))
+
+    private fun decrypt(value: String): String = encryption.decrypt(decode(value)).contentToString()
+
+    suspend fun remove(key: Preferences.Key<String>) {
+        store.edit { prefs ->
+            prefs.remove(key)
+        }
+    }
+
+    suspend fun save(
+        key: Preferences.Key<String>,
+        value: String,
+    ) {
+        store.edit { prefs ->
+            prefs[key] = encrypt(value)
+        }
+    }
+
+    suspend fun get(key: Preferences.Key<String>): String? =
+        store.data
+            .catch { e ->
+                if (e is IOException) emit(emptyPreferences()) else throw e
+            }.firstOrNull()
+            ?.get(key)
+            ?.let { decrypt(it) }
+
+    suspend fun <T> getProperty(
+        key: Preferences.Key<String>,
+        parser: (String) -> T,
+        serializer: (T) -> String,
+    ): UpdatablePropertyFlow<T> =
+        UpdatablePropertyFlow<T>(
+            flow =
+                store.data
+                    .catch { e ->
+                        if (e is IOException) emit(emptyPreferences()) else throw e
+                    }.map { prefs ->
+                        val value = prefs[key]
+                        if (value != null) {
+                            val decrypted = decrypt(value)
+                            if (decrypted.isNotBlank()) {
+                                parser(decrypted)
+                            } else {
+                                null
+                            }
+                        } else {
+                            null
+                        }
+                    },
+            update = { newValue ->
+                if (newValue != null) {
+                    val serialized = serializer(newValue)
+                    if (serialized.isNotBlank()) {
+                        save(key, serialized)
+                    } else {
+                        remove(key)
+                    }
+                } else {
+                    remove(key)
+                }
+            },
+            scope = scope,
+        )
+}

amethyst/src/main/java/com/vitorpamplona/amethyst/model/preferences/KeyStoreEncryption.kt

@@ -0,0 +1,102 @@
+/**
+ * Copyright (c) 2025 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 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.
+ */
+package com.vitorpamplona.amethyst.model.preferences
+
+import android.os.Build
+import android.security.keystore.KeyGenParameterSpec
+import android.security.keystore.KeyProperties
+import android.security.keystore.StrongBoxUnavailableException
+import java.security.KeyStore
+import javax.crypto.Cipher
+import javax.crypto.KeyGenerator
+import javax.crypto.SecretKey
+import javax.crypto.spec.IvParameterSpec
+
+class KeyStoreEncryption {
+    companion object {
+        private const val ALGORITHM = KeyProperties.KEY_ALGORITHM_AES
+        private const val BLOCK_MODE = KeyProperties.BLOCK_MODE_GCM
+        private const val PADDING = KeyProperties.ENCRYPTION_PADDING_PKCS7
+        private const val TRANSFORMATION = "$ALGORITHM/$BLOCK_MODE/$PADDING"
+        private const val PURPOSE = KeyProperties.PURPOSE_ENCRYPT or KeyProperties.PURPOSE_DECRYPT
+        private const val KEY_ALIAS = "AMETHYST_AES_KEY"
+    }
+
+    private val cipher = Cipher.getInstance(TRANSFORMATION)
+    private val keyStore = KeyStore.getInstance("AndroidKeyStore").apply { load(null) }
+
+    private fun getKey(): SecretKey {
+        val existingKey = keyStore.getEntry(KEY_ALIAS, null) as? KeyStore.SecretKeyEntry
+        return existingKey?.secretKey ?: createKey()
+    }
+
+    private fun createKeyStrongBoxIfAvailable(): SecretKey? =
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+            try {
+                val keyParams =
+                    KeyGenParameterSpec
+                        .Builder(KEY_ALIAS, PURPOSE)
+                        .setBlockModes(BLOCK_MODE)
+                        .setEncryptionPaddings(PADDING)
+                        .setIsStrongBoxBacked(true)
+                        .build()
+
+                val generator = KeyGenerator.getInstance(ALGORITHM)
+                generator.init(keyParams)
+                generator.generateKey()
+            } catch (_: StrongBoxUnavailableException) {
+                null
+            }
+        } else {
+            null
+        }
+
+    private fun createKeyRegular(): SecretKey {
+        val keyParams =
+            KeyGenParameterSpec
+                .Builder(KEY_ALIAS, PURPOSE)
+                .setBlockModes(BLOCK_MODE)
+                .setEncryptionPaddings(PADDING)
+                .build()
+
+        val generator = KeyGenerator.getInstance(ALGORITHM)
+        generator.init(keyParams)
+        return generator.generateKey()
+    }
+
+    private fun createKey(): SecretKey = createKeyStrongBoxIfAvailable() ?: createKeyRegular()
+
+    fun encrypt(bytes: ByteArray): ByteArray {
+        // Initializes the cipher in encrypt mode and encrypts data
+        cipher.init(Cipher.ENCRYPT_MODE, getKey())
+        val iv = cipher.iv
+        val encrypted = cipher.doFinal(bytes)
+        return iv + encrypted
+    }
+
+    fun decrypt(bytes: ByteArray): ByteArray? {
+        // Extracts IV and decrypts the data
+        val iv = bytes.copyOfRange(0, cipher.blockSize)
+        val data = bytes.copyOfRange(cipher.blockSize, bytes.size)
+        cipher.init(Cipher.DECRYPT_MODE, getKey(), IvParameterSpec(iv))
+        return cipher.doFinal(data)
+    }
+}

amethyst/src/main/java/com/vitorpamplona/amethyst/model/preferences/UpdatablePropertyFlow.kt

@@ -18,21 +18,26 @@
  * 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.
  */
-package com.vitorpamplona.amethyst.ui.screen.loggedIn.relays.kind3
+package com.vitorpamplona.amethyst.model.preferences
 
-import androidx.compose.runtime.Immutable
-import com.vitorpamplona.ammolite.relays.FeedType
-import com.vitorpamplona.ammolite.relays.RelayBriefInfoCache
-import com.vitorpamplona.quartz.nip01Core.relay.RelayStat
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.flowOn
+import kotlinx.coroutines.flow.stateIn
 
-@Immutable
-data class Kind3BasicRelaySetupInfo(
-    val url: String,
-    val read: Boolean,
-    val write: Boolean,
-    val feedTypes: Set<FeedType>,
-    val relayStat: RelayStat,
-    val paidRelay: Boolean = false,
+class UpdatablePropertyFlow<T>(
+    flow: Flow<T?>,
+    val update: suspend (T?) -> Unit,
+    val scope: CoroutineScope,
 ) {
-    val briefInfo: RelayBriefInfoCache.RelayBriefInfo = RelayBriefInfoCache.RelayBriefInfo(url)
+    val stateFlow =
+        flow
+            .flowOn(Dispatchers.Default)
+            .stateIn(
+                scope = scope,
+                started = SharingStarted.Eagerly,
+                initialValue = null,
+            )
 }

amethyst/src/main/java/com/vitorpamplona/amethyst/model/privacyOptions/PrivacyState.kt

@@ -0,0 +1,125 @@
+/**
+ * Copyright (c) 2025 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 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.
+ */
+package com.vitorpamplona.amethyst.model.privacyOptions
+
+import com.vitorpamplona.amethyst.model.AccountSettings
+import com.vitorpamplona.amethyst.ui.tor.TorType
+import com.vitorpamplona.quartz.nip01Core.relay.normalizer.RelayUrlNormalizer
+
+class PrivacyState(
+    val settings: AccountSettings,
+) {
+    fun shouldUseTorForImageDownload(url: String) =
+        shouldUseTorFor(
+            url,
+            settings.torSettings.torType.value,
+            settings.torSettings.imagesViaTor.value,
+        )
+
+    fun shouldUseTorFor(
+        url: String,
+        torType: TorType,
+        imagesViaTor: Boolean,
+    ) = when (torType) {
+        TorType.OFF -> false
+        TorType.INTERNAL -> shouldUseTor(url, imagesViaTor)
+        TorType.EXTERNAL -> shouldUseTor(url, imagesViaTor)
+    }
+
+    private fun shouldUseTor(
+        normalizedUrl: String,
+        final: Boolean,
+    ): Boolean =
+        if (RelayUrlNormalizer.isLocalHost(normalizedUrl)) {
+            false
+        } else if (RelayUrlNormalizer.isOnion(normalizedUrl)) {
+            true
+        } else {
+            final
+        }
+
+    fun shouldUseTorForVideoDownload() =
+        when (settings.torSettings.torType.value) {
+            TorType.OFF -> false
+            TorType.INTERNAL -> settings.torSettings.videosViaTor.value
+            TorType.EXTERNAL -> settings.torSettings.videosViaTor.value
+        }
+
+    fun shouldUseTorForVideoDownload(url: String) =
+        when (settings.torSettings.torType.value) {
+            TorType.OFF -> false
+            TorType.INTERNAL -> checkLocalHostOnionAndThen(url, settings.torSettings.videosViaTor.value)
+            TorType.EXTERNAL -> checkLocalHostOnionAndThen(url, settings.torSettings.videosViaTor.value)
+        }
+
+    fun shouldUseTorForPreviewUrl(url: String) =
+        when (settings.torSettings.torType.value) {
+            TorType.OFF -> false
+            TorType.INTERNAL -> checkLocalHostOnionAndThen(url, settings.torSettings.urlPreviewsViaTor.value)
+            TorType.EXTERNAL -> checkLocalHostOnionAndThen(url, settings.torSettings.urlPreviewsViaTor.value)
+        }
+
+    fun shouldUseTorForTrustedRelays() =
+        when (settings.torSettings.torType.value) {
+            TorType.OFF -> false
+            TorType.INTERNAL -> settings.torSettings.trustedRelaysViaTor.value
+            TorType.EXTERNAL -> settings.torSettings.trustedRelaysViaTor.value
+        }
+
+    private fun checkLocalHostOnionAndThen(
+        url: String,
+        final: Boolean,
+    ): Boolean = checkLocalHostOnionAndThen(url, settings.torSettings.onionRelaysViaTor.value, final)
+
+    private fun checkLocalHostOnionAndThen(
+        normalizedUrl: String,
+        isOnionRelaysActive: Boolean,
+        final: Boolean,
+    ): Boolean =
+        if (RelayUrlNormalizer.isLocalHost(normalizedUrl)) {
+            false
+        } else if (RelayUrlNormalizer.isOnion(normalizedUrl)) {
+            isOnionRelaysActive
+        } else {
+            final
+        }
+
+    fun shouldUseTorForMoneyOperations(url: String) =
+        when (settings.torSettings.torType.value) {
+            TorType.OFF -> false
+            TorType.INTERNAL -> checkLocalHostOnionAndThen(url, settings.torSettings.moneyOperationsViaTor.value)
+            TorType.EXTERNAL -> checkLocalHostOnionAndThen(url, settings.torSettings.moneyOperationsViaTor.value)
+        }
+
+    fun shouldUseTorForNIP05(url: String) =
+        when (settings.torSettings.torType.value) {
+            TorType.OFF -> false
+            TorType.INTERNAL -> checkLocalHostOnionAndThen(url, settings.torSettings.nip05VerificationsViaTor.value)
+            TorType.EXTERNAL -> checkLocalHostOnionAndThen(url, settings.torSettings.nip05VerificationsViaTor.value)
+        }
+
+    fun shouldUseTorForUploads(url: String) =
+        when (settings.torSettings.torType.value) {
+            TorType.OFF -> false
+            TorType.INTERNAL -> checkLocalHostOnionAndThen(url, settings.torSettings.nip96UploadsViaTor.value)
+            TorType.EXTERNAL -> checkLocalHostOnionAndThen(url, settings.torSettings.nip96UploadsViaTor.value)
+        }
+}

amethyst/src/main/java/com/vitorpamplona/amethyst/model/privateChats/Chatroom.kt

@@ -18,67 +18,83 @@
  * 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.
  */
-package com.vitorpamplona.amethyst.model
+package com.vitorpamplona.amethyst.model.privateChats
 
 import androidx.compose.runtime.Stable
-import com.vitorpamplona.amethyst.service.checkNotInMainThread
+import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.model.NotesGatherer
+import com.vitorpamplona.amethyst.model.User
 import com.vitorpamplona.amethyst.ui.dal.DefaultFeedOrder
 import com.vitorpamplona.quartz.nip01Core.core.HexKey
 import com.vitorpamplona.quartz.nip04Dm.messages.PrivateDmEvent
 import com.vitorpamplona.quartz.nip14Subject.subject
 import com.vitorpamplona.quartz.utils.TimeUtils
+import kotlinx.coroutines.flow.MutableStateFlow
 
 @Stable
-class Chatroom {
-    var authors: Set<User> = setOf()
-    var roomMessages: Set<Note> = setOf()
-    var subject: String? = null
+class Chatroom : NotesGatherer {
+    var activeSenders: Set<User> = setOf()
+    var messages: Set<Note> = setOf()
+    var subject = MutableStateFlow<String?>(null)
     var subjectCreatedAt: Long? = null
+    var ownerSentMessage: Boolean = false
+    var lastMessage: Note? = null
+
+    override fun removeNote(note: Note) {
+        removeMessageSync(note)
+    }
 
     @Synchronized
-    fun addMessageSync(msg: Note) {
-        checkNotInMainThread()
-
-        if (msg !in roomMessages) {
-            roomMessages = roomMessages + msg
+    fun addMessageSync(msg: Note): Boolean {
+        if (msg !in messages) {
+            messages = messages + msg
+            msg.addGatherer(this)
 
             msg.author?.let { author ->
-                if (author !in authors) {
-                    authors += author
+                if (author !in activeSenders) {
+                    activeSenders += author
                 }
             }
 
+            val createdAt = msg.createdAt() ?: 0
+            if (createdAt > (lastMessage?.createdAt() ?: 0)) {
+                lastMessage = msg
+            }
+
             val newSubject = msg.event?.subject()
 
             if (newSubject != null && (msg.createdAt() ?: 0) > (subjectCreatedAt ?: 0)) {
-                subject = newSubject
+                subject.tryEmit(newSubject)
                 subjectCreatedAt = msg.createdAt()
             }
+            return true
         }
+        return false
     }
 
     @Synchronized
-    fun removeMessageSync(msg: Note) {
-        checkNotInMainThread()
+    fun removeMessageSync(msg: Note): Boolean {
+        if (msg in messages) {
+            messages = messages - msg
+            msg.removeGatherer(this)
 
-        if (msg in roomMessages) {
-            roomMessages = roomMessages - msg
-
-            roomMessages
+            messages
                 .filter { it.event?.subject() != null }
                 .sortedBy { it.createdAt() }
                 .lastOrNull()
                 ?.let {
-                    subject = it.event?.subject()
+                    subject.tryEmit(it.event?.subject())
                     subjectCreatedAt = it.createdAt()
                 }
+            return true
         }
+        return false
     }
 
-    fun senderIntersects(keySet: Set<HexKey>): Boolean = authors.any { it.pubkeyHex in keySet }
+    fun senderIntersects(keySet: Set<HexKey>): Boolean = activeSenders.any { it.pubkeyHex in keySet }
 
     fun pruneMessagesToTheLatestOnly(): Set<Note> {
-        val sorted = roomMessages.sortedWith(DefaultFeedOrder)
+        val sorted = messages.sortedWith(DefaultFeedOrder)
 
         val toKeep =
             if ((sorted.firstOrNull()?.createdAt() ?: 0) > TimeUtils.oneWeekAgo()) {
@@ -89,8 +105,8 @@ class Chatroom {
                 sorted.take(1).toSet()
             } + sorted.filter { it.flowSet?.isInUse() ?: false } + sorted.filter { it.event !is PrivateDmEvent }
 
-        val toRemove = roomMessages.minus(toKeep)
-        roomMessages = toKeep
+        val toRemove = messages.minus(toKeep)
+        messages = toKeep
         return toRemove
     }
 }

amethyst/src/main/java/com/vitorpamplona/amethyst/model/privateChats/ChatroomList.kt

@@ -0,0 +1,92 @@
+/**
+ * Copyright (c) 2025 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 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.
+ */
+package com.vitorpamplona.amethyst.model.privateChats
+
+import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.model.User
+import com.vitorpamplona.quartz.nip01Core.core.HexKey
+import com.vitorpamplona.quartz.nip17Dm.base.ChatroomKey
+import com.vitorpamplona.quartz.utils.LargeCache
+import kotlinx.collections.immutable.persistentSetOf
+
+class ChatroomList(
+    val ownerPubKey: HexKey,
+) {
+    var rooms = LargeCache<ChatroomKey, Chatroom>()
+        private set
+
+    private fun getOrCreatePrivateChatroomSync(key: ChatroomKey): Chatroom = rooms.getOrCreate(key) { Chatroom() }
+
+    fun getOrCreatePrivateChatroom(user: User): Chatroom {
+        val key = ChatroomKey(persistentSetOf(user.pubkeyHex))
+        return getOrCreatePrivateChatroom(key)
+    }
+
+    fun getOrCreatePrivateChatroom(key: ChatroomKey): Chatroom = getOrCreatePrivateChatroomSync(key)
+
+    fun addMessage(
+        room: ChatroomKey,
+        msg: Note,
+    ) {
+        val privateChatroom = getOrCreatePrivateChatroom(room)
+        if (msg !in privateChatroom.messages) {
+            privateChatroom.addMessageSync(msg)
+        }
+    }
+
+    fun addMessage(
+        user: User,
+        msg: Note,
+    ) {
+        val privateChatroom = getOrCreatePrivateChatroom(user)
+        if (msg !in privateChatroom.messages) {
+            privateChatroom.addMessageSync(msg)
+            if (msg.author?.pubkeyHex == ownerPubKey) {
+                privateChatroom.ownerSentMessage = true
+            }
+        }
+    }
+
+    fun removeMessage(
+        user: User,
+        msg: Note,
+    ) {
+        val privateChatroom = getOrCreatePrivateChatroom(user)
+        if (msg in privateChatroom.messages) {
+            privateChatroom.removeMessageSync(msg)
+        }
+    }
+
+    fun removeMessage(
+        room: ChatroomKey,
+        msg: Note,
+    ) {
+        val privateChatroom = getOrCreatePrivateChatroom(room)
+        if (msg in privateChatroom.messages) {
+            privateChatroom.removeMessageSync(msg)
+        }
+    }
+
+    fun hasSentMessagesTo(key: ChatroomKey?): Boolean {
+        if (key == null) return false
+        return rooms.get(key)?.ownerSentMessage == true
+    }
+}

amethyst/src/main/java/com/vitorpamplona/amethyst/model/serverList/MergedFollowListsState.kt

@@ -0,0 +1,84 @@
+/**
+ * Copyright (c) 2025 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 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.
+ */
+package com.vitorpamplona.amethyst.model.serverList
+
+import com.vitorpamplona.amethyst.model.nip02FollowLists.FollowListState
+import com.vitorpamplona.amethyst.model.nip51Lists.geohashLists.GeohashListState
+import com.vitorpamplona.amethyst.model.nip51Lists.hashtagLists.HashtagListState
+import com.vitorpamplona.amethyst.model.nip72Communities.CommunityListState
+import com.vitorpamplona.quartz.nip72ModCommunities.follow.tags.CommunityTag
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.flowOn
+import kotlinx.coroutines.flow.onStart
+import kotlinx.coroutines.flow.sample
+import kotlinx.coroutines.flow.stateIn
+import kotlin.collections.map
+
+class MergedFollowListsState(
+    val kind3List: FollowListState,
+    val hashtagList: HashtagListState,
+    val geohashList: GeohashListState,
+    val communityList: CommunityListState,
+    val scope: CoroutineScope,
+) {
+    fun mergeLists(
+        kind3: FollowListState.Kind3Follows,
+        hashtags: Set<String>,
+        geohashes: Set<String>,
+        community: Set<CommunityTag>,
+    ): FollowListState.Kind3Follows =
+        FollowListState.Kind3Follows(
+            kind3.authors,
+            kind3.authorsPlusMe,
+            kind3.hashtags + hashtags,
+            kind3.geotags + geohashes,
+            kind3.communities + community.map { it.address.toValue() },
+        )
+
+    val flow: StateFlow<FollowListState.Kind3Follows> =
+        combine(
+            kind3List.flow,
+            hashtagList.flow,
+            geohashList.flow,
+            communityList.flow,
+        ) { kind3, hashtag, geohash, community ->
+            mergeLists(kind3, hashtag, geohash, community)
+        }.onStart {
+            emit(
+                mergeLists(
+                    kind3List.flow.value,
+                    hashtagList.flow.value,
+                    geohashList.flow.value,
+                    communityList.flow.value,
+                ),
+            )
+        }.sample(200)
+            .flowOn(Dispatchers.Default)
+            .stateIn(
+                scope,
+                SharingStarted.Eagerly,
+                kind3List.flow.value,
+            )
+}