Reverts save button

New Crowdin Translations

.gitignore

@@ -7,9 +7,11 @@
 /.idea/assetWizardSettings.xml
 /.idea/androidTestResultsUserPreferences.xml
 /.idea/deploymentTargetDropDown.xml
+/.idea/deploymentTargetSelector.xml
 /.idea/appInsightsSettings.xml
 /.idea/ktlint-plugin.xml
 /.idea/ktfmt.xml
+/.idea/studiobot.xml
 .DS_Store
 /build
 /captures

.idea/kotlinc.xml

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

README.md

@@ -43,7 +43,7 @@ height="70">](https://github.com/vitorpamplona/amethyst/releases)
 - [x] OpenTimestamps Attestations (NIP-03)
 - [x] Private Messages (NIP-04)
 - [x] DNS Address (NIP-05)
-- [ ] Mnemonic seed phrase (NIP-06)
+- [x] Mnemonic seed phrase (NIP-06)
 - [ ] WebBrowser Signer (NIP-07, Not applicable)
 - [x] Old-style mentions (NIP-08)
 - [x] Event Deletion (NIP-09)
@@ -55,6 +55,7 @@ height="70">](https://github.com/vitorpamplona/amethyst/releases)
 - [x] Events with a Subject (NIP-14)
 - [ ] Marketplace (NIP-15)
 - [x] Event Treatment (NIP-16)
+- [x] Private Direct Messages (NIP-17)
 - [x] Image/Video/Url/LnInvoice Previews
 - [x] Reposts, Quotes, Generic Reposts (NIP-18)
 - [x] Bech Encoding support (NIP-19)
@@ -66,17 +67,20 @@ height="70">](https://github.com/vitorpamplona/amethyst/releases)
 - [ ] Delegated Event Signing (NIP-26, Will not implement)
 - [x] Text Note References (NIP-27)
 - [x] Public Chats (NIP-28)
+- [ ] Relay-based Groups (NIP-29)
 - [x] Custom Emoji (NIP-30)
 - [x] Event kind summaries (NIP-31)
 - [ ] Labeling (NIP-32)
 - [x] Parameterized Replaceable Events (NIP-33)
-- [x] Git Stuff (NIP-34/Draft)
+- [x] Git Stuff (NIP-34)
+- [ ] Torrents (NIP-35)
 - [x] Sensitive Content (NIP-36)
-- [x] Note Edits (NIP-37/Draft)
+- [x] Edits (NIP-37/Draft)
 - [x] User Status Event (NIP-38)
 - [x] External Identities (NIP-39)
 - [x] Expiration Support (NIP-40)
 - [x] Relay Authentication (NIP-42)
+- [x] Versioned Encrypted Payloads (NIP-44)
 - [ ] Event Counts (NIP-45, Will not implement)
 - [ ] Nostr Connect (NIP-46)
 - [x] Wallet Connect API (NIP-47)
@@ -86,31 +90,32 @@ height="70">](https://github.com/vitorpamplona/amethyst/releases)
 - [x] Lists (NIP-51)
 - [ ] Calendar Events (NIP-52)
 - [x] Live Activities & Live Chats (NIP-53)
+- [x] Wiki (NIP-54)
 - [x] Inline Metadata (NIP-55 - Draft)
 - [x] Reporting (NIP-56)
 - [x] Lightning Tips
 - [x] Zaps (NIP-57)
 - [x] Private Zaps
 - [x] Zap Splits (NIP-57)
+- [x] Badges (NIP-58)
 - [x] Gift Wraps & Seals (NIP-59)
 - [x] Zapraiser (NIP-TBD)
-- [x] Badges (NIP-58)
 - [ ] Relay List Metadata (NIP-65)
 - [x] Polls (NIP-69)
+- [x] Video Events (NIP-71)
 - [x] Moderated Communities (NIP-72)
 - [ ] Zap Goals (NIP-75)
 - [ ] Arbitrary Custom App Data (NIP-78)
 - [x] Highlights (NIP-84)
+- [x] Notify Request (NIP-88/Draft)
 - [x] Recommended Application Handlers (NIP-89)
-- [ ] Data Vending Machine (NIP-90)
+- [x] Data Vending Machine (NIP-90)
 - [x] Inline Metadata (NIP-92)
 - [x] Verifiable file URLs (NIP-94)
-- [x] Binary Blobs (NIP-95)
-- [x] HTTP File Storage Integration (NIP-96 Draft)
+- [x] Binary Blobs (NIP-95/Draft)
+- [x] HTTP File Storage Integration (NIP-96)
 - [x] HTTP Auth (NIP-98)
 - [x] Classifieds (NIP-99)
-- [x] Private Messages and Small Groups (NIP-24/Draft)
-- [x] Versioned Encrypted Payloads (NIP-44/Draft)
 - [x] Audio Tracks (zapstr.live) (kind:31337)
 - [x] Push Notifications (Google and Unified Push)
 - [x] In-Device Automatic Translations
@@ -120,9 +125,15 @@ height="70">](https://github.com/vitorpamplona/amethyst/releases)
 - [x] De-googled F-Droid flavor
 - [x] Multiple Accounts
 - [x] Markdown Support
-- [x] FHIR Payloads (kind:82)
-- [ ] Decentralized Wiki (kind:30818)
-- [ ] Embed events
+- [x] Medical Data (NIP-xx/Draft)
+- [x] Embed events (NIP-xx/Draft)
+- [x] Draft Events (NIP-xx/Draft)
+- [ ] Event Sets (NIP-xx/Draft)
+- [ ] Topical Notes  (NIP-xx/Draft)
+- [ ] Relationship Status (NIP-xx/Draft)
+- [ ] Signed Filters (NIP-xx/Draft)
+- [ ] Key Migration (NIP-xx/Draft)
+- [ ] Time-based Sync (NIP-xx/Draft)
 - [ ] Image/Video Capture in the app
 - [ ] Local Database
 - [ ] Workspaces

app/build.gradle

@@ -12,9 +12,9 @@ android {
         applicationId "com.vitorpamplona.amethyst"
         minSdk 26
         targetSdk 34
-        versionCode 367
-        versionName "0.86.4"
-        buildConfigField "String", "RELEASE_NOTES_ID", "\"a704a11334ed4fe6fc6ee6f8856f6f005da33644770616f1437f8b2b488b52b1\""
+        versionCode 376
+        versionName "0.87.7"
+        buildConfigField "String", "RELEASE_NOTES_ID", "\"863124b6592359494396c22b917f9d251ad12ac31b09ea29e0265e3c088ce9f8\""
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {
@@ -143,7 +143,7 @@ android {
 
     composeOptions {
         // Should match compose version : https://developer.android.com/jetpack/androidx/releases/compose-kotlin
-        kotlinCompilerExtensionVersion "1.5.11"
+        kotlinCompilerExtensionVersion "1.5.14"
     }
     packagingOptions {
         resources {

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

@@ -22,6 +22,7 @@ package com.vitorpamplona.amethyst
 
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.input.TransformedText
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
 import com.vitorpamplona.amethyst.model.LocalCache
@@ -47,6 +48,136 @@ class UrlUserTagTransformationTest {
         assertEquals("com.vitorpamplona.amethyst", appContext.packageName.removeSuffix(".debug"))
     }
 
+    fun debugCursor(
+        original: String,
+        transformedText: TransformedText,
+        offset: Int,
+    ): String {
+        val offsetTransformed = transformedText.offsetMapping.originalToTransformed(offset)
+        val originalWithCursor = original.substring(0, offset) + "|" + original.substring(offset, original.length)
+        val transformedWithCursor = transformedText.text.text.substring(0, offsetTransformed) + "|" + transformedText.text.text.substring(offsetTransformed, transformedText.text.text.length)
+        return "$originalWithCursor $transformedWithCursor"
+    }
+
+    fun debugCursorReverse(
+        original: String,
+        transformedText: TransformedText,
+        offsetTransformed: Int,
+    ): String {
+        val offset = transformedText.offsetMapping.transformedToOriginal(offsetTransformed)
+        val originalWithCursor = original.substring(0, offset) + "|" + original.substring(offset, original.length)
+        val transformedWithCursor = transformedText.text.text.substring(0, offsetTransformed) + "|" + transformedText.text.text.substring(offsetTransformed, transformedText.text.text.length)
+        return "$originalWithCursor $transformedWithCursor"
+    }
+
+    @Test
+    fun testKeepTransformedIndexFullyInsideTransformedText() {
+        val user =
+            LocalCache.getOrCreateUser(
+                decodePublicKey("npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z")
+                    .toHexKey(),
+            )
+        user.info = UserMetadata()
+        user.info?.displayName = "Vitor Pamplona"
+
+        val original = "@npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z"
+
+        val transformedText =
+            buildAnnotatedStringWithUrlHighlighting(
+                AnnotatedString(original),
+                Color.Red,
+            )
+
+        val expected = "@Vitor Pamplona"
+        assertEquals(expected, transformedText.text.text)
+
+        assertEquals("|@npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z |@Vitor Pamplona", debugCursor(original, transformedText, 0))
+        assertEquals("@|npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z |@Vitor Pamplona", debugCursor(original, transformedText, 1))
+        assertEquals("@n|pub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z |@Vitor Pamplona", debugCursor(original, transformedText, 2))
+        assertEquals("@np|ub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z |@Vitor Pamplona", debugCursor(original, transformedText, 3))
+        assertEquals("@npu|b1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z |@Vitor Pamplona", debugCursor(original, transformedText, 4))
+        assertEquals("@npub|1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z @|Vitor Pamplona", debugCursor(original, transformedText, 5))
+        assertEquals("@npub1|gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z @|Vitor Pamplona", debugCursor(original, transformedText, 6))
+        assertEquals("@npub1g|cxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z @|Vitor Pamplona", debugCursor(original, transformedText, 7))
+        assertEquals("@npub1gc|xzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z @|Vitor Pamplona", debugCursor(original, transformedText, 8))
+        assertEquals("@npub1gcx|zte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z @V|itor Pamplona", debugCursor(original, transformedText, 9))
+        assertEquals("@npub1gcxz|te5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z @V|itor Pamplona", debugCursor(original, transformedText, 10))
+        assertEquals("@npub1gcxzt|e5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z @V|itor Pamplona", debugCursor(original, transformedText, 11))
+        assertEquals("@npub1gcxzte|5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z @V|itor Pamplona", debugCursor(original, transformedText, 12))
+        assertEquals("@npub1gcxzte5|zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z @Vi|tor Pamplona", debugCursor(original, transformedText, 13))
+        assertEquals("@npub1gcxzte5z|lkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z @Vi|tor Pamplona", debugCursor(original, transformedText, 14))
+        assertEquals("@npub1gcxzte5zl|kncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z @Vi|tor Pamplona", debugCursor(original, transformedText, 15))
+        assertEquals("@npub1gcxzte5zlk|ncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z @Vi|tor Pamplona", debugCursor(original, transformedText, 16))
+        assertEquals("@npub1gcxzte5zlkn|cx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z @Vi|tor Pamplona", debugCursor(original, transformedText, 17))
+        assertEquals("@npub1gcxzte5zlknc|x26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z @Vit|or Pamplona", debugCursor(original, transformedText, 18))
+        assertEquals("@npub1gcxzte5zlkncx|26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z @Vit|or Pamplona", debugCursor(original, transformedText, 19))
+        assertEquals("@npub1gcxzte5zlkncx2|6j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z @Vit|or Pamplona", debugCursor(original, transformedText, 20))
+        assertEquals("@npub1gcxzte5zlkncx26|j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z @Vit|or Pamplona", debugCursor(original, transformedText, 21))
+        assertEquals("@npub1gcxzte5zlkncx26j|68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z @Vito|r Pamplona", debugCursor(original, transformedText, 22))
+        assertEquals("@npub1gcxzte5zlkncx26j6|8ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z @Vito|r Pamplona", debugCursor(original, transformedText, 23))
+        assertEquals("@npub1gcxzte5zlkncx26j68|ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z @Vito|r Pamplona", debugCursor(original, transformedText, 24))
+        assertEquals("@npub1gcxzte5zlkncx26j68e|z60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z @Vito|r Pamplona", debugCursor(original, transformedText, 25))
+        assertEquals("@npub1gcxzte5zlkncx26j68ez|60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z @Vitor| Pamplona", debugCursor(original, transformedText, 26))
+        assertEquals("@npub1gcxzte5zlkncx26j68ez6|0fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z @Vitor| Pamplona", debugCursor(original, transformedText, 27))
+        assertEquals("@npub1gcxzte5zlkncx26j68ez60|fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z @Vitor| Pamplona", debugCursor(original, transformedText, 28))
+        assertEquals("@npub1gcxzte5zlkncx26j68ez60f|zkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z @Vitor| Pamplona", debugCursor(original, transformedText, 29))
+        assertEquals("@npub1gcxzte5zlkncx26j68ez60fz|kvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z @Vitor |Pamplona", debugCursor(original, transformedText, 30))
+        assertEquals("@npub1gcxzte5zlkncx26j68ez60fzk|vtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z @Vitor |Pamplona", debugCursor(original, transformedText, 31))
+        assertEquals("@npub1gcxzte5zlkncx26j68ez60fzkv|tkm9e0vrwdcvsjakxf9mu9qewqlfnj5z @Vitor |Pamplona", debugCursor(original, transformedText, 32))
+        assertEquals("@npub1gcxzte5zlkncx26j68ez60fzkvt|km9e0vrwdcvsjakxf9mu9qewqlfnj5z @Vitor |Pamplona", debugCursor(original, transformedText, 33))
+        assertEquals("@npub1gcxzte5zlkncx26j68ez60fzkvtk|m9e0vrwdcvsjakxf9mu9qewqlfnj5z @Vitor |Pamplona", debugCursor(original, transformedText, 34))
+        assertEquals("@npub1gcxzte5zlkncx26j68ez60fzkvtkm|9e0vrwdcvsjakxf9mu9qewqlfnj5z @Vitor P|amplona", debugCursor(original, transformedText, 35))
+        assertEquals("@npub1gcxzte5zlkncx26j68ez60fzkvtkm9|e0vrwdcvsjakxf9mu9qewqlfnj5z @Vitor P|amplona", debugCursor(original, transformedText, 36))
+        assertEquals("@npub1gcxzte5zlkncx26j68ez60fzkvtkm9e|0vrwdcvsjakxf9mu9qewqlfnj5z @Vitor P|amplona", debugCursor(original, transformedText, 37))
+        assertEquals("@npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0|vrwdcvsjakxf9mu9qewqlfnj5z @Vitor P|amplona", debugCursor(original, transformedText, 38))
+        assertEquals("@npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0v|rwdcvsjakxf9mu9qewqlfnj5z @Vitor Pa|mplona", debugCursor(original, transformedText, 39))
+        assertEquals("@npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vr|wdcvsjakxf9mu9qewqlfnj5z @Vitor Pa|mplona", debugCursor(original, transformedText, 40))
+        assertEquals("@npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrw|dcvsjakxf9mu9qewqlfnj5z @Vitor Pa|mplona", debugCursor(original, transformedText, 41))
+        assertEquals("@npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwd|cvsjakxf9mu9qewqlfnj5z @Vitor Pa|mplona", debugCursor(original, transformedText, 42))
+        assertEquals("@npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdc|vsjakxf9mu9qewqlfnj5z @Vitor Pam|plona", debugCursor(original, transformedText, 43))
+        assertEquals("@npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcv|sjakxf9mu9qewqlfnj5z @Vitor Pam|plona", debugCursor(original, transformedText, 44))
+        assertEquals("@npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvs|jakxf9mu9qewqlfnj5z @Vitor Pam|plona", debugCursor(original, transformedText, 45))
+        assertEquals("@npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsj|akxf9mu9qewqlfnj5z @Vitor Pam|plona", debugCursor(original, transformedText, 46))
+        assertEquals("@npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsja|kxf9mu9qewqlfnj5z @Vitor Pamp|lona", debugCursor(original, transformedText, 47))
+        assertEquals("@npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjak|xf9mu9qewqlfnj5z @Vitor Pamp|lona", debugCursor(original, transformedText, 48))
+        assertEquals("@npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakx|f9mu9qewqlfnj5z @Vitor Pamp|lona", debugCursor(original, transformedText, 49))
+        assertEquals("@npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf|9mu9qewqlfnj5z @Vitor Pamp|lona", debugCursor(original, transformedText, 50))
+        assertEquals("@npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9|mu9qewqlfnj5z @Vitor Pamp|lona", debugCursor(original, transformedText, 51))
+        assertEquals("@npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9m|u9qewqlfnj5z @Vitor Pampl|ona", debugCursor(original, transformedText, 52))
+        assertEquals("@npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu|9qewqlfnj5z @Vitor Pampl|ona", debugCursor(original, transformedText, 53))
+        assertEquals("@npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9|qewqlfnj5z @Vitor Pampl|ona", debugCursor(original, transformedText, 54))
+        assertEquals("@npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9q|ewqlfnj5z @Vitor Pampl|ona", debugCursor(original, transformedText, 55))
+        assertEquals("@npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qe|wqlfnj5z @Vitor Pamplo|na", debugCursor(original, transformedText, 56))
+        assertEquals("@npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qew|qlfnj5z @Vitor Pamplo|na", debugCursor(original, transformedText, 57))
+        assertEquals("@npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewq|lfnj5z @Vitor Pamplo|na", debugCursor(original, transformedText, 58))
+        assertEquals("@npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewql|fnj5z @Vitor Pamplo|na", debugCursor(original, transformedText, 59))
+        assertEquals("@npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlf|nj5z @Vitor Pamplon|a", debugCursor(original, transformedText, 60))
+        assertEquals("@npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfn|j5z @Vitor Pamplon|a", debugCursor(original, transformedText, 61))
+        assertEquals("@npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj|5z @Vitor Pamplon|a", debugCursor(original, transformedText, 62))
+        assertEquals("@npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5|z @Vitor Pamplon|a", debugCursor(original, transformedText, 63))
+        assertEquals("@npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z| @Vitor Pamplona|", debugCursor(original, transformedText, 64))
+
+        assertEquals("|@npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z |@Vitor Pamplona", debugCursorReverse(original, transformedText, 0))
+        assertEquals("@npu|b1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z @|Vitor Pamplona", debugCursorReverse(original, transformedText, 1))
+        assertEquals("@npub1gc|xzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z @V|itor Pamplona", debugCursorReverse(original, transformedText, 2))
+        assertEquals("@npub1gcxzte|5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z @Vi|tor Pamplona", debugCursorReverse(original, transformedText, 3))
+        assertEquals("@npub1gcxzte5zlkn|cx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z @Vit|or Pamplona", debugCursorReverse(original, transformedText, 4))
+        assertEquals("@npub1gcxzte5zlkncx26|j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z @Vito|r Pamplona", debugCursorReverse(original, transformedText, 5))
+        assertEquals("@npub1gcxzte5zlkncx26j68e|z60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z @Vitor| Pamplona", debugCursorReverse(original, transformedText, 6))
+        assertEquals("@npub1gcxzte5zlkncx26j68ez60f|zkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z @Vitor |Pamplona", debugCursorReverse(original, transformedText, 7))
+        assertEquals("@npub1gcxzte5zlkncx26j68ez60fzkvtk|m9e0vrwdcvsjakxf9mu9qewqlfnj5z @Vitor P|amplona", debugCursorReverse(original, transformedText, 8))
+        assertEquals("@npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0|vrwdcvsjakxf9mu9qewqlfnj5z @Vitor Pa|mplona", debugCursorReverse(original, transformedText, 9))
+        assertEquals("@npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwd|cvsjakxf9mu9qewqlfnj5z @Vitor Pam|plona", debugCursorReverse(original, transformedText, 10))
+        assertEquals("@npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsj|akxf9mu9qewqlfnj5z @Vitor Pamp|lona", debugCursorReverse(original, transformedText, 11))
+        assertEquals("@npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9|mu9qewqlfnj5z @Vitor Pampl|ona", debugCursorReverse(original, transformedText, 12))
+        assertEquals("@npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9q|ewqlfnj5z @Vitor Pamplo|na", debugCursorReverse(original, transformedText, 13))
+        assertEquals("@npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewql|fnj5z @Vitor Pamplon|a", debugCursorReverse(original, transformedText, 14))
+        assertEquals("@npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z| @Vitor Pamplona|", debugCursorReverse(original, transformedText, 15))
+
+        assertEquals(0, transformedText.offsetMapping.originalToTransformed(0))
+        assertEquals(15, transformedText.offsetMapping.originalToTransformed(64))
+    }
+
     @Test
     fun transformationText() {
         val user =
@@ -70,11 +201,11 @@ class UrlUserTagTransformationTest {
         assertEquals(8, transformedText.offsetMapping.originalToTransformed(8)) // Before @
         assertEquals(8, transformedText.offsetMapping.originalToTransformed(9)) // Before n
         assertEquals(8, transformedText.offsetMapping.originalToTransformed(10)) // Before p
-        assertEquals(9, transformedText.offsetMapping.originalToTransformed(11)) // Before u
-        assertEquals(9, transformedText.offsetMapping.originalToTransformed(12)) // Before b
+        assertEquals(8, transformedText.offsetMapping.originalToTransformed(11)) // Before u
+        assertEquals(8, transformedText.offsetMapping.originalToTransformed(12)) // Before b
         assertEquals(9, transformedText.offsetMapping.originalToTransformed(13)) // Before 1
 
-        assertEquals(23, transformedText.offsetMapping.originalToTransformed(71))
+        assertEquals(22, transformedText.offsetMapping.originalToTransformed(71))
         assertEquals(23, transformedText.offsetMapping.originalToTransformed(72))
 
         assertEquals(0, transformedText.offsetMapping.transformedToOriginal(0))
@@ -106,12 +237,12 @@ class UrlUserTagTransformationTest {
 
         assertEquals("New Hey @Vitor Pamplona and @Vitor Pamplona", transformedText.text.text)
 
-        assertEquals(9, transformedText.offsetMapping.originalToTransformed(11))
-        assertEquals(9, transformedText.offsetMapping.originalToTransformed(12))
+        assertEquals(8, transformedText.offsetMapping.originalToTransformed(11))
+        assertEquals(8, transformedText.offsetMapping.originalToTransformed(12))
         assertEquals(9, transformedText.offsetMapping.originalToTransformed(13))
 
-        assertEquals(23, transformedText.offsetMapping.originalToTransformed(70)) // Before 5
-        assertEquals(23, transformedText.offsetMapping.originalToTransformed(71)) // Before z
+        assertEquals(22, transformedText.offsetMapping.originalToTransformed(70)) // Before 5
+        assertEquals(22, transformedText.offsetMapping.originalToTransformed(71)) // Before z
         assertEquals(23, transformedText.offsetMapping.originalToTransformed(72)) // Before <space>
         assertEquals(24, transformedText.offsetMapping.originalToTransformed(73)) // Before a
         assertEquals(25, transformedText.offsetMapping.originalToTransformed(74)) // Before n
@@ -120,7 +251,7 @@ class UrlUserTagTransformationTest {
         assertEquals(28, transformedText.offsetMapping.originalToTransformed(77)) // Before @
         assertEquals(28, transformedText.offsetMapping.originalToTransformed(78)) // Before n
 
-        assertEquals(68, transformedText.offsetMapping.transformedToOriginal(22)) // Before a
+        assertEquals(67, transformedText.offsetMapping.transformedToOriginal(22)) // Before a
         assertEquals(72, transformedText.offsetMapping.transformedToOriginal(23)) // Before <space>
         assertEquals(73, transformedText.offsetMapping.transformedToOriginal(24)) // Before a
         assertEquals(74, transformedText.offsetMapping.transformedToOriginal(25)) // Before n

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

@@ -56,7 +56,7 @@ object PushDistributorHandler : PushDistributorActions {
     }
 
     override fun getSavedDistributor(): String {
-        return unifiedPush.getDistributor(appContext)
+        return unifiedPush.getSavedDistributor(appContext) ?: ""
     }
 
     fun savedDistributorExists(): Boolean = getSavedDistributor().isNotEmpty()

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

@@ -36,6 +36,7 @@ fun TranslatableRichTextViewer(
     tags: ImmutableListOfLists<String>,
     backgroundColor: MutableState<Color>,
     id: String,
+    callbackUri: String? = null,
     accountViewModel: AccountViewModel,
     nav: (String) -> Unit,
 ) = ExpandableRichTextViewer(
@@ -46,6 +47,7 @@ fun TranslatableRichTextViewer(
     tags,
     backgroundColor,
     id,
+    callbackUri,
     accountViewModel,
     nav,
 )

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

@@ -40,6 +40,7 @@ import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.runBlocking
 import java.io.File
 import kotlin.time.measureTimedValue
 
@@ -53,7 +54,9 @@ class Amethyst : Application() {
 
     val videoCache: VideoCache by lazy {
         val newCache = VideoCache()
-        newCache.initFileCache(this)
+        runBlocking {
+            newCache.initFileCache(this@Amethyst)
+        }
         newCache
     }
 

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

@@ -77,6 +77,7 @@ private object PrefKeys {
     const val NOSTR_PUBKEY = "nostr_pubkey"
     const val RELAYS = "relays"
     const val DONT_TRANSLATE_FROM = "dontTranslateFrom"
+    const val LOCAL_RELAY_SERVERS = "localRelayServers"
     const val LANGUAGE_PREFS = "languagePreferences"
     const val TRANSLATE_TO = "translateTo"
     const val ZAP_AMOUNTS = "zapAmounts"
@@ -91,7 +92,7 @@ private object PrefKeys {
     const val LATEST_CONTACT_LIST = "latestContactList"
     const val HIDE_DELETE_REQUEST_DIALOG = "hide_delete_request_dialog"
     const val HIDE_BLOCK_ALERT_DIALOG = "hide_block_alert_dialog"
-    const val HIDE_NIP_24_WARNING_DIALOG = "hide_nip24_warning_dialog"
+    const val HIDE_NIP_17_WARNING_DIALOG = "hide_nip24_warning_dialog" // delete later
     const val USE_PROXY = "use_proxy"
     const val PROXY_PORT = "proxy_port"
     const val SHOW_SENSITIVE_CONTENT = "show_sensitive_content"
@@ -243,7 +244,8 @@ object LocalPreferences {
      * deleted
      */
     @SuppressLint("ApplySharedPref")
-    suspend fun updatePrefsForLogout(accountInfo: AccountInfo) =
+    suspend fun updatePrefsForLogout(accountInfo: AccountInfo) {
+        Log.d("LocalPreferences", "Saving to encrypted storage updatePrefsForLogout")
         withContext(Dispatchers.IO) {
             val userPrefs = encryptedPreferences(accountInfo.npub)
             userPrefs.edit().clear().commit()
@@ -256,6 +258,7 @@ object LocalPreferences {
                 updateCurrentAccount(savedAccounts().elementAt(0).npub)
             }
         }
+    }
 
     suspend fun updatePrefsForLogin(account: Account) {
         setCurrentAccount(account)
@@ -266,7 +269,8 @@ object LocalPreferences {
         return savedAccounts()
     }
 
-    suspend fun saveToEncryptedStorage(account: Account) =
+    suspend fun saveToEncryptedStorage(account: Account) {
+        Log.d("LocalPreferences", "Saving to encrypted storage")
         withContext(Dispatchers.IO) {
             checkNotInMainThread()
 
@@ -284,6 +288,7 @@ object LocalPreferences {
                     account.keyPair.pubKey.let { putString(PrefKeys.NOSTR_PUBKEY, it.toHexKey()) }
                     putString(PrefKeys.RELAYS, Event.mapper.writeValueAsString(account.localRelays))
                     putStringSet(PrefKeys.DONT_TRANSLATE_FROM, account.dontTranslateFrom)
+                    putStringSet(PrefKeys.LOCAL_RELAY_SERVERS, account.localRelayServers)
                     putString(
                         PrefKeys.LANGUAGE_PREFS,
                         Event.mapper.writeValueAsString(account.languagePreferences),
@@ -318,7 +323,7 @@ object LocalPreferences {
                         Event.mapper.writeValueAsString(account.backupContactList),
                     )
                     putBoolean(PrefKeys.HIDE_DELETE_REQUEST_DIALOG, account.hideDeleteRequestDialog)
-                    putBoolean(PrefKeys.HIDE_NIP_24_WARNING_DIALOG, account.hideNIP24WarningDialog)
+                    putBoolean(PrefKeys.HIDE_NIP_17_WARNING_DIALOG, account.hideNIP17WarningDialog)
                     putBoolean(PrefKeys.HIDE_BLOCK_ALERT_DIALOG, account.hideBlockAlertDialog)
                     putBoolean(PrefKeys.USE_PROXY, account.proxy != null)
                     putInt(PrefKeys.PROXY_PORT, account.proxyPort)
@@ -338,11 +343,12 @@ object LocalPreferences {
 
                     putString(
                         PrefKeys.PENDING_ATTESTATIONS,
-                        Event.mapper.writeValueAsString(account.pendingAttestations),
+                        Event.mapper.writeValueAsString(account.pendingAttestations.value),
                     )
                 }
                 .apply()
         }
+    }
 
     suspend fun loadCurrentAccountFromEncryptedStorage(): Account? {
         return currentAccount()?.let { loadCurrentAccountFromEncryptedStorage(it) }
@@ -352,6 +358,7 @@ object LocalPreferences {
         sharedSettings: Settings,
         prefs: SharedPreferences = encryptedPreferences(),
     ) {
+        Log.d("LocalPreferences", "Saving to shared settings")
         with(prefs.edit()) {
             putString(PrefKeys.SHARED_SETTINGS, Event.mapper.writeValueAsString(sharedSettings))
             apply()
@@ -359,6 +366,7 @@ object LocalPreferences {
     }
 
     suspend fun loadSharedSettings(prefs: SharedPreferences = encryptedPreferences()): Settings? {
+        Log.d("LocalPreferences", "Load shared settings")
         with(prefs) {
             return try {
                 getString(PrefKeys.SHARED_SETTINGS, "{}")?.let { Event.mapper.readValue<Settings>(it) }
@@ -393,8 +401,10 @@ object LocalPreferences {
             }
         }
 
-    suspend fun innerLoadCurrentAccountFromEncryptedStorage(npub: String?): Account? =
-        withContext(Dispatchers.IO) {
+    suspend fun innerLoadCurrentAccountFromEncryptedStorage(npub: String?): Account? {
+        Log.d("LocalPreferences", "Load account from file")
+
+        return withContext(Dispatchers.IO) {
             checkNotInMainThread()
 
             return@withContext with(encryptedPreferences(npub)) {
@@ -410,6 +420,7 @@ object LocalPreferences {
                         ?: setOf<RelaySetupInfo>()
 
                 val dontTranslateFrom = getStringSet(PrefKeys.DONT_TRANSLATE_FROM, null) ?: setOf()
+                val localRelayServers = getStringSet(PrefKeys.LOCAL_RELAY_SERVERS, null) ?: setOf()
                 val translateTo = getString(PrefKeys.TRANSLATE_TO, null) ?: Locale.getDefault().language
                 val defaultHomeFollowList =
                     getString(PrefKeys.DEFAULT_HOME_FOLLOW_LIST, null) ?: KIND3_FOLLOWS
@@ -526,7 +537,7 @@ object LocalPreferences {
 
                 val hideDeleteRequestDialog = getBoolean(PrefKeys.HIDE_DELETE_REQUEST_DIALOG, false)
                 val hideBlockAlertDialog = getBoolean(PrefKeys.HIDE_BLOCK_ALERT_DIALOG, false)
-                val hideNIP24WarningDialog = getBoolean(PrefKeys.HIDE_NIP_24_WARNING_DIALOG, false)
+                val hideNIP17WarningDialog = getBoolean(PrefKeys.HIDE_NIP_17_WARNING_DIALOG, false)
                 val useProxy = getBoolean(PrefKeys.USE_PROXY, false)
                 val proxyPort = getInt(PrefKeys.PROXY_PORT, 9050)
                 val proxy = HttpClientManager.initProxy(useProxy, "127.0.0.1", proxyPort)
@@ -577,6 +588,7 @@ object LocalPreferences {
                         keyPair = keyPair,
                         signer = signer,
                         localRelays = localRelays,
+                        localRelayServers = localRelayServers,
                         dontTranslateFrom = dontTranslateFrom,
                         languagePreferences = languagePreferences,
                         translateTo = translateTo,
@@ -591,7 +603,7 @@ object LocalPreferences {
                         zapPaymentRequest = zapPaymentRequestServer,
                         hideDeleteRequestDialog = hideDeleteRequestDialog,
                         hideBlockAlertDialog = hideBlockAlertDialog,
-                        hideNIP24WarningDialog = hideNIP24WarningDialog,
+                        hideNIP17WarningDialog = hideNIP17WarningDialog,
                         backupContactList = latestContactList,
                         proxy = proxy,
                         proxyPort = proxyPort,
@@ -600,7 +612,7 @@ object LocalPreferences {
                         filterSpamFromStrangers = filterSpam,
                         lastReadPerRoute = lastReadPerRoute,
                         hasDonatedInVersion = hasDonatedInVersion,
-                        pendingAttestations = pendingAttestations ?: emptyMap(),
+                        pendingAttestations = MutableStateFlow(pendingAttestations ?: emptyMap()),
                     )
 
                 // Loads from DB
@@ -614,4 +626,5 @@ object LocalPreferences {
                 return@with account
             }
         }
+    }
 }

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

@@ -58,6 +58,7 @@ import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.launch
 
 @Stable
@@ -104,7 +105,7 @@ class ServiceManager {
         }
 
         if (myAccount != null) {
-            val relaySet = myAccount.activeRelays() ?: myAccount.convertLocalRelays()
+            val relaySet = myAccount.connectToRelays.value
             Log.d("Relay", "Service Manager Connect Connecting ${relaySet.size}")
             Client.reconnect(relaySet)
 
@@ -112,10 +113,10 @@ class ServiceManager {
             collectorJob = null
             collectorJob =
                 scope.launch {
-                    myAccount.userProfile().flow().relays.stateFlow.collect {
+                    myAccount.connectToRelaysFlow.collectLatest {
+                        delay(500)
                         if (isStarted) {
-                            val newRelaySet = myAccount.activeRelays() ?: myAccount.convertLocalRelays()
-                            Client.reconnect(newRelaySet, onlyIfChanged = true)
+                            Client.reconnect(it, onlyIfChanged = true)
                         }
                     }
                 }

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

@@ -39,19 +39,24 @@ import com.vitorpamplona.amethyst.service.checkNotInMainThread
 import com.vitorpamplona.amethyst.service.relays.Client
 import com.vitorpamplona.amethyst.service.relays.Constants
 import com.vitorpamplona.amethyst.service.relays.FeedType
+import com.vitorpamplona.amethyst.service.relays.JsonFilter
 import com.vitorpamplona.amethyst.service.relays.Relay
+import com.vitorpamplona.amethyst.service.relays.TypedFilter
 import com.vitorpamplona.amethyst.ui.components.BundledUpdate
 import com.vitorpamplona.quartz.crypto.KeyPair
 import com.vitorpamplona.quartz.encoders.ATag
 import com.vitorpamplona.quartz.encoders.HexKey
 import com.vitorpamplona.quartz.encoders.Nip47WalletConnect
+import com.vitorpamplona.quartz.encoders.RelayUrlFormatter
 import com.vitorpamplona.quartz.encoders.hexToByteArray
 import com.vitorpamplona.quartz.encoders.toHexKey
+import com.vitorpamplona.quartz.events.AdvertisedRelayListEvent
 import com.vitorpamplona.quartz.events.BookmarkListEvent
 import com.vitorpamplona.quartz.events.ChannelCreateEvent
 import com.vitorpamplona.quartz.events.ChannelMessageEvent
 import com.vitorpamplona.quartz.events.ChannelMetadataEvent
 import com.vitorpamplona.quartz.events.ChatMessageEvent
+import com.vitorpamplona.quartz.events.ChatMessageRelayListEvent
 import com.vitorpamplona.quartz.events.ClassifiedsEvent
 import com.vitorpamplona.quartz.events.Contact
 import com.vitorpamplona.quartz.events.ContactListEvent
@@ -78,18 +83,21 @@ import com.vitorpamplona.quartz.events.LnZapPaymentResponseEvent
 import com.vitorpamplona.quartz.events.LnZapRequestEvent
 import com.vitorpamplona.quartz.events.MetadataEvent
 import com.vitorpamplona.quartz.events.MuteListEvent
-import com.vitorpamplona.quartz.events.NIP24Factory
+import com.vitorpamplona.quartz.events.NIP17Factory
+import com.vitorpamplona.quartz.events.NIP90ContentDiscoveryRequestEvent
 import com.vitorpamplona.quartz.events.OtsEvent
 import com.vitorpamplona.quartz.events.PeopleListEvent
 import com.vitorpamplona.quartz.events.PollNoteEvent
 import com.vitorpamplona.quartz.events.Price
 import com.vitorpamplona.quartz.events.PrivateDmEvent
+import com.vitorpamplona.quartz.events.PrivateOutboxRelayListEvent
 import com.vitorpamplona.quartz.events.ReactionEvent
 import com.vitorpamplona.quartz.events.RelayAuthEvent
 import com.vitorpamplona.quartz.events.ReportEvent
 import com.vitorpamplona.quartz.events.RepostEvent
 import com.vitorpamplona.quartz.events.Response
 import com.vitorpamplona.quartz.events.SealedGossipEvent
+import com.vitorpamplona.quartz.events.SearchRelayListEvent
 import com.vitorpamplona.quartz.events.StatusEvent
 import com.vitorpamplona.quartz.events.TextNoteEvent
 import com.vitorpamplona.quartz.events.TextNoteModificationEvent
@@ -115,10 +123,10 @@ import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.combineTransform
 import kotlinx.coroutines.flow.flatMapLatest
 import kotlinx.coroutines.flow.flattenMerge
-import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.mapLatest
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.flow.transformLatest
+import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.suspendCancellableCoroutine
 import kotlinx.coroutines.withContext
@@ -148,7 +156,7 @@ val DefaultReactions =
         "\uD83D\uDE31",
     )
 
-val DefaultZapAmounts = listOf(500L, 1000L, 5000L)
+val DefaultZapAmounts = listOf(100L, 500L, 1000L)
 
 fun getLanguagesSpokenByUser(): Set<String> {
     val languageList = ConfigurationCompat.getLocales(Resources.getSystem().getConfiguration())
@@ -171,6 +179,7 @@ class Account(
     val keyPair: KeyPair,
     val signer: NostrSigner = NostrSignerInternal(keyPair),
     var localRelays: Set<RelaySetupInfo> = Constants.defaultRelays.toSet(),
+    var localRelayServers: Set<String> = setOf(),
     var dontTranslateFrom: Set<String> = getLanguagesSpokenByUser(),
     var languagePreferences: Map<String, String> = mapOf(),
     var translateTo: String = Locale.getDefault().language,
@@ -185,7 +194,7 @@ class Account(
     var zapPaymentRequest: Nip47WalletConnect.Nip47URI? = null,
     var hideDeleteRequestDialog: Boolean = false,
     var hideBlockAlertDialog: Boolean = false,
-    var hideNIP24WarningDialog: Boolean = false,
+    var hideNIP17WarningDialog: Boolean = false,
     var backupContactList: ContactListEvent? = null,
     var proxy: Proxy? = null,
     var proxyPort: Int = 9050,
@@ -194,7 +203,7 @@ class Account(
     var filterSpamFromStrangers: Boolean = true,
     var lastReadPerRoute: Map<String, Long> = mapOf<String, Long>(),
     var hasDonatedInVersion: Set<String> = setOf<String>(),
-    var pendingAttestations: Map<HexKey, String> = mapOf<HexKey, String>(),
+    var pendingAttestations: MutableStateFlow<Map<HexKey, String>> = MutableStateFlow<Map<HexKey, String>>(mapOf()),
     val scope: CoroutineScope = Amethyst.instance.applicationIOScope,
 ) {
     var transientHiddenUsers: ImmutableSet<String> = persistentSetOf()
@@ -222,6 +231,131 @@ class Account(
 
     class ListNameNotePair(val listName: String, val event: GeneralListEvent?)
 
+    val connectToRelaysFlow =
+        combineTransform(
+            getNIP65RelayListFlow(),
+            getDMRelayListFlow(),
+            getSearchRelayListFlow(),
+            getPrivateOutboxRelayListFlow(),
+            userProfile().flow().relays.stateFlow,
+        ) { nip65RelayList, dmRelayList, searchRelayList, privateOutBox, userProfile ->
+            val baseRelaySet = activeRelays() ?: convertLocalRelays()
+            val newDMRelaySet = (dmRelayList.note.event as? ChatMessageRelayListEvent)?.relays()?.map { RelayUrlFormatter.normalize(it) }?.toSet() ?: emptySet()
+            val searchRelaySet = (searchRelayList.note.event as? SearchRelayListEvent)?.relays()?.map { RelayUrlFormatter.normalize(it) }?.toSet() ?: Constants.defaultSearchRelaySet
+            val nip65RelaySet =
+                (nip65RelayList.note.event as? AdvertisedRelayListEvent)?.relays()?.map {
+                    AdvertisedRelayListEvent.AdvertisedRelayInfo(
+                        RelayUrlFormatter.normalize(it.relayUrl),
+                        it.type,
+                    )
+                }
+            val privateOutboxRelaySet = (privateOutBox.note.event as? PrivateOutboxRelayListEvent)?.relays()?.map { RelayUrlFormatter.normalize(it) }?.toSet() ?: emptySet()
+
+            // ------
+            // DMs
+            // ------
+
+            var mappedRelaySet =
+                baseRelaySet.map {
+                    if (newDMRelaySet.contains(it.url)) {
+                        RelaySetupInfo(it.url, true, true, it.feedTypes + FeedType.PRIVATE_DMS)
+                    } else {
+                        it
+                    }
+                }
+
+            newDMRelaySet.forEach { newUrl ->
+                if (mappedRelaySet.none { it.url == newUrl }) {
+                    mappedRelaySet = mappedRelaySet + RelaySetupInfo(newUrl, true, true, setOf(FeedType.PRIVATE_DMS))
+                }
+            }
+
+            // ------
+            // SEARCH
+            // ------
+
+            mappedRelaySet =
+                mappedRelaySet.map {
+                    if (searchRelaySet.contains(it.url)) {
+                        RelaySetupInfo(it.url, true, it.write || false, it.feedTypes + FeedType.SEARCH)
+                    } else {
+                        it
+                    }
+                }
+
+            searchRelaySet.forEach { newUrl ->
+                if (mappedRelaySet.none { it.url == newUrl }) {
+                    mappedRelaySet = mappedRelaySet + RelaySetupInfo(newUrl, true, false, setOf(FeedType.SEARCH))
+                }
+            }
+
+            // --------------
+            // PRIVATE OUTBOX
+            // --------------
+
+            mappedRelaySet =
+                mappedRelaySet.map {
+                    if (privateOutboxRelaySet.contains(it.url)) {
+                        RelaySetupInfo(it.url, true, true, it.feedTypes + setOf(FeedType.FOLLOWS, FeedType.PUBLIC_CHATS, FeedType.GLOBAL, FeedType.PRIVATE_DMS))
+                    } else {
+                        it
+                    }
+                }
+
+            privateOutboxRelaySet.forEach { newUrl ->
+                if (mappedRelaySet.none { it.url == newUrl }) {
+                    mappedRelaySet = mappedRelaySet + RelaySetupInfo(newUrl, true, true, setOf(FeedType.FOLLOWS, FeedType.PUBLIC_CHATS, FeedType.GLOBAL, FeedType.PRIVATE_DMS))
+                }
+            }
+
+            // --------------
+            // PRIVATE OUTBOX
+            // --------------
+
+            mappedRelaySet =
+                mappedRelaySet.map {
+                    if (localRelayServers.contains(it.url)) {
+                        RelaySetupInfo(it.url, true, true, it.feedTypes + setOf(FeedType.FOLLOWS, FeedType.PUBLIC_CHATS, FeedType.GLOBAL, FeedType.PRIVATE_DMS))
+                    } else {
+                        it
+                    }
+                }
+
+            localRelayServers.forEach { newUrl ->
+                if (mappedRelaySet.none { it.url == newUrl }) {
+                    mappedRelaySet = mappedRelaySet + RelaySetupInfo(newUrl, true, true, setOf(FeedType.FOLLOWS, FeedType.PUBLIC_CHATS, FeedType.GLOBAL, FeedType.PRIVATE_DMS))
+                }
+            }
+
+            // --------------
+            // NIP-65 Public Inbox/Outbox
+            // --------------
+
+            mappedRelaySet =
+                mappedRelaySet.map { relay ->
+                    val nip65setup = nip65RelaySet?.firstOrNull { relay.url == it.relayUrl }
+                    if (nip65setup != null) {
+                        val write = nip65setup.type == AdvertisedRelayListEvent.AdvertisedRelayType.BOTH || nip65setup.type == AdvertisedRelayListEvent.AdvertisedRelayType.READ
+
+                        RelaySetupInfo(relay.url, true, relay.write || write, relay.feedTypes + setOf(FeedType.FOLLOWS, FeedType.GLOBAL, FeedType.PUBLIC_CHATS))
+                    } else {
+                        relay
+                    }
+                }
+
+            nip65RelaySet?.forEach { newNip65Setup ->
+                if (mappedRelaySet.none { it.url == newNip65Setup.relayUrl }) {
+                    val write = newNip65Setup.type == AdvertisedRelayListEvent.AdvertisedRelayType.BOTH || newNip65Setup.type == AdvertisedRelayListEvent.AdvertisedRelayType.READ
+
+                    mappedRelaySet = mappedRelaySet + RelaySetupInfo(newNip65Setup.relayUrl, true, write, setOf(FeedType.FOLLOWS, FeedType.PUBLIC_CHATS))
+                }
+            }
+
+            emit(mappedRelaySet.toTypedArray())
+        }
+
+    val connectToRelays = connectToRelaysFlow.stateIn(scope, SharingStarted.Eagerly, activeRelays() ?: convertLocalRelays())
+
     @OptIn(ExperimentalCoroutinesApi::class)
     val liveKind3FollowsFlow: Flow<LiveFollowLists> =
         userProfile().flow().follows.stateFlow.transformLatest {
@@ -484,7 +618,7 @@ class Account(
         return keyPair.privKey != null || signer is NostrSignerExternal
     }
 
-    fun sendNewRelayList(relays: Map<String, ContactListEvent.ReadWrite>) {
+    fun sendKind3RelayList(relays: Map<String, ContactListEvent.ReadWrite>) {
         if (!isWriteable()) return
 
         val contactList = userProfile().latestContactList
@@ -593,7 +727,7 @@ class Account(
                 val emojiUrl = EmojiUrl.decode(reaction)
                 if (emojiUrl != null) {
                     note.event?.let {
-                        NIP24Factory().createReactionWithinGroup(
+                        NIP17Factory().createReactionWithinGroup(
                             emojiUrl = emojiUrl,
                             originalNote = it,
                             to = users,
@@ -608,7 +742,7 @@ class Account(
             }
 
             note.event?.let {
-                NIP24Factory().createReactionWithinGroup(
+                NIP17Factory().createReactionWithinGroup(
                     content = reaction,
                     originalNote = it,
                     to = users,
@@ -655,8 +789,7 @@ class Account(
         note.event?.let { event ->
             LnZapRequestEvent.create(
                 event,
-                userProfile().latestContactList?.relays()?.keys?.ifEmpty { null }
-                    ?: localRelays.map { it.url }.toSet(),
+                relays = getReceivingRelays(),
                 signer,
                 pollOption,
                 message,
@@ -667,6 +800,12 @@ class Account(
         }
     }
 
+    fun getReceivingRelays(): Set<String> {
+        return getNIP65RelayList()?.readRelays()?.toSet()
+            ?: userProfile().latestContactList?.relays()?.filter { it.value.read }?.keys?.ifEmpty { null }
+            ?: localRelays.filter { it.read }.map { it.url }.toSet()
+    }
+
     fun hasWalletConnectSetup(): Boolean {
         return zapPaymentRequest != null
     }
@@ -709,6 +848,7 @@ class Account(
     fun sendZapPaymentRequestFor(
         bolt11: String,
         zappedNote: Note?,
+        onSent: () -> Unit,
         onResponse: (Response?) -> Unit,
     ) {
         if (!isWriteable()) return
@@ -730,6 +870,8 @@ class Account(
                 LocalCache.consume(event, zappedNote) { it.response(signer) { onResponse(it) } }
 
                 Client.send(event, nip47.relayUri, wcListener.feedTypes) { wcListener.destroy() }
+
+                onSent()
             }
         }
     }
@@ -850,7 +992,22 @@ class Account(
     fun broadcast(note: Note) {
         note.event?.let {
             if (it is WrappedEvent && it.host != null) {
-                it.host?.let { hostEvent -> Client.send(hostEvent) }
+                it.host?.let {
+                    Client.sendFilterAndStopOnFirstResponse(
+                        filters =
+                            listOf(
+                                TypedFilter(
+                                    setOf(FeedType.FOLLOWS, FeedType.PRIVATE_DMS, FeedType.GLOBAL),
+                                    JsonFilter(
+                                        ids = listOf(it.id),
+                                    ),
+                                ),
+                            ),
+                        onResponse = {
+                            Client.send(it)
+                        },
+                    )
+                }
             } else {
                 Client.send(it)
             }
@@ -858,9 +1015,9 @@ class Account(
     }
 
     suspend fun updateAttestations() {
-        Log.d("Pending Attestations", "Updating ${pendingAttestations.size} pending attestations")
+        Log.d("Pending Attestations", "Updating ${pendingAttestations.value.size} pending attestations")
 
-        pendingAttestations.toMap().forEach { pair ->
+        pendingAttestations.value.forEach { pair ->
             val newAttestation = OtsEvent.upgrade(pair.value, pair.key)
 
             if (pair.value != newAttestation) {
@@ -868,7 +1025,9 @@ class Account(
                     LocalCache.justConsume(it, null)
                     Client.send(it)
 
-                    pendingAttestations = pendingAttestations - pair.key
+                    pendingAttestations.update {
+                        it - pair.key
+                    }
                 }
             }
         }
@@ -876,7 +1035,7 @@ class Account(
 
     fun hasPendingAttestations(note: Note): Boolean {
         val id = note.event?.id() ?: note.idHex
-        return pendingAttestations.get(id) != null
+        return pendingAttestations.value[id] != null
     }
 
     fun timestamp(note: Note) {
@@ -885,7 +1044,9 @@ class Account(
 
         val id = note.event?.id() ?: note.idHex
 
-        pendingAttestations = pendingAttestations + Pair(id, OtsEvent.stamp(id))
+        pendingAttestations.update {
+            it + Pair(id, OtsEvent.stamp(id))
+        }
 
         saveable.invalidateData()
     }
@@ -1155,7 +1316,7 @@ class Account(
     fun consumeAndSendNip95(
         data: FileStorageEvent,
         signedEvent: FileStorageHeaderEvent,
-        relayList: List<Relay>? = null,
+        relayList: List<RelaySetupInfo>? = null,
     ): Note? {
         if (!isWriteable()) return null
 
@@ -1181,7 +1342,7 @@ class Account(
     fun sendNip95(
         data: FileStorageEvent,
         signedEvent: FileStorageHeaderEvent,
-        relayList: List<Relay>? = null,
+        relayList: List<RelaySetupInfo>? = null,
     ) {
         Client.send(data, relayList = relayList)
         Client.send(signedEvent, relayList = relayList)
@@ -1189,7 +1350,7 @@ class Account(
 
     fun sendHeader(
         signedEvent: FileHeaderEvent,
-        relayList: List<Relay>? = null,
+        relayList: List<RelaySetupInfo>? = null,
         onReady: (Note) -> Unit,
     ) {
         Client.send(signedEvent, relayList = relayList)
@@ -1233,7 +1394,7 @@ class Account(
         alt: String?,
         sensitiveContent: Boolean,
         originalHash: String? = null,
-        relayList: List<Relay>? = null,
+        relayList: List<RelaySetupInfo>? = null,
         onReady: (Note) -> Unit,
     ) {
         if (!isWriteable()) return
@@ -1268,7 +1429,7 @@ class Account(
         zapReceiver: List<ZapSplitSetup>? = null,
         wantsToMarkAsSensitive: Boolean,
         zapRaiserAmount: Long? = null,
-        relayList: List<Relay>? = null,
+        relayList: List<RelaySetupInfo>? = null,
         geohash: String? = null,
         nip94attachments: List<Event>? = null,
         draftTag: String?,
@@ -1306,7 +1467,12 @@ class Account(
                     deleteDraft(draftTag)
                 } else {
                     DraftEvent.create(draftTag, it, emptyList(), signer) { draftEvent ->
-                        Client.send(draftEvent, relayList = relayList)
+                        val newRelayList = getPrivateOutboxRelayList()?.relays()
+                        if (newRelayList != null) {
+                            Client.sendPrivately(draftEvent, newRelayList)
+                        } else {
+                            Client.send(draftEvent, relayList = relayList)
+                        }
                         LocalCache.justConsume(draftEvent, null)
                     }
                 }
@@ -1336,7 +1502,7 @@ class Account(
         root: String?,
         directMentions: Set<HexKey>,
         forkedFrom: Event?,
-        relayList: List<Relay>? = null,
+        relayList: List<RelaySetupInfo>? = null,
         geohash: String? = null,
         nip94attachments: List<FileHeaderEvent>? = null,
         draftTag: String?,
@@ -1370,7 +1536,12 @@ class Account(
                     deleteDraft(draftTag)
                 } else {
                     DraftEvent.create(draftTag, it, signer) { draftEvent ->
-                        Client.send(draftEvent, relayList = relayList)
+                        val newRelayList = getPrivateOutboxRelayList()?.relays()
+                        if (newRelayList != null) {
+                            Client.sendPrivately(draftEvent, newRelayList)
+                        } else {
+                            Client.send(draftEvent, relayList = relayList)
+                        }
                         LocalCache.justConsume(draftEvent, null)
                     }
                 }
@@ -1396,15 +1567,15 @@ class Account(
 
     fun deleteDraft(draftTag: String) {
         val key = DraftEvent.createAddressTag(userProfile().pubkeyHex, draftTag)
-        LocalCache.getAddressableNoteIfExists(key)?.let {
-            val noteEvent = it.event
+        LocalCache.getAddressableNoteIfExists(key)?.let { note ->
+            val noteEvent = note.event
             if (noteEvent is DraftEvent) {
                 noteEvent.createDeletedEvent(signer) {
-                    Client.send(it)
+                    Client.sendPrivately(it, relayList = note.relays.map { it.url })
                     LocalCache.justConsume(it, null)
                 }
             }
-            delete(it)
+            delete(note)
         }
     }
 
@@ -1420,7 +1591,7 @@ class Account(
         root: String?,
         directMentions: Set<HexKey>,
         forkedFrom: Event?,
-        relayList: List<Relay>? = null,
+        relayList: List<RelaySetupInfo>? = null,
         geohash: String? = null,
         nip94attachments: List<FileHeaderEvent>? = null,
         draftTag: String?,
@@ -1454,7 +1625,12 @@ class Account(
                     deleteDraft(draftTag)
                 } else {
                     DraftEvent.create(draftTag, it, signer) { draftEvent ->
-                        Client.send(draftEvent, relayList = relayList)
+                        val newRelayList = getPrivateOutboxRelayList()?.relays()
+                        if (newRelayList != null) {
+                            Client.sendPrivately(draftEvent, newRelayList)
+                        } else {
+                            Client.send(draftEvent, relayList = relayList)
+                        }
                         LocalCache.justConsume(draftEvent, null)
                     }
                 }
@@ -1483,7 +1659,7 @@ class Account(
         originalNote: Note,
         notify: HexKey?,
         summary: String? = null,
-        relayList: List<Relay>? = null,
+        relayList: List<RelaySetupInfo>? = null,
     ) {
         if (!isWriteable()) return
 
@@ -1513,7 +1689,7 @@ class Account(
         zapReceiver: List<ZapSplitSetup>? = null,
         wantsToMarkAsSensitive: Boolean,
         zapRaiserAmount: Long? = null,
-        relayList: List<Relay>? = null,
+        relayList: List<RelaySetupInfo>? = null,
         geohash: String? = null,
         nip94attachments: List<FileHeaderEvent>? = null,
         draftTag: String?,
@@ -1547,7 +1723,12 @@ class Account(
                     deleteDraft(draftTag)
                 } else {
                     DraftEvent.create(draftTag, it, signer) { draftEvent ->
-                        Client.send(draftEvent, relayList = relayList)
+                        val newRelayList = getPrivateOutboxRelayList()?.relays()
+                        if (newRelayList != null) {
+                            Client.sendPrivately(draftEvent, newRelayList)
+                        } else {
+                            Client.send(draftEvent, relayList = relayList)
+                        }
                         LocalCache.justConsume(draftEvent, null)
                     }
                 }
@@ -1601,7 +1782,12 @@ class Account(
                     deleteDraft(draftTag)
                 } else {
                     DraftEvent.create(draftTag, it, signer) { draftEvent ->
-                        Client.send(draftEvent)
+                        val newRelayList = getPrivateOutboxRelayList()?.relays()
+                        if (newRelayList != null) {
+                            Client.sendPrivately(draftEvent, newRelayList)
+                        } else {
+                            Client.send(draftEvent)
+                        }
                         LocalCache.justConsume(draftEvent, null)
                     }
                 }
@@ -1648,7 +1834,12 @@ class Account(
                     deleteDraft(draftTag)
                 } else {
                     DraftEvent.create(draftTag, it, signer) { draftEvent ->
-                        Client.send(draftEvent)
+                        val newRelayList = getPrivateOutboxRelayList()?.relays()
+                        if (newRelayList != null) {
+                            Client.sendPrivately(draftEvent, newRelayList)
+                        } else {
+                            Client.send(draftEvent)
+                        }
                         LocalCache.justConsume(draftEvent, null)
                     }
                 }
@@ -1722,7 +1913,12 @@ class Account(
                     deleteDraft(draftTag)
                 } else {
                     DraftEvent.create(draftTag, it, emptyList(), signer) { draftEvent ->
-                        Client.send(draftEvent)
+                        val newRelayList = getPrivateOutboxRelayList()?.relays()
+                        if (newRelayList != null) {
+                            Client.sendPrivately(draftEvent, newRelayList)
+                        } else {
+                            Client.send(draftEvent)
+                        }
                         LocalCache.justConsume(draftEvent, null)
                     }
                 }
@@ -1733,7 +1929,7 @@ class Account(
         }
     }
 
-    fun sendNIP24PrivateMessage(
+    fun sendNIP17PrivateMessage(
         message: String,
         toUsers: List<HexKey>,
         subject: String? = null,
@@ -1751,7 +1947,7 @@ class Account(
         val repliesToHex = listOfNotNull(replyingTo?.idHex).ifEmpty { null }
         val mentionsHex = mentions?.map { it.pubkeyHex }
 
-        NIP24Factory().createMsgNIP24(
+        NIP17Factory().createMsgNIP17(
             msg = message,
             to = toUsers,
             subject = subject,
@@ -1770,7 +1966,12 @@ class Account(
                     deleteDraft(draftTag)
                 } else {
                     DraftEvent.create(draftTag, it.msg, emptyList(), signer) { draftEvent ->
-                        Client.send(draftEvent)
+                        val newRelayList = getPrivateOutboxRelayList()?.relays()
+                        if (newRelayList != null) {
+                            Client.sendPrivately(draftEvent, newRelayList)
+                        } else {
+                            Client.send(draftEvent)
+                        }
                         LocalCache.justConsume(draftEvent, null)
                     }
                 }
@@ -1780,7 +1981,7 @@ class Account(
         }
     }
 
-    fun broadcastPrivately(signedEvents: NIP24Factory.Result) {
+    fun broadcastPrivately(signedEvents: NIP17Factory.Result) {
         val mine = signedEvents.wraps.filter { (it.recipientPubKey() == signer.pubKey) }
 
         mine.forEach { giftWrap ->
@@ -1798,13 +1999,28 @@ class Account(
         val id = mine.firstOrNull()?.id
         val mineNote = if (id == null) null else LocalCache.getNoteIfExists(id)
 
-        signedEvents.wraps.forEach {
+        signedEvents.wraps.forEach { wrap ->
             // Creates an alias
-            if (mineNote != null && it.recipientPubKey() != keyPair.pubKey.toHexKey()) {
-                LocalCache.getOrAddAliasNote(it.id, mineNote)
+            if (mineNote != null && wrap.recipientPubKey() != keyPair.pubKey.toHexKey()) {
+                LocalCache.getOrAddAliasNote(wrap.id, mineNote)
             }
 
-            Client.send(it)
+            val receiver = wrap.recipientPubKey()
+            if (receiver != null) {
+                val relayList =
+                    (
+                        LocalCache.getAddressableNoteIfExists(ChatMessageRelayListEvent.createAddressTag(receiver))
+                            ?.event as? ChatMessageRelayListEvent
+                    )?.relays()?.ifEmpty { null }
+
+                if (relayList != null) {
+                    Client.sendPrivately(signedEvent = wrap, relayList = relayList)
+                } else {
+                    Client.send(wrap)
+                }
+            } else {
+                Client.send(wrap)
+            }
         }
     }
 
@@ -2054,17 +2270,6 @@ class Account(
         return LocalCache.getOrCreateAddressableNote(aTag)
     }
 
-    fun getFileServersNote(): AddressableNote {
-        val aTag =
-            ATag(
-                FileServersEvent.KIND,
-                userProfile().pubkeyHex,
-                "",
-                null,
-            )
-        return LocalCache.getOrCreateAddressableNote(aTag)
-    }
-
     fun getBlockList(): PeopleListEvent? {
         return getBlockListNote().event as? PeopleListEvent
     }
@@ -2073,10 +2278,6 @@ class Account(
         return getMuteListNote().event as? MuteListEvent
     }
 
-    fun getFileServersList(): FileServersEvent? {
-        return getFileServersNote().event as? FileServersEvent
-    }
-
     fun hideWord(word: String) {
         val muteList = getMuteList()
 
@@ -2272,6 +2473,23 @@ class Account(
         }
     }
 
+    fun requestDVMContentDiscovery(
+        dvmPublicKey: String,
+        onReady: (event: NIP90ContentDiscoveryRequestEvent) -> Unit,
+    ) {
+        NIP90ContentDiscoveryRequestEvent.create(dvmPublicKey, signer.pubKey, getReceivingRelays(), signer) {
+            val relayList = (LocalCache.getAddressableNoteIfExists(AdvertisedRelayListEvent.createAddressTag(dvmPublicKey))?.event as? AdvertisedRelayListEvent)?.readRelays()
+
+            if (relayList != null) {
+                Client.sendPrivately(it, relayList)
+            } else {
+                Client.send(it)
+            }
+            LocalCache.justConsume(it, null)
+            onReady(it)
+        }
+    }
+
     fun unwrap(
         event: GiftWrapEvent,
         onReady: (Event) -> Unit,
@@ -2315,6 +2533,10 @@ class Account(
             event.plainContent(signer, onReady)
         } else if (event is LnZapRequestEvent) {
             decryptZapContentAuthor(note) { onReady(it.content) }
+        } else if (event is DraftEvent) {
+            event.cachedDraft(signer) {
+                onReady(it.content)
+            }
         } else {
             event?.content()?.let { onReady(it) }
         }
@@ -2336,6 +2558,12 @@ class Account(
         }
     }
 
+    fun updateLocalRelayServers(servers: Set<String>) {
+        localRelayServers = servers
+        liveLanguages.invalidateData()
+        saveable.invalidateData()
+    }
+
     fun addDontTranslateFrom(languageCode: String) {
         dontTranslateFrom = dontTranslateFrom.plus(languageCode)
         liveLanguages.invalidateData()
@@ -2377,55 +2605,38 @@ class Account(
     }
 
     // Takes a User's relay list and adds the types of feeds they are active for.
-    fun activeRelays(): Array<Relay>? {
-        var usersRelayList =
+    fun activeRelays(): Array<RelaySetupInfo>? {
+        val usersRelayList =
             userProfile().latestContactList?.relays()?.map {
+                val url = RelayUrlFormatter.normalize(it.key)
+
                 val localFeedTypes =
-                    localRelays.firstOrNull { localRelay -> localRelay.url == it.key }?.feedTypes
+                    localRelays.firstOrNull { localRelay -> RelayUrlFormatter.normalize(localRelay.url) == url }?.feedTypes
                         ?: Constants.defaultRelays
-                            .filter { defaultRelay -> defaultRelay.url == it.key }
+                            .filter { defaultRelay -> defaultRelay.url == url }
                             .firstOrNull()
                             ?.feedTypes
                         ?: FeedType.values().toSet()
 
-                Relay(it.key, it.value.read, it.value.write, localFeedTypes)
-            }
-                ?: return null
-
-        // Ugly, but forces nostr.band as the only search-supporting relay today.
-        // TODO: Remove when search becomes more available.
-        val searchRelays =
-            usersRelayList.filter { it.url.removeSuffix("/") in Constants.forcedRelaysForSearchSet }
-        val hasSearchRelay = usersRelayList.any { it.activeTypes.contains(FeedType.SEARCH) }
-        if (!hasSearchRelay && searchRelays.isEmpty()) {
-            usersRelayList =
-                usersRelayList +
-                Constants.forcedRelayForSearch.map {
-                    Relay(
-                        it.url,
-                        it.read,
-                        it.write,
-                        it.feedTypes,
-                    )
-                }
-        }
+                RelaySetupInfo(url, it.value.read, it.value.write, localFeedTypes)
+            } ?: return null
 
         return usersRelayList.toTypedArray()
     }
 
-    fun convertLocalRelays(): Array<Relay> {
-        return localRelays.map { Relay(it.url, it.read, it.write, it.feedTypes) }.toTypedArray()
+    fun convertLocalRelays(): Array<RelaySetupInfo> {
+        return localRelays.map { RelaySetupInfo(RelayUrlFormatter.normalize(it.url), it.read, it.write, it.feedTypes) }.toTypedArray()
     }
 
     fun activeGlobalRelays(): Array<String> {
-        return (activeRelays() ?: convertLocalRelays())
-            .filter { it.activeTypes.contains(FeedType.GLOBAL) }
+        return connectToRelays.value
+            .filter { it.feedTypes.contains(FeedType.GLOBAL) }
             .map { it.url }
             .toTypedArray()
     }
 
-    fun activeWriteRelays(): List<Relay> {
-        return (activeRelays() ?: convertLocalRelays()).filter { it.write }
+    fun activeWriteRelays(): List<RelaySetupInfo> {
+        return connectToRelays.value.filter { it.write }
     }
 
     fun isAllHidden(users: Set<HexKey>): Boolean {
@@ -2511,10 +2722,10 @@ class Account(
             .toSet()
     }
 
-    fun saveRelayList(value: List<RelaySetupInfo>) {
+    fun saveKind3RelayList(value: List<RelaySetupInfo>) {
         try {
             localRelays = value.toSet()
-            return sendNewRelayList(
+            return sendKind3RelayList(
                 value.associate { it.url to ContactListEvent.ReadWrite(it.read, it.write) },
             )
         } finally {
@@ -2522,13 +2733,205 @@ class Account(
         }
     }
 
+    fun getDMRelayListNote(): AddressableNote {
+        return LocalCache.getOrCreateAddressableNote(
+            ChatMessageRelayListEvent.createAddressATag(signer.pubKey),
+        )
+    }
+
+    fun getDMRelayListFlow(): StateFlow<NoteState> {
+        return getDMRelayListNote().flow().metadata.stateFlow
+    }
+
+    fun getDMRelayList(): ChatMessageRelayListEvent? {
+        return getDMRelayListNote().event as? ChatMessageRelayListEvent
+    }
+
+    fun saveDMRelayList(dmRelays: List<String>) {
+        if (!isWriteable()) return
+
+        val relayListForDMs = getDMRelayList()
+        if (relayListForDMs != null && relayListForDMs.tags.isNotEmpty()) {
+            ChatMessageRelayListEvent.updateRelayList(
+                earlierVersion = relayListForDMs,
+                relays = dmRelays,
+                signer = signer,
+            ) {
+                Client.send(it)
+                LocalCache.justConsume(it, null)
+            }
+        } else {
+            ChatMessageRelayListEvent.createFromScratch(
+                relays = dmRelays,
+                signer = signer,
+            ) {
+                Client.send(it)
+                LocalCache.justConsume(it, null)
+            }
+        }
+    }
+
+    fun getPrivateOutboxRelayListNote(): AddressableNote {
+        return LocalCache.getOrCreateAddressableNote(
+            PrivateOutboxRelayListEvent.createAddressATag(signer.pubKey),
+        )
+    }
+
+    fun getPrivateOutboxRelayListFlow(): StateFlow<NoteState> {
+        return getPrivateOutboxRelayListNote().flow().metadata.stateFlow
+    }
+
+    fun getPrivateOutboxRelayList(): PrivateOutboxRelayListEvent? {
+        return getPrivateOutboxRelayListNote().event as? PrivateOutboxRelayListEvent
+    }
+
+    fun savePrivateOutboxRelayList(relays: List<String>) {
+        if (!isWriteable()) return
+
+        val relayListForPrivateOutbox = getPrivateOutboxRelayList()
+
+        if (relayListForPrivateOutbox != null && !relayListForPrivateOutbox.cachedPrivateTags().isNullOrEmpty()) {
+            PrivateOutboxRelayListEvent.updateRelayList(
+                earlierVersion = relayListForPrivateOutbox,
+                relays = relays,
+                signer = signer,
+            ) {
+                Client.send(it)
+                LocalCache.justConsume(it, null)
+            }
+        } else {
+            PrivateOutboxRelayListEvent.createFromScratch(
+                relays = relays,
+                signer = signer,
+            ) {
+                Client.send(it)
+                LocalCache.justConsume(it, null)
+            }
+        }
+    }
+
+    fun getSearchRelayListNote(): AddressableNote {
+        return LocalCache.getOrCreateAddressableNote(
+            SearchRelayListEvent.createAddressATag(signer.pubKey),
+        )
+    }
+
+    fun getSearchRelayListFlow(): StateFlow<NoteState> {
+        return getSearchRelayListNote().flow().metadata.stateFlow
+    }
+
+    fun getSearchRelayList(): SearchRelayListEvent? {
+        return getSearchRelayListNote().event as? SearchRelayListEvent
+    }
+
+    fun saveSearchRelayList(searchRelays: List<String>) {
+        if (!isWriteable()) return
+
+        val relayListForSearch = getSearchRelayList()
+
+        if (relayListForSearch != null && relayListForSearch.tags.isNotEmpty()) {
+            SearchRelayListEvent.updateRelayList(
+                earlierVersion = relayListForSearch,
+                relays = searchRelays,
+                signer = signer,
+            ) {
+                Client.send(it)
+                LocalCache.justConsume(it, null)
+            }
+        } else {
+            SearchRelayListEvent.createFromScratch(
+                relays = searchRelays,
+                signer = signer,
+            ) {
+                Client.send(it)
+                LocalCache.justConsume(it, null)
+            }
+        }
+    }
+
+    fun getNIP65RelayListNote(): AddressableNote {
+        return LocalCache.getOrCreateAddressableNote(
+            AdvertisedRelayListEvent.createAddressATag(signer.pubKey),
+        )
+    }
+
+    fun getNIP65RelayListFlow(): StateFlow<NoteState> {
+        return getNIP65RelayListNote().flow().metadata.stateFlow
+    }
+
+    fun getNIP65RelayList(): AdvertisedRelayListEvent? {
+        return getNIP65RelayListNote().event as? AdvertisedRelayListEvent
+    }
+
+    fun sendNip65RelayList(relays: List<AdvertisedRelayListEvent.AdvertisedRelayInfo>) {
+        if (!isWriteable()) return
+
+        val nip65RelayList = getNIP65RelayList()
+
+        if (nip65RelayList != null) {
+            AdvertisedRelayListEvent.updateRelayList(
+                earlierVersion = nip65RelayList,
+                relays = relays,
+                signer = signer,
+            ) {
+                Client.send(it)
+                LocalCache.justConsume(it, null)
+            }
+        } else {
+            AdvertisedRelayListEvent.createFromScratch(
+                relays = relays,
+                signer = signer,
+            ) {
+                Client.send(it)
+                LocalCache.justConsume(it, null)
+            }
+        }
+    }
+
+    fun getFileServersList(): FileServersEvent? {
+        return getFileServersNote().event as? FileServersEvent
+    }
+
+    fun getFileServersListFlow(): StateFlow<NoteState> {
+        return getFileServersNote().flow().metadata.stateFlow
+    }
+
+    fun getFileServersNote(): AddressableNote {
+        return LocalCache.getOrCreateAddressableNote(FileServersEvent.createAddressATag(userProfile().pubkeyHex))
+    }
+
+    fun sendFileServersList(servers: List<String>) {
+        if (!isWriteable()) return
+
+        val serverList = getFileServersList()
+
+        if (serverList != null && serverList.tags.isNotEmpty()) {
+            FileServersEvent.updateRelayList(
+                earlierVersion = serverList,
+                relays = servers,
+                signer = signer,
+            ) {
+                Client.send(it)
+                LocalCache.justConsume(it, null)
+            }
+        } else {
+            FileServersEvent.createFromScratch(
+                relays = servers,
+                signer = signer,
+            ) {
+                Client.send(it)
+                LocalCache.justConsume(it, null)
+            }
+        }
+    }
+
     fun setHideDeleteRequestDialog() {
         hideDeleteRequestDialog = true
         saveable.invalidateData()
     }
 
-    fun setHideNIP24WarningDialog() {
-        hideNIP24WarningDialog = true
+    fun setHideNIP17WarningDialog() {
+        hideNIP17WarningDialog = true
         saveable.invalidateData()
     }
 

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

@@ -26,6 +26,7 @@ import androidx.compose.runtime.Stable
 import androidx.lifecycle.LiveData
 import com.vitorpamplona.amethyst.service.checkNotInMainThread
 import com.vitorpamplona.amethyst.service.relays.Relay
+import com.vitorpamplona.amethyst.service.relays.RelayStats
 import com.vitorpamplona.amethyst.ui.components.BundledUpdate
 import com.vitorpamplona.quartz.encoders.HexKey
 import com.vitorpamplona.quartz.encoders.Nip19Bech32
@@ -69,10 +70,6 @@ class AntiSpamFilter {
         if (
             (recentMessages[hash] != null && recentMessages[hash] != idHex) || spamMessages[hash] != null
         ) {
-            Log.w(
-                "Potential SPAM Message for sharing",
-                "${Nip19Bech32.createNEvent(event.id, event.pubKey, event.kind, null)}",
-            )
             Log.w(
                 "Potential SPAM Message",
                 "${event.id} ${recentMessages[hash]} ${spamMessages[hash] != null} ${relay?.url} ${event.content.replace("\n", " | ")}",
@@ -81,6 +78,10 @@ class AntiSpamFilter {
             // Log down offenders
             logOffender(hash, event)
 
+            if (relay != null) {
+                RelayStats.newSpam(relay.url, "https://njump.me/${Nip19Bech32.createNEvent(event.id, event.pubKey, event.kind, relay.url)}")
+            }
+
             liveSpam.invalidateData()
 
             return true
@@ -100,7 +101,7 @@ class AntiSpamFilter {
             spamMessages.put(hashCode, Spammer(event.pubKey, setOf(recentMessages[hashCode], event.id)))
         } else {
             val spammer = spamMessages.get(hashCode)
-            spammer.duplicatedMessages = spammer.duplicatedMessages + event.id
+            spammer.duplicatedMessages += event.id
         }
     }
 

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

@@ -26,6 +26,8 @@ import androidx.compose.runtime.Stable
 import com.vitorpamplona.amethyst.Amethyst
 import com.vitorpamplona.amethyst.commons.data.DeletionIndex
 import com.vitorpamplona.amethyst.commons.data.LargeCache
+import com.vitorpamplona.amethyst.model.observables.LatestByKindAndAuthor
+import com.vitorpamplona.amethyst.model.observables.LatestByKindWithETag
 import com.vitorpamplona.amethyst.service.checkNotInMainThread
 import com.vitorpamplona.amethyst.service.relays.Relay
 import com.vitorpamplona.amethyst.ui.components.BundledInsert
@@ -56,6 +58,7 @@ import com.vitorpamplona.quartz.events.ChannelMessageEvent
 import com.vitorpamplona.quartz.events.ChannelMetadataEvent
 import com.vitorpamplona.quartz.events.ChannelMuteUserEvent
 import com.vitorpamplona.quartz.events.ChatMessageEvent
+import com.vitorpamplona.quartz.events.ChatMessageRelayListEvent
 import com.vitorpamplona.quartz.events.ChatroomKey
 import com.vitorpamplona.quartz.events.ClassifiedsEvent
 import com.vitorpamplona.quartz.events.CommunityDefinitionEvent
@@ -88,18 +91,25 @@ import com.vitorpamplona.quartz.events.LnZapRequestEvent
 import com.vitorpamplona.quartz.events.LongTextNoteEvent
 import com.vitorpamplona.quartz.events.MetadataEvent
 import com.vitorpamplona.quartz.events.MuteListEvent
+import com.vitorpamplona.quartz.events.NIP90ContentDiscoveryRequestEvent
+import com.vitorpamplona.quartz.events.NIP90ContentDiscoveryResponseEvent
+import com.vitorpamplona.quartz.events.NIP90StatusEvent
+import com.vitorpamplona.quartz.events.NIP90UserDiscoveryRequestEvent
+import com.vitorpamplona.quartz.events.NIP90UserDiscoveryResponseEvent
 import com.vitorpamplona.quartz.events.NNSEvent
 import com.vitorpamplona.quartz.events.OtsEvent
 import com.vitorpamplona.quartz.events.PeopleListEvent
 import com.vitorpamplona.quartz.events.PinListEvent
 import com.vitorpamplona.quartz.events.PollNoteEvent
 import com.vitorpamplona.quartz.events.PrivateDmEvent
+import com.vitorpamplona.quartz.events.PrivateOutboxRelayListEvent
 import com.vitorpamplona.quartz.events.ReactionEvent
 import com.vitorpamplona.quartz.events.RecommendRelayEvent
 import com.vitorpamplona.quartz.events.RelaySetEvent
 import com.vitorpamplona.quartz.events.ReportEvent
 import com.vitorpamplona.quartz.events.RepostEvent
 import com.vitorpamplona.quartz.events.SealedGossipEvent
+import com.vitorpamplona.quartz.events.SearchRelayListEvent
 import com.vitorpamplona.quartz.events.StatusEvent
 import com.vitorpamplona.quartz.events.TextNoteEvent
 import com.vitorpamplona.quartz.events.TextNoteModificationEvent
@@ -113,10 +123,12 @@ import kotlinx.collections.immutable.persistentSetOf
 import kotlinx.collections.immutable.toImmutableList
 import kotlinx.collections.immutable.toImmutableSet
 import kotlinx.coroutines.CancellationException
+import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.channels.BufferOverflow
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.asSharedFlow
+import kotlinx.coroutines.launch
 import java.io.File
 import java.io.FileOutputStream
 import java.io.IOException
@@ -136,6 +148,76 @@ object LocalCache {
 
     val deletionIndex = DeletionIndex()
 
+    private val observablesByKindAndETag = ConcurrentHashMap<Int, ConcurrentHashMap<HexKey, LatestByKindWithETag<Event>>>(10)
+    private val observablesByKindAndAuthor = ConcurrentHashMap<Int, ConcurrentHashMap<HexKey, LatestByKindAndAuthor<Event>>>(10)
+
+    fun <T : Event> observeETag(
+        kind: Int,
+        eventId: HexKey,
+        scope: CoroutineScope,
+    ): LatestByKindWithETag<T> {
+        var eTagList = observablesByKindAndETag.get(kind)
+
+        if (eTagList == null) {
+            eTagList = ConcurrentHashMap<HexKey, LatestByKindWithETag<T>>(1) as ConcurrentHashMap<HexKey, LatestByKindWithETag<Event>>
+            observablesByKindAndETag.put(kind, eTagList)
+        }
+
+        val value = eTagList.get(eventId)
+
+        return if (value != null) {
+            value
+        } else {
+            val newObject = LatestByKindWithETag<T>(kind, eventId) as LatestByKindWithETag<Event>
+            val obj = eTagList.putIfAbsent(eventId, newObject) ?: newObject
+            if (obj == newObject) {
+                // initialize
+                scope.launch(Dispatchers.IO) {
+                    obj.init()
+                }
+            }
+            obj
+        } as LatestByKindWithETag<T>
+    }
+
+    fun <T : Event> observeAuthor(
+        kind: Int,
+        pubkey: HexKey,
+        scope: CoroutineScope,
+    ): LatestByKindAndAuthor<T> {
+        var authorObsList = observablesByKindAndAuthor.get(kind)
+
+        if (authorObsList == null) {
+            authorObsList = ConcurrentHashMap<HexKey, LatestByKindAndAuthor<T>>(1) as ConcurrentHashMap<HexKey, LatestByKindAndAuthor<Event>>
+            observablesByKindAndAuthor.put(kind, authorObsList)
+        }
+
+        val value = authorObsList.get(pubkey)
+
+        return if (value != null) {
+            value
+        } else {
+            val newObject = LatestByKindAndAuthor<T>(kind, pubkey) as LatestByKindAndAuthor<Event>
+            val obj = authorObsList.putIfAbsent(pubkey, newObject) ?: newObject
+            if (obj == newObject) {
+                // initialize
+                scope.launch(Dispatchers.IO) {
+                    obj.init()
+                }
+            }
+            obj
+        } as LatestByKindAndAuthor<T>
+    }
+
+    fun updateObservables(event: Event) {
+        val observablesOfKind = observablesByKindAndETag[event.kind()] ?: return
+        event.forEachTaggedEvent {
+            observablesOfKind[it]?.updateIfMatches(event)
+        }
+
+        observablesByKindAndAuthor[event.kind()]?.get(event.pubKey)?.updateIfMatches(event)
+    }
+
     fun checkGetOrCreateUser(key: String): User? {
         // checkNotInMainThread()
 
@@ -328,6 +410,8 @@ object LocalCache {
         if (event.createdAt > (user.latestContactList?.createdAt ?: 0) && !event.tags.isEmpty()) {
             user.updateContactList(event)
             // Log.d("CL", "Consumed contact list ${user.toNostrUri()} ${event.relays()?.size}")
+
+            updateObservables(event)
         }
     }
 
@@ -366,7 +450,6 @@ object LocalCache {
         if (note.event != null) return
 
         if (antiSpam.isSpam(event, relay)) {
-            relay?.let { it.spamCounter++ }
             return
         }
 
@@ -383,6 +466,148 @@ object LocalCache {
         refreshObservers(note)
     }
 
+    fun consume(
+        event: NIP90ContentDiscoveryResponseEvent,
+        relay: Relay? = null,
+    ) {
+        val note = getOrCreateNote(event.id)
+        val author = getOrCreateUser(event.pubKey)
+
+        // Log.d("TN", "New Response ${event.taggedEvents().joinToString(", ") { it }}}")
+
+        if (relay != null) {
+            author.addRelayBeingUsed(relay, event.createdAt)
+            note.addRelay(relay)
+        }
+
+        // Already processed this event.
+        if (note.event != null) return
+
+        val replyTo = computeReplyTo(event)
+
+        note.loadEvent(event, author, replyTo)
+
+        // Log.d("TN", "New Note (${notes.size},${users.size}) ${note.author?.toBestDisplayName()}
+        // ${note.event?.content()?.split("\n")?.take(100)} ${formattedDateTime(event.createdAt)}")
+
+        // Counts the replies
+        replyTo.forEach { it.addReply(note) }
+
+        refreshObservers(note)
+    }
+
+    fun consume(
+        event: NIP90ContentDiscoveryRequestEvent,
+        relay: Relay? = null,
+    ) {
+        val note = getOrCreateNote(event.id)
+        val author = getOrCreateUser(event.pubKey)
+
+        if (relay != null) {
+            author.addRelayBeingUsed(relay, event.createdAt)
+            note.addRelay(relay)
+        }
+
+        // Already processed this event.
+        if (note.event != null) return
+
+        val replyTo = computeReplyTo(event)
+
+        note.loadEvent(event, author, replyTo)
+
+        // Log.d("TN", "New Note (${notes.size},${users.size}) ${note.author?.toBestDisplayName()}
+        // ${note.event?.content()?.split("\n")?.take(100)} ${formattedDateTime(event.createdAt)}")
+
+        // Counts the replies
+        replyTo.forEach { it.addReply(note) }
+
+        refreshObservers(note)
+    }
+
+    fun consume(
+        event: NIP90StatusEvent,
+        relay: Relay? = null,
+    ) {
+        val note = getOrCreateNote(event.id)
+        val author = getOrCreateUser(event.pubKey)
+
+        if (relay != null) {
+            author.addRelayBeingUsed(relay, event.createdAt)
+            note.addRelay(relay)
+        }
+
+        // Already processed this event.
+        if (note.event != null) return
+
+        val replyTo = computeReplyTo(event)
+
+        note.loadEvent(event, author, replyTo)
+
+        // Log.d("TN", "New Note (${notes.size},${users.size}) ${note.author?.toBestDisplayName()}
+        // ${note.event?.content()?.split("\n")?.take(100)} ${formattedDateTime(event.createdAt)}")
+
+        // Counts the replies
+        replyTo.forEach { it.addReply(note) }
+
+        refreshObservers(note)
+    }
+
+    fun consume(
+        event: NIP90UserDiscoveryResponseEvent,
+        relay: Relay? = null,
+    ) {
+        val note = getOrCreateNote(event.id)
+        val author = getOrCreateUser(event.pubKey)
+
+        if (relay != null) {
+            author.addRelayBeingUsed(relay, event.createdAt)
+            note.addRelay(relay)
+        }
+
+        // Already processed this event.
+        if (note.event != null) return
+
+        val replyTo = computeReplyTo(event)
+
+        note.loadEvent(event, author, replyTo)
+
+        // Log.d("TN", "New Note (${notes.size},${users.size}) ${note.author?.toBestDisplayName()}
+        // ${note.event?.content()?.split("\n")?.take(100)} ${formattedDateTime(event.createdAt)}")
+
+        // Counts the replies
+        replyTo.forEach { it.addReply(note) }
+
+        refreshObservers(note)
+    }
+
+    fun consume(
+        event: NIP90UserDiscoveryRequestEvent,
+        relay: Relay? = null,
+    ) {
+        val note = getOrCreateNote(event.id)
+        val author = getOrCreateUser(event.pubKey)
+
+        if (relay != null) {
+            author.addRelayBeingUsed(relay, event.createdAt)
+            note.addRelay(relay)
+        }
+
+        // Already processed this event.
+        if (note.event != null) return
+
+        val replyTo = computeReplyTo(event)
+
+        note.loadEvent(event, author, replyTo)
+
+        // Log.d("TN", "New Note (${notes.size},${users.size}) ${note.author?.toBestDisplayName()}
+        // ${note.event?.content()?.split("\n")?.take(100)} ${formattedDateTime(event.createdAt)}")
+
+        // Counts the replies
+        replyTo.forEach { it.addReply(note) }
+
+        refreshObservers(note)
+    }
+
     fun consume(
         event: GitPatchEvent,
         relay: Relay? = null,
@@ -399,7 +624,6 @@ object LocalCache {
         if (note.event != null) return
 
         if (antiSpam.isSpam(event, relay)) {
-            relay?.let { it.spamCounter++ }
             return
         }
 
@@ -424,7 +648,6 @@ object LocalCache {
         if (note.event != null) return
 
         if (antiSpam.isSpam(event, relay)) {
-            relay?.let { it.spamCounter++ }
             return
         }
 
@@ -449,7 +672,6 @@ object LocalCache {
         if (note.event != null) return
 
         if (antiSpam.isSpam(event, relay)) {
-            relay?.let { it.spamCounter++ }
             return
         }
 
@@ -487,7 +709,6 @@ object LocalCache {
         if (note.event?.id() == event.id()) return
 
         if (antiSpam.isSpam(event, relay)) {
-            relay?.let { it.spamCounter++ }
             return
         }
 
@@ -522,7 +743,6 @@ object LocalCache {
         if (note.event?.id() == event.id()) return
 
         if (antiSpam.isSpam(event, relay)) {
-            relay?.let { it.spamCounter++ }
             return
         }
 
@@ -603,7 +823,6 @@ object LocalCache {
         if (note.event != null) return
 
         if (antiSpam.isSpam(event, relay)) {
-            relay?.let { it.spamCounter++ }
             return
         }
 
@@ -699,6 +918,27 @@ object LocalCache {
         consumeBaseReplaceable(event, relay)
     }
 
+    private fun consume(
+        event: ChatMessageRelayListEvent,
+        relay: Relay?,
+    ) {
+        consumeBaseReplaceable(event, relay)
+    }
+
+    private fun consume(
+        event: PrivateOutboxRelayListEvent,
+        relay: Relay?,
+    ) {
+        consumeBaseReplaceable(event, relay)
+    }
+
+    private fun consume(
+        event: SearchRelayListEvent,
+        relay: Relay?,
+    ) {
+        consumeBaseReplaceable(event, relay)
+    }
+
     private fun consume(
         event: CommunityDefinitionEvent,
         relay: Relay?,
@@ -1288,7 +1528,6 @@ object LocalCache {
         if (note.event != null) return
 
         if (antiSpam.isSpam(event, relay)) {
-            relay?.let { it.spamCounter++ }
             return
         }
 
@@ -1327,7 +1566,6 @@ object LocalCache {
         if (note.event != null) return
 
         if (antiSpam.isSpam(event, relay)) {
-            relay?.let { it.spamCounter++ }
             return
         }
 
@@ -1607,7 +1845,7 @@ object LocalCache {
         refreshObservers(note)
     }
 
-    private fun consume(
+    fun consume(
         event: SealedGossipEvent,
         relay: Relay?,
     ) {
@@ -1622,7 +1860,7 @@ object LocalCache {
         // Already processed this event.
         if (note.event != null) return
 
-        note.loadEvent(event, author, emptyList())
+        note.loadEvent(event.copyNoContent(), author, emptyList())
 
         refreshObservers(note)
     }
@@ -1642,7 +1880,7 @@ object LocalCache {
         // Already processed this event.
         if (note.event != null) return
 
-        note.loadEvent(event, author, emptyList())
+        note.loadEvent(event.copyNoContent(), author, emptyList())
 
         refreshObservers(note)
     }
@@ -1859,6 +2097,26 @@ object LocalCache {
         notes.forEach { _, it -> it.clearLive() }
         addressables.forEach { _, it -> it.clearLive() }
         users.forEach { _, it -> it.clearLive() }
+
+        notes.forEach { _, it -> it.clearFlow() }
+        addressables.forEach { _, it -> it.clearFlow() }
+        users.forEach { _, it -> it.clearFlow() }
+
+        observablesByKindAndETag.forEach { _, list ->
+            list.forEach { key, value ->
+                if (value.canDelete()) {
+                    list.remove(key)
+                }
+            }
+        }
+
+        observablesByKindAndAuthor.forEach { _, list ->
+            list.forEach { key, value ->
+                if (value.canDelete()) {
+                    list.remove(key)
+                }
+            }
+        }
     }
 
     fun pruneOldAndHiddenMessages(account: Account) {
@@ -2086,6 +2344,7 @@ object LocalCache {
     val live: LocalCacheLiveData = LocalCacheLiveData()
 
     private fun refreshObservers(newNote: Note) {
+        updateObservables(newNote.event as Event)
         live.invalidateData(newNote)
     }
 
@@ -2114,7 +2373,7 @@ object LocalCache {
         }
     }
 
-    private fun consume(
+    fun consume(
         event: DraftEvent,
         relay: Relay?,
     ) {
@@ -2256,6 +2515,7 @@ object LocalCache {
                 is ChannelMetadataEvent -> consume(event)
                 is ChannelMuteUserEvent -> consume(event)
                 is ChatMessageEvent -> consume(event, relay)
+                is ChatMessageRelayListEvent -> consume(event, relay)
                 is ClassifiedsEvent -> consume(event, relay)
                 is CommunityDefinitionEvent -> consume(event, relay)
                 is CommunityListEvent -> consume(event, relay)
@@ -2268,7 +2528,10 @@ object LocalCache {
                 is DraftEvent -> consume(event, relay)
                 is EmojiPackEvent -> consume(event, relay)
                 is EmojiPackSelectionEvent -> consume(event, relay)
-                is SealedGossipEvent -> consume(event, relay)
+                is GenericRepostEvent -> {
+                    event.containedPost()?.let { verifyAndConsume(it, relay) }
+                    consume(event)
+                }
                 is FhirResourceEvent -> consume(event, relay)
                 is FileHeaderEvent -> consume(event, relay)
                 is FileServersEvent -> consume(event, relay)
@@ -2290,6 +2553,11 @@ object LocalCache {
                     }
                 }
                 is LnZapRequestEvent -> consume(event)
+                is NIP90StatusEvent -> consume(event, relay)
+                is NIP90ContentDiscoveryResponseEvent -> consume(event, relay)
+                is NIP90ContentDiscoveryRequestEvent -> consume(event, relay)
+                is NIP90UserDiscoveryResponseEvent -> consume(event, relay)
+                is NIP90UserDiscoveryRequestEvent -> consume(event, relay)
                 is LnZapPaymentRequestEvent -> consume(event)
                 is LnZapPaymentResponseEvent -> consume(event)
                 is LongTextNoteEvent -> consume(event, relay)
@@ -2298,6 +2566,7 @@ object LocalCache {
                 is NNSEvent -> comsume(event, relay)
                 is OtsEvent -> consume(event, relay)
                 is PrivateDmEvent -> consume(event, relay)
+                is PrivateOutboxRelayListEvent -> consume(event, relay)
                 is PinListEvent -> consume(event, relay)
                 is PeopleListEvent -> consume(event, relay)
                 is PollNoteEvent -> consume(event, relay)
@@ -2309,10 +2578,8 @@ object LocalCache {
                     event.containedPost()?.let { verifyAndConsume(it, relay) }
                     consume(event)
                 }
-                is GenericRepostEvent -> {
-                    event.containedPost()?.let { verifyAndConsume(it, relay) }
-                    consume(event)
-                }
+                is SealedGossipEvent -> consume(event, relay)
+                is SearchRelayListEvent -> consume(event, relay)
                 is StatusEvent -> consume(event, relay)
                 is TextNoteEvent -> consume(event, relay)
                 is TextNoteModificationEvent -> consume(event, relay)

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

@@ -31,7 +31,7 @@ import com.vitorpamplona.amethyst.service.checkNotInMainThread
 import com.vitorpamplona.amethyst.service.firstFullCharOrEmoji
 import com.vitorpamplona.amethyst.service.relays.EOSETime
 import com.vitorpamplona.amethyst.service.relays.Relay
-import com.vitorpamplona.amethyst.ui.actions.updated
+import com.vitorpamplona.amethyst.ui.actions.relays.updated
 import com.vitorpamplona.amethyst.ui.components.BundledUpdate
 import com.vitorpamplona.amethyst.ui.note.combineWith
 import com.vitorpamplona.amethyst.ui.note.toShortenHex
@@ -40,6 +40,7 @@ import com.vitorpamplona.quartz.encoders.Hex
 import com.vitorpamplona.quartz.encoders.HexKey
 import com.vitorpamplona.quartz.encoders.LnInvoiceUtil
 import com.vitorpamplona.quartz.encoders.Nip19Bech32
+import com.vitorpamplona.quartz.encoders.RelayUrlFormatter
 import com.vitorpamplona.quartz.encoders.toNote
 import com.vitorpamplona.quartz.events.AddressableEvent
 import com.vitorpamplona.quartz.events.BaseTextNoteEvent
@@ -71,9 +72,6 @@ import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.suspendCancellableCoroutine
 import kotlinx.coroutines.withTimeoutOrNull
 import java.math.BigDecimal
-import java.time.Instant
-import java.time.ZoneId
-import java.time.format.DateTimeFormatter
 import kotlin.coroutines.resume
 
 @Stable
@@ -154,7 +152,7 @@ open class Note(val idHex: String) {
                 Nip19Bech32.createNEvent(
                     host.id,
                     host.pubKey,
-                    host.kind(),
+                    host.kind,
                     relays.firstOrNull()?.url,
                 )
             } else {
@@ -210,96 +208,6 @@ open class Note(val idHex: String) {
         }
     }
 
-    fun formattedDateTime(timestamp: Long): String {
-        return Instant.ofEpochSecond(timestamp)
-            .atZone(ZoneId.systemDefault())
-            .format(DateTimeFormatter.ofPattern("uuuu-MM-dd-HH:mm:ss"))
-    }
-
-    data class LevelSignature(val signature: String, val createdAt: Long?, val author: User?)
-
-    /**
-     * This method caches signatures during each execution to avoid recalculation in longer threads
-     */
-    fun replyLevelSignature(
-        eventsToConsider: Set<HexKey>,
-        cachedSignatures: MutableMap<Note, LevelSignature>,
-        account: User,
-        accountFollowingSet: Set<String>,
-        now: Long,
-    ): LevelSignature {
-        val replyTo = replyTo
-        if (
-            event is RepostEvent || event is GenericRepostEvent || replyTo == null || replyTo.isEmpty()
-        ) {
-            return LevelSignature(
-                signature = "/" + formattedDateTime(createdAt() ?: 0) + idHex.substring(0, 8) + ";",
-                createdAt = createdAt(),
-                author = author,
-            )
-        }
-
-        val parent =
-            (
-                replyTo
-                    .filter {
-                        it.idHex in eventsToConsider
-                    } // This forces the signature to be based on a branch, avoiding two roots
-                    .map {
-                        cachedSignatures[it]
-                            ?: it
-                                .replyLevelSignature(
-                                    eventsToConsider,
-                                    cachedSignatures,
-                                    account,
-                                    accountFollowingSet,
-                                    now,
-                                )
-                                .apply { cachedSignatures.put(it, this) }
-                    }
-                    .maxByOrNull { it.signature.length }
-            )
-
-        val parentSignature = parent?.signature?.removeSuffix(";") ?: ""
-
-        val threadOrder =
-            if (parent?.author == author && createdAt() != null) {
-                // author of the thread first, in **ascending** order
-                "9" +
-                    formattedDateTime((parent?.createdAt ?: 0) + (now - (createdAt() ?: 0))) +
-                    idHex.substring(0, 8)
-            } else if (author?.pubkeyHex == account.pubkeyHex) {
-                "8" + formattedDateTime(createdAt() ?: 0) + idHex.substring(0, 8) // my replies
-            } else if (author?.pubkeyHex in accountFollowingSet) {
-                "7" + formattedDateTime(createdAt() ?: 0) + idHex.substring(0, 8) // my follows replies.
-            } else {
-                "0" + formattedDateTime(createdAt() ?: 0) + idHex.substring(0, 8) // everyone else.
-            }
-
-        val mySignature =
-            LevelSignature(
-                signature = parentSignature + "/" + threadOrder + ";",
-                createdAt = createdAt(),
-                author = author,
-            )
-
-        cachedSignatures[this] = mySignature
-        return mySignature
-    }
-
-    fun replyLevel(cachedLevels: MutableMap<Note, Int> = mutableMapOf()): Int {
-        val replyTo = replyTo
-        if (
-            event is RepostEvent || event is GenericRepostEvent || replyTo == null || replyTo.isEmpty()
-        ) {
-            return 0
-        }
-
-        return replyTo.maxOf {
-            cachedLevels[it] ?: it.replyLevel(cachedLevels).apply { cachedLevels.put(it, this) }
-        } + 1
-    }
-
     fun addReply(note: Note) {
         if (note !in replies) {
             replies = replies + note
@@ -1120,8 +1028,7 @@ object RelayBriefInfoCache {
     @Immutable
     data class RelayBriefInfo(
         val url: String,
-        val displayUrl: String =
-            url.trim().removePrefix("wss://").removePrefix("ws://").removeSuffix("/").intern(),
+        val displayUrl: String = RelayUrlFormatter.displayUrl(url).intern(),
         val favIcon: String = "https://$displayUrl/favicon.ico".intern(),
     )
 

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

@@ -28,12 +28,5 @@ data class RelaySetupInfo(
     val url: String,
     val read: Boolean,
     val write: Boolean,
-    val errorCount: Int = 0,
-    val downloadCountInBytes: Int = 0,
-    val uploadCountInBytes: Int = 0,
-    val spamCount: Int = 0,
     val feedTypes: Set<FeedType>,
-    val paidRelay: Boolean = false,
-) {
-    val briefInfo: RelayBriefInfoCache.RelayBriefInfo = RelayBriefInfoCache.RelayBriefInfo(url)
-}
+)

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

@@ -0,0 +1,125 @@
+/**
+ * Copyright (c) 2024 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.encoders.HexKey
+import com.vitorpamplona.quartz.events.GenericRepostEvent
+import com.vitorpamplona.quartz.events.RepostEvent
+import java.time.Instant
+import java.time.ZoneId
+import java.time.format.DateTimeFormatter
+
+data class LevelSignature(val signature: String, val createdAt: Long?, val author: User?)
+
+object ThreadLevelCalculator {
+    val levelFormatter = DateTimeFormatter.ofPattern("uuuu-MM-dd-HH:mm:ss")
+
+    private fun formattedDateTime(timestamp: Long): String {
+        return Instant.ofEpochSecond(timestamp)
+            .atZone(ZoneId.systemDefault())
+            .format(levelFormatter)
+    }
+
+    /**
+     * This method caches signatures during each execution to avoid recalculation in longer threads
+     */
+    fun replyLevelSignature(
+        note: Note,
+        eventsToConsider: Set<HexKey>,
+        cachedSignatures: MutableMap<Note, LevelSignature>,
+        account: User,
+        accountFollowingSet: Set<String>,
+        now: Long,
+    ): LevelSignature {
+        val replyTo = note.replyTo
+        if (
+            note.event is RepostEvent || note.event is GenericRepostEvent || replyTo == null || replyTo.isEmpty()
+        ) {
+            return LevelSignature(
+                signature = "/" + formattedDateTime(note.createdAt() ?: 0) + note.idHex.substring(0, 8) + ";",
+                createdAt = note.createdAt(),
+                author = note.author,
+            )
+        }
+
+        val parent =
+            (
+                replyTo
+                    .filter {
+                        it.idHex in eventsToConsider
+                    } // This forces the signature to be based on a branch, avoiding two roots
+                    .map {
+                        cachedSignatures[it]
+                            ?: replyLevelSignature(
+                                it,
+                                eventsToConsider,
+                                cachedSignatures,
+                                account,
+                                accountFollowingSet,
+                                now,
+                            ).apply { cachedSignatures.put(it, this) }
+                    }
+                    .maxByOrNull { it.signature.length }
+            )
+
+        val parentSignature = parent?.signature?.removeSuffix(";") ?: ""
+
+        val threadOrder =
+            if (parent?.author == note.author && note.createdAt() != null) {
+                // author of the thread first, in **ascending** order
+                "9" +
+                    formattedDateTime((parent?.createdAt ?: 0) + (now - (note.createdAt() ?: 0))) +
+                    note.idHex.substring(0, 8)
+            } else if (note.author?.pubkeyHex == account.pubkeyHex) {
+                "8" + formattedDateTime(note.createdAt() ?: 0) + note.idHex.substring(0, 8) // my replies
+            } else if (note.author?.pubkeyHex in accountFollowingSet) {
+                "7" + formattedDateTime(note.createdAt() ?: 0) + note.idHex.substring(0, 8) // my follows replies.
+            } else {
+                "0" + formattedDateTime(note.createdAt() ?: 0) + note.idHex.substring(0, 8) // everyone else.
+            }
+
+        val mySignature =
+            LevelSignature(
+                signature = parentSignature + "/" + threadOrder + ";",
+                createdAt = note.createdAt(),
+                author = note.author,
+            )
+
+        cachedSignatures[note] = mySignature
+        return mySignature
+    }
+
+    fun replyLevel(
+        note: Note,
+        cachedLevels: MutableMap<Note, Int> = mutableMapOf(),
+    ): Int {
+        val replyTo = note.replyTo
+        if (
+            note.event is RepostEvent || note.event is GenericRepostEvent || replyTo == null || replyTo.isEmpty()
+        ) {
+            return 0
+        }
+
+        return replyTo.maxOf {
+            cachedLevels[it] ?: replyLevel(it, cachedLevels).apply { cachedLevels.put(it, this) }
+        } + 1
+    }
+}

app/src/main/java/com/vitorpamplona/amethyst/model/observables/CreatedAtComparator.kt

@@ -0,0 +1,64 @@
+/**
+ * Copyright (c) 2024 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.observables
+
+import com.vitorpamplona.amethyst.model.AddressableNote
+import com.vitorpamplona.amethyst.model.Note
+
+object CreatedAtComparator : Comparator<Note> {
+    override fun compare(
+        first: Note?,
+        second: Note?,
+    ): Int {
+        val firstEvent = first?.event
+        val secondEvent = second?.event
+
+        return if (firstEvent == null && secondEvent == null) {
+            0
+        } else if (firstEvent == null) {
+            1
+        } else if (secondEvent == null) {
+            -1
+        } else {
+            firstEvent.createdAt().compareTo(secondEvent.createdAt())
+        }
+    }
+}
+
+object CreatedAtComparatorAddresses : Comparator<AddressableNote> {
+    override fun compare(
+        first: AddressableNote?,
+        second: AddressableNote?,
+    ): Int {
+        val firstEvent = first?.event
+        val secondEvent = second?.event
+
+        return if (firstEvent == null && secondEvent == null) {
+            0
+        } else if (firstEvent == null) {
+            1
+        } else if (secondEvent == null) {
+            -1
+        } else {
+            firstEvent.createdAt().compareTo(secondEvent.createdAt())
+        }
+    }
+}

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

@@ -0,0 +1,72 @@
+/**
+ * Copyright (c) 2024 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.observables
+
+import com.vitorpamplona.amethyst.model.AddressableNote
+import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.quartz.events.Event
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asStateFlow
+
+class LatestByKindAndAuthor<T : Event>(private val kind: Int, private val pubkey: String) {
+    private val _latest = MutableStateFlow<T?>(null)
+    val latest = _latest.asStateFlow()
+
+    fun matches(event: T) = event.kind == kind && event.pubKey == pubkey
+
+    fun updateIfMatches(event: T) {
+        if (matches(event)) {
+            if (event.createdAt > (_latest.value?.createdAt ?: 0)) {
+                _latest.tryEmit(event)
+            }
+        }
+    }
+
+    fun canDelete(): Boolean {
+        return _latest.subscriptionCount.value == 0
+    }
+
+    suspend fun init() {
+        val latestNote =
+            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
+                    },
+                    comparator = CreatedAtComparatorAddresses,
+                )?.event as? T
+            } else {
+                LocalCache.notes.maxOrNullOf(
+                    filter = { idHex: String, note: Note ->
+                        note.event?.let {
+                            it.kind() == kind && it.pubKey() == pubkey
+                        } == true
+                    },
+                    comparator = CreatedAtComparator,
+                )?.event as? T
+            }
+
+        _latest.tryEmit(latestNote)
+    }
+}

app/src/main/java/com/vitorpamplona/amethyst/model/observables/LatestByKindWithETag.kt

@@ -0,0 +1,60 @@
+/**
+ * Copyright (c) 2024 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.observables
+
+import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.quartz.events.Event
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asStateFlow
+
+class LatestByKindWithETag<T : Event>(private val kind: Int, private val eTag: String) {
+    private val _latest = MutableStateFlow<T?>(null)
+    val latest = _latest.asStateFlow()
+
+    fun matches(event: T) = event.kind == kind && event.isTaggedEvent(eTag)
+
+    fun updateIfMatches(event: T) {
+        if (matches(event)) {
+            if (event.createdAt > (_latest.value?.createdAt ?: 0)) {
+                _latest.tryEmit(event)
+            }
+        }
+    }
+
+    fun canDelete(): Boolean {
+        return _latest.subscriptionCount.value == 0
+    }
+
+    suspend fun init() {
+        val latestNote =
+            LocalCache.notes.maxOrNullOf(
+                filter = { idHex: String, note: Note ->
+                    note.event?.let {
+                        it.kind() == kind && it.isTaggedEvent(eTag)
+                    } == true
+                },
+                comparator = CreatedAtComparator,
+            )?.event as? T
+
+        _latest.tryEmit(latestNote)
+    }
+}

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

@@ -31,9 +31,9 @@ import coil.fetch.FetchResult
 import coil.fetch.Fetcher
 import coil.request.ImageRequest
 import coil.request.Options
+import com.vitorpamplona.amethyst.commons.preview.BlurHashDecoder
 import java.net.URLDecoder
 import java.net.URLEncoder
-import kotlin.math.roundToInt
 
 @Stable
 class BlurHashFetcher(
@@ -43,23 +43,9 @@ class BlurHashFetcher(
     override suspend fun fetch(): FetchResult {
         checkNotInMainThread()
 
-        val encodedHash = data.toString().removePrefix("bluehash:")
-        val hash = URLDecoder.decode(encodedHash, "utf-8")
+        val hash = URLDecoder.decode(data.toString().removePrefix("bluehash:"), "utf-8")
 
-        val aspectRatio = BlurHashDecoder.aspectRatio(hash) ?: 1.0f
-
-        val preferredWidth = 100
-
-        val bitmap =
-            BlurHashDecoder.decode(
-                hash,
-                preferredWidth,
-                (preferredWidth * (1 / aspectRatio)).roundToInt(),
-            )
-
-        if (bitmap == null) {
-            throw Exception("Unable to convert Bluehash $hash")
-        }
+        val bitmap = BlurHashDecoder.decodeKeepAspectRatio(hash, 25) ?: throw Exception("Unable to convert Bluehash $data")
 
         return DrawableResult(
             drawable = bitmap.toDrawable(options.context.resources),

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

@@ -31,11 +31,12 @@ object CachedRichTextParser {
     fun parseText(
         content: String,
         tags: ImmutableListOfLists<String>,
+        callbackUri: String? = null,
     ): RichTextViewerState {
         return if (richTextCache[content] != null) {
             richTextCache[content]
         } else {
-            val newUrls = RichTextParser().parseText(content, tags)
+            val newUrls = RichTextParser().parseText(content, tags, callbackUri)
             richTextCache.put(content, newUrls)
             newUrls
         }

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

@@ -77,7 +77,7 @@ object HttpClientManager {
         proxy: Proxy?,
         timeout: Duration,
     ): OkHttpClient {
-        val seconds = if (proxy != null) timeout.seconds * 2 else timeout.seconds
+        val seconds = if (proxy != null) timeout.seconds * 3 else timeout.seconds
         val duration = Duration.ofSeconds(seconds)
         return OkHttpClient.Builder()
             .proxy(proxy)
@@ -103,6 +103,16 @@ object HttpClientManager {
         }
     }
 
+    fun getHttpClientForUrl(url: String): OkHttpClient {
+        // TODO: How to identify relays on the local network?
+        val isLocalHost = url.startsWith("ws://127.0.0.1") || url.startsWith("ws://localhost")
+        return if (isLocalHost) {
+            getHttpClient(false)
+        } else {
+            getHttpClient()
+        }
+    }
+
     fun getHttpClient(useProxy: Boolean = true): OkHttpClient {
         return if (useProxy) {
             if (this.defaultHttpClient == null) {

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

@@ -23,6 +23,7 @@ package com.vitorpamplona.amethyst.service
 import android.util.Log
 import android.util.LruCache
 import com.vitorpamplona.quartz.encoders.Nip11RelayInformation
+import com.vitorpamplona.quartz.encoders.RelayUrlFormatter
 import com.vitorpamplona.quartz.utils.TimeUtils
 import kotlinx.coroutines.CancellationException
 import okhttp3.Call
@@ -42,7 +43,7 @@ object Nip11CachedRetriever {
     val retriever = Nip11Retriever()
 
     fun getFromCache(dirtyUrl: String): Nip11RelayInformation? {
-        val result = relayInformationDocumentCache.get(retriever.cleanUrl(dirtyUrl)) ?: return null
+        val result = relayInformationDocumentCache.get(RelayUrlFormatter.getHttpsUrl(dirtyUrl)) ?: return null
         if (result is RetrieveResultSuccess) return result.data
         return null
     }
@@ -52,7 +53,7 @@ object Nip11CachedRetriever {
         onInfo: (Nip11RelayInformation) -> Unit,
         onError: (String, Nip11Retriever.ErrorCode, String?) -> Unit,
     ) {
-        val url = retriever.cleanUrl(dirtyUrl)
+        val url = RelayUrlFormatter.getHttpsUrl(dirtyUrl)
         val doc = relayInformationDocumentCache.get(url)
 
         if (doc != null) {
@@ -62,35 +63,33 @@ object Nip11CachedRetriever {
                 if (TimeUtils.now() - doc.time < TimeUtils.ONE_HOUR) {
                     onError(dirtyUrl, doc.error, null)
                 } else {
-                    Nip11Retriever()
-                        .loadRelayInfo(
-                            url = url,
-                            dirtyUrl = dirtyUrl,
-                            onInfo = {
-                                relayInformationDocumentCache.put(url, RetrieveResultSuccess(it))
-                                onInfo(it)
-                            },
-                            onError = { dirtyUrl, code, errorMsg ->
-                                relayInformationDocumentCache.put(url, RetrieveResultError(code, errorMsg))
-                                onError(url, code, errorMsg)
-                            },
-                        )
+                    retriever.loadRelayInfo(
+                        url = url,
+                        dirtyUrl = dirtyUrl,
+                        onInfo = {
+                            relayInformationDocumentCache.put(url, RetrieveResultSuccess(it))
+                            onInfo(it)
+                        },
+                        onError = { dirtyUrl, code, errorMsg ->
+                            relayInformationDocumentCache.put(url, RetrieveResultError(code, errorMsg))
+                            onError(url, code, errorMsg)
+                        },
+                    )
                 }
             }
         } else {
-            Nip11Retriever()
-                .loadRelayInfo(
-                    url = url,
-                    dirtyUrl = dirtyUrl,
-                    onInfo = {
-                        relayInformationDocumentCache.put(url, RetrieveResultSuccess(it))
-                        onInfo(it)
-                    },
-                    onError = { dirtyUrl, code, errorMsg ->
-                        relayInformationDocumentCache.put(url, RetrieveResultError(code, errorMsg))
-                        onError(url, code, errorMsg)
-                    },
-                )
+            retriever.loadRelayInfo(
+                url = url,
+                dirtyUrl = dirtyUrl,
+                onInfo = {
+                    relayInformationDocumentCache.put(url, RetrieveResultSuccess(it))
+                    onInfo(it)
+                },
+                onError = { dirtyUrl, code, errorMsg ->
+                    relayInformationDocumentCache.put(url, RetrieveResultError(code, errorMsg))
+                    onError(url, code, errorMsg)
+                },
+            )
         }
     }
 }
@@ -103,14 +102,6 @@ class Nip11Retriever {
         FAIL_WITH_HTTP_STATUS,
     }
 
-    fun cleanUrl(dirtyUrl: String): String {
-        return if (dirtyUrl.contains("://")) {
-            dirtyUrl.replace("wss://", "https://").replace("ws://", "http://")
-        } else {
-            "https://$dirtyUrl"
-        }
-    }
-
     suspend fun loadRelayInfo(
         url: String,
         dirtyUrl: String,
@@ -121,9 +112,8 @@ class Nip11Retriever {
         try {
             val request: Request =
                 Request.Builder().header("Accept", "application/nostr+json").url(url).build()
-            val isLocalHost = dirtyUrl.startsWith("ws://127.0.0.1") || dirtyUrl.startsWith("ws://localhost")
 
-            HttpClientManager.getHttpClient(useProxy = !isLocalHost)
+            HttpClientManager.getHttpClientForUrl(dirtyUrl)
                 .newCall(request)
                 .enqueue(
                     object : Callback {

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

@@ -39,11 +39,13 @@ import com.vitorpamplona.quartz.events.CalendarDateSlotEvent
 import com.vitorpamplona.quartz.events.CalendarRSVPEvent
 import com.vitorpamplona.quartz.events.CalendarTimeSlotEvent
 import com.vitorpamplona.quartz.events.ChannelMessageEvent
+import com.vitorpamplona.quartz.events.ChatMessageRelayListEvent
 import com.vitorpamplona.quartz.events.ContactListEvent
 import com.vitorpamplona.quartz.events.DraftEvent
 import com.vitorpamplona.quartz.events.EmojiPackSelectionEvent
 import com.vitorpamplona.quartz.events.Event
 import com.vitorpamplona.quartz.events.EventInterface
+import com.vitorpamplona.quartz.events.FileServersEvent
 import com.vitorpamplona.quartz.events.GenericRepostEvent
 import com.vitorpamplona.quartz.events.GiftWrapEvent
 import com.vitorpamplona.quartz.events.GitIssueEvent
@@ -56,10 +58,12 @@ import com.vitorpamplona.quartz.events.MetadataEvent
 import com.vitorpamplona.quartz.events.MuteListEvent
 import com.vitorpamplona.quartz.events.PeopleListEvent
 import com.vitorpamplona.quartz.events.PollNoteEvent
+import com.vitorpamplona.quartz.events.PrivateOutboxRelayListEvent
 import com.vitorpamplona.quartz.events.ReactionEvent
 import com.vitorpamplona.quartz.events.ReportEvent
 import com.vitorpamplona.quartz.events.RepostEvent
 import com.vitorpamplona.quartz.events.SealedGossipEvent
+import com.vitorpamplona.quartz.events.SearchRelayListEvent
 import com.vitorpamplona.quartz.events.StatusEvent
 import com.vitorpamplona.quartz.events.TextNoteEvent
 import com.vitorpamplona.quartz.utils.TimeUtils
@@ -101,9 +105,9 @@ object NostrAccountDataSource : NostrDataSource("AccountData") {
             types = COMMON_FEED_TYPES,
             filter =
                 JsonFilter(
-                    kinds = listOf(AdvertisedRelayListEvent.KIND, StatusEvent.KIND),
+                    kinds = listOf(StatusEvent.KIND, AdvertisedRelayListEvent.KIND, ChatMessageRelayListEvent.KIND, SearchRelayListEvent.KIND, PrivateOutboxRelayListEvent.KIND),
                     authors = listOf(account.userProfile().pubkeyHex),
-                    limit = 5,
+                    limit = 10,
                 ),
         )
     }
@@ -119,6 +123,10 @@ object NostrAccountDataSource : NostrDataSource("AccountData") {
                             MetadataEvent.KIND,
                             ContactListEvent.KIND,
                             AdvertisedRelayListEvent.KIND,
+                            ChatMessageRelayListEvent.KIND,
+                            PrivateOutboxRelayListEvent.KIND,
+                            SearchRelayListEvent.KIND,
+                            FileServersEvent.KIND,
                             MuteListEvent.KIND,
                             PeopleListEvent.KIND,
                         ),
@@ -173,8 +181,7 @@ object NostrAccountDataSource : NostrDataSource("AccountData") {
                 ?.followList
                 ?.get(account.defaultNotificationFollowList.value)
                 ?.relayList
-                ?: account.activeRelays()?.associate { it.url to EOSETime(TimeUtils.oneWeekAgo()) }
-                ?: account.convertLocalRelays().associate { it.url to EOSETime(TimeUtils.oneWeekAgo()) }
+                ?: account.connectToRelays.value.associate { it.url to EOSETime(TimeUtils.oneWeekAgo()) }
 
         return TypedFilter(
             types = COMMON_FEED_TYPES,
@@ -206,7 +213,7 @@ object NostrAccountDataSource : NostrDataSource("AccountData") {
                 ?.followList
                 ?.get(account.defaultNotificationFollowList.value)
                 ?.relayList
-                ?: account.activeRelays()?.associate { it.url to EOSETime(TimeUtils.oneWeekAgo()) }
+                ?: account.connectToRelays.value.associate { it.url to EOSETime(TimeUtils.oneWeekAgo()) }
                 ?: account.convertLocalRelays().associate { it.url to EOSETime(TimeUtils.oneWeekAgo()) }
 
         return TypedFilter(
@@ -237,6 +244,14 @@ object NostrAccountDataSource : NostrDataSource("AccountData") {
                 JsonFilter(
                     kinds = listOf(GiftWrapEvent.KIND),
                     tags = mapOf("p" to listOf(account.userProfile().pubkeyHex)),
+                    since =
+                        latestEOSEs.users[account.userProfile()]
+                            ?.followList
+                            ?.get("&&((GIFTWRAPS_EOSE))&&")
+                            ?.relayList
+                            ?.mapValues {
+                                EOSETime(it.value.time - TimeUtils.twoDays())
+                            },
                 ),
         )
 
@@ -249,6 +264,13 @@ object NostrAccountDataSource : NostrDataSource("AccountData") {
                     relayUrl,
                     time,
                 )
+
+                latestEOSEs.addOrUpdate(
+                    account.userProfile(),
+                    "&&((GIFTWRAPS_EOSE))&&",
+                    relayUrl,
+                    time,
+                )
             } else {
                 hasLoadedTheBasics[account.userProfile()] = true
 
@@ -264,53 +286,84 @@ object NostrAccountDataSource : NostrDataSource("AccountData") {
 
         if (LocalCache.justVerify(event)) {
             when (event) {
+                is PrivateOutboxRelayListEvent -> {
+                    val note = LocalCache.getAddressableNoteIfExists(event.addressTag())
+                    val noteEvent = note?.event
+                    if (noteEvent == null || event.createdAt > noteEvent.createdAt()) {
+                        event.privateTags(account.signer) {
+                            LocalCache.justConsume(event, relay)
+                        }
+                    }
+                }
+
                 is DraftEvent -> {
                     // Avoid decrypting over and over again if the event already exist.
 
                     if (!event.isDeleted()) {
-                        val note = LocalCache.getNoteIfExists(event.id)
-                        if (note?.event != null && relay.brief in note.relays) return
+                        val note = LocalCache.getAddressableNoteIfExists(event.addressTag())
+                        val noteEvent = note?.event
+                        if (noteEvent != null) {
+                            if (event.createdAt > noteEvent.createdAt() || relay.brief !in note.relays) {
+                                LocalCache.consume(event, relay)
+                            }
+                        } else {
+                            // decrypts
+                            event.cachedDraft(account.signer) {}
 
-                        // decrypts
-                        event.cachedDraft(account.signer) {}
-
-                        LocalCache.justConsume(event, relay)
+                            LocalCache.justConsume(event, relay)
+                        }
                     }
                 }
 
                 is GiftWrapEvent -> {
                     // Avoid decrypting over and over again if the event already exist.
                     val note = LocalCache.getNoteIfExists(event.id)
-                    if (note?.event != null && relay.brief in note.relays) return
-
-                    event.cachedGift(account.signer) { this.consume(it, relay) }
-
-                    LocalCache.justConsume(event, relay)
+                    val noteEvent = note?.event as? GiftWrapEvent
+                    if (noteEvent != null) {
+                        if (relay.brief !in note.relays) {
+                            LocalCache.justConsume(noteEvent, relay)
+                            noteEvent.cachedGift(account.signer) {
+                                this.consume(it, relay)
+                            }
+                        }
+                    } else {
+                        // new event
+                        event.cachedGift(account.signer) { this.consume(it, relay) }
+                        LocalCache.justConsume(event, relay)
+                    }
                 }
 
                 is SealedGossipEvent -> {
                     // Avoid decrypting over and over again if the event already exist.
                     val note = LocalCache.getNoteIfExists(event.id)
-                    if (note?.event != null && relay.brief in note.relays) return
-
-                    event.cachedGossip(account.signer) { LocalCache.justConsume(it, relay) }
-
-                    LocalCache.justConsume(event, relay)
+                    val noteEvent = note?.event as? SealedGossipEvent
+                    if (noteEvent != null) {
+                        if (relay.brief !in note.relays) {
+                            // adds the relay to seal and inner chat
+                            LocalCache.consume(noteEvent, relay)
+                            noteEvent.cachedGossip(account.signer) {
+                                LocalCache.justConsume(it, relay)
+                            }
+                        }
+                    } else {
+                        // new event
+                        event.cachedGossip(account.signer) { LocalCache.justConsume(it, relay) }
+                        LocalCache.justConsume(event, relay)
+                    }
                 }
 
                 is LnZapEvent -> {
                     // Avoid decrypting over and over again if the event already exist.
                     val note = LocalCache.getNoteIfExists(event.id)
-
-                    if (note?.event != null && relay.brief in note.relays) return
-
-                    event.zapRequest?.let {
-                        if (it.isPrivateZap()) {
-                            it.decryptPrivateZap(account.signer) {}
+                    if (note?.event == null) {
+                        event.zapRequest?.let {
+                            if (it.isPrivateZap()) {
+                                it.decryptPrivateZap(account.signer) {}
+                            }
                         }
-                    }
 
-                    LocalCache.justConsume(event, relay)
+                        LocalCache.justConsume(event, relay)
+                    }
                 }
 
                 else -> {

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

@@ -21,8 +21,8 @@
 package com.vitorpamplona.amethyst.service
 
 import com.vitorpamplona.amethyst.model.Account
-import com.vitorpamplona.amethyst.service.relays.COMMON_FEED_TYPES
 import com.vitorpamplona.amethyst.service.relays.EOSEAccount
+import com.vitorpamplona.amethyst.service.relays.EVENT_FINDER_TYPES
 import com.vitorpamplona.amethyst.service.relays.FeedType
 import com.vitorpamplona.amethyst.service.relays.JsonFilter
 import com.vitorpamplona.amethyst.service.relays.TypedFilter
@@ -80,7 +80,7 @@ object NostrChatroomListDataSource : NostrDataSource("MailBoxFeed") {
 
         return TypedFilter(
             // Metadata comes from any relay
-            types = COMMON_FEED_TYPES,
+            types = EVENT_FINDER_TYPES,
             filter =
                 JsonFilter(
                     kinds = listOf(ChannelCreateEvent.KIND),
@@ -99,7 +99,7 @@ object NostrChatroomListDataSource : NostrDataSource("MailBoxFeed") {
         return followingEvents.map {
             TypedFilter(
                 // Metadata comes from any relay
-                types = COMMON_FEED_TYPES,
+                types = EVENT_FINDER_TYPES,
                 filter =
                     JsonFilter(
                         kinds = listOf(ChannelMetadataEvent.KIND),

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

@@ -43,9 +43,9 @@ abstract class NostrDataSource(val debugName: String) {
 
     private var subscriptions = mapOf<String, Subscription>()
 
-    data class Counter(var counter: Int)
+    data class Counter(val subscriptionId: String, val eventKind: Int, var counter: Int)
 
-    private var eventCounter = mapOf<String, Counter>()
+    private var eventCounter = mapOf<Int, Counter>()
     var changingFilters = AtomicBoolean()
 
     private var active: Boolean = false
@@ -54,11 +54,18 @@ abstract class NostrDataSource(val debugName: String) {
         eventCounter.forEach {
             Log.d(
                 "STATE DUMP ${this.javaClass.simpleName}",
-                "Received Events ${it.key}: ${it.value.counter}",
+                "Received Events $debugName ${it.value.subscriptionId} ${it.value.eventKind}: ${it.value.counter}",
             )
         }
     }
 
+    fun hashCodeFields(
+        str1: String,
+        str2: Int,
+    ): Int {
+        return 31 * str1.hashCode() + str2.hashCode()
+    }
+
     private val clientListener =
         object : Client.Listener() {
             override fun onEvent(
@@ -68,12 +75,12 @@ abstract class NostrDataSource(val debugName: String) {
                 afterEOSE: Boolean,
             ) {
                 if (subscriptions.containsKey(subscriptionId)) {
-                    val key = "$debugName $subscriptionId ${event.kind}"
-                    val keyValue = eventCounter.get(key)
+                    val key = hashCodeFields(subscriptionId, event.kind)
+                    val keyValue = eventCounter[key]
                     if (keyValue != null) {
                         keyValue.counter++
                     } else {
-                        eventCounter = eventCounter + Pair(key, Counter(1))
+                        eventCounter = eventCounter + Pair(key, Counter(subscriptionId, event.kind, 1))
                     }
 
                     // Log.d(this@NostrDataSource.javaClass.simpleName, "Relay ${relay.url}: ${event.kind}")
@@ -85,19 +92,6 @@ abstract class NostrDataSource(val debugName: String) {
                 }
             }
 
-            override fun onError(
-                error: Error,
-                subscriptionId: String,
-                relay: Relay,
-            ) {
-                // if (subscriptions.containsKey(subscriptionId)) {
-                // Log.e(
-                //    this@NostrDataSource.javaClass.simpleName,
-                //    "Relay OnError ${relay.url}: ${error.message}"
-                // )
-                // }
-            }
-
             override fun onRelayStateChange(
                 type: Relay.StateType,
                 relay: Relay,

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

@@ -26,6 +26,7 @@ import com.vitorpamplona.amethyst.service.relays.EOSEAccount
 import com.vitorpamplona.amethyst.service.relays.FeedType
 import com.vitorpamplona.amethyst.service.relays.JsonFilter
 import com.vitorpamplona.amethyst.service.relays.TypedFilter
+import com.vitorpamplona.quartz.events.AppDefinitionEvent
 import com.vitorpamplona.quartz.events.ChannelCreateEvent
 import com.vitorpamplona.quartz.events.ChannelMessageEvent
 import com.vitorpamplona.quartz.events.ChannelMetadataEvent
@@ -131,6 +132,25 @@ object NostrDiscoveryDataSource : NostrDataSource("DiscoveryFeed") {
         )
     }
 
+    fun createNIP89Filter(kTags: List<String>): List<TypedFilter> {
+        return listOfNotNull(
+            TypedFilter(
+                types = setOf(FeedType.GLOBAL),
+                filter =
+                    JsonFilter(
+                        kinds = listOf(AppDefinitionEvent.KIND),
+                        limit = 300,
+                        tags = mapOf("k" to kTags),
+                        since =
+                            latestEOSEs.users[account.userProfile()]
+                                ?.followList
+                                ?.get(account.defaultDiscoveryFollowList.value)
+                                ?.relayList,
+                    ),
+            ),
+        )
+    }
+
     fun createLiveStreamFilter(): List<TypedFilter> {
         val follows = account.liveDiscoveryFollowLists.value?.users?.toList()
 
@@ -404,6 +424,7 @@ object NostrDiscoveryDataSource : NostrDataSource("DiscoveryFeed") {
     override fun updateChannelFilters() {
         discoveryFeedChannel.typedFilters =
             createLiveStreamFilter()
+                .plus(createNIP89Filter(listOf("5300")))
                 .plus(createPublicChatFilter())
                 .plus(createMarketplaceFilter())
                 .plus(
@@ -417,6 +438,7 @@ object NostrDiscoveryDataSource : NostrDataSource("DiscoveryFeed") {
                         createPublicChatsGeohashesFilter(),
                     ),
                 )
+                .toList()
                 .ifEmpty { null }
     }
 }

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

@@ -32,6 +32,7 @@ import com.vitorpamplona.quartz.events.LiveActivitiesChatMessageEvent
 import com.vitorpamplona.quartz.events.LongTextNoteEvent
 import com.vitorpamplona.quartz.events.PollNoteEvent
 import com.vitorpamplona.quartz.events.TextNoteEvent
+import com.vitorpamplona.quartz.events.WikiNoteEvent
 
 object NostrGeohashDataSource : NostrDataSource("SingleGeoHashFeed") {
     private var geohashToWatch: String? = null
@@ -61,6 +62,7 @@ object NostrGeohashDataSource : NostrDataSource("SingleGeoHashFeed") {
                             HighlightEvent.KIND,
                             AudioTrackEvent.KIND,
                             AudioHeaderEvent.KIND,
+                            WikiNoteEvent.KIND,
                         ),
                     limit = 200,
                 ),

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

@@ -32,6 +32,7 @@ import com.vitorpamplona.quartz.events.LiveActivitiesChatMessageEvent
 import com.vitorpamplona.quartz.events.LongTextNoteEvent
 import com.vitorpamplona.quartz.events.PollNoteEvent
 import com.vitorpamplona.quartz.events.TextNoteEvent
+import com.vitorpamplona.quartz.events.WikiNoteEvent
 
 object NostrHashtagDataSource : NostrDataSource("SingleHashtagFeed") {
     private var hashtagToWatch: String? = null
@@ -64,6 +65,7 @@ object NostrHashtagDataSource : NostrDataSource("SingleHashtagFeed") {
                             HighlightEvent.KIND,
                             AudioTrackEvent.KIND,
                             AudioHeaderEvent.KIND,
+                            WikiNoteEvent.KIND,
                         ),
                     limit = 200,
                 ),

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

@@ -39,6 +39,7 @@ import com.vitorpamplona.quartz.events.PinListEvent
 import com.vitorpamplona.quartz.events.PollNoteEvent
 import com.vitorpamplona.quartz.events.RepostEvent
 import com.vitorpamplona.quartz.events.TextNoteEvent
+import com.vitorpamplona.quartz.events.WikiNoteEvent
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
@@ -77,7 +78,7 @@ object NostrHomeDataSource : NostrDataSource("HomeFeed") {
         val followSet = follows?.plus(account.userProfile().pubkeyHex)?.toList()?.ifEmpty { null }
 
         return TypedFilter(
-            types = setOf(FeedType.FOLLOWS),
+            types = setOf(if (follows == null) FeedType.GLOBAL else FeedType.FOLLOWS),
             filter =
                 JsonFilter(
                     kinds =
@@ -94,6 +95,7 @@ object NostrHomeDataSource : NostrDataSource("HomeFeed") {
                             PinListEvent.KIND,
                             LiveActivitiesChatMessageEvent.KIND,
                             LiveActivitiesEvent.KIND,
+                            WikiNoteEvent.KIND,
                         ),
                     authors = followSet,
                     limit = 400,
@@ -118,12 +120,15 @@ object NostrHomeDataSource : NostrDataSource("HomeFeed") {
                     kinds =
                         listOf(
                             TextNoteEvent.KIND,
+                            RepostEvent.KIND,
+                            GenericRepostEvent.KIND,
                             LongTextNoteEvent.KIND,
                             ClassifiedsEvent.KIND,
                             HighlightEvent.KIND,
                             AudioHeaderEvent.KIND,
                             AudioTrackEvent.KIND,
                             PinListEvent.KIND,
+                            WikiNoteEvent.KIND,
                         ),
                     tags =
                         mapOf(
@@ -154,12 +159,15 @@ object NostrHomeDataSource : NostrDataSource("HomeFeed") {
                     kinds =
                         listOf(
                             TextNoteEvent.KIND,
+                            RepostEvent.KIND,
+                            GenericRepostEvent.KIND,
                             LongTextNoteEvent.KIND,
                             ClassifiedsEvent.KIND,
                             HighlightEvent.KIND,
                             AudioHeaderEvent.KIND,
                             AudioTrackEvent.KIND,
                             PinListEvent.KIND,
+                            WikiNoteEvent.KIND,
                         ),
                     tags =
                         mapOf(
@@ -196,6 +204,7 @@ object NostrHomeDataSource : NostrDataSource("HomeFeed") {
                             AudioHeaderEvent.KIND,
                             AudioTrackEvent.KIND,
                             PinListEvent.KIND,
+                            WikiNoteEvent.KIND,
                             CommunityPostApprovalEvent.KIND,
                         ),
                     tags =

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

@@ -49,6 +49,7 @@ import com.vitorpamplona.quartz.events.PeopleListEvent
 import com.vitorpamplona.quartz.events.PinListEvent
 import com.vitorpamplona.quartz.events.PollNoteEvent
 import com.vitorpamplona.quartz.events.TextNoteEvent
+import com.vitorpamplona.quartz.events.WikiNoteEvent
 import kotlin.coroutines.cancellation.CancellationException
 
 object NostrSearchEventOrUserDataSource : NostrDataSource("SearchEventFeed") {
@@ -137,7 +138,7 @@ object NostrSearchEventOrUserDataSource : NostrDataSource("SearchEventFeed") {
                         JsonFilter(
                             kinds = listOf(MetadataEvent.KIND),
                             search = mySearchString,
-                            limit = 100,
+                            limit = 1000,
                         ),
                 ),
                 TypedFilter(
@@ -175,6 +176,7 @@ object NostrSearchEventOrUserDataSource : NostrDataSource("SearchEventFeed") {
                                     LiveActivitiesEvent.KIND,
                                     PollNoteEvent.KIND,
                                     NNSEvent.KIND,
+                                    WikiNoteEvent.KIND,
                                 ),
                             search = mySearchString,
                             limit = 100,

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

@@ -23,7 +23,7 @@ package com.vitorpamplona.amethyst.service
 import com.vitorpamplona.amethyst.model.Channel
 import com.vitorpamplona.amethyst.model.LiveActivitiesChannel
 import com.vitorpamplona.amethyst.model.PublicChatChannel
-import com.vitorpamplona.amethyst.service.relays.COMMON_FEED_TYPES
+import com.vitorpamplona.amethyst.service.relays.EVENT_FINDER_TYPES
 import com.vitorpamplona.amethyst.service.relays.FeedType
 import com.vitorpamplona.amethyst.service.relays.JsonFilter
 import com.vitorpamplona.amethyst.service.relays.TypedFilter
@@ -63,7 +63,7 @@ object NostrSingleChannelDataSource : NostrDataSource("SingleChannelFeed") {
 
         // downloads linked events to this event.
         return TypedFilter(
-            types = COMMON_FEED_TYPES,
+            types = EVENT_FINDER_TYPES,
             filter =
                 JsonFilter(
                     kinds = listOf(ChannelCreateEvent.KIND),
@@ -86,7 +86,7 @@ object NostrSingleChannelDataSource : NostrDataSource("SingleChannelFeed") {
         return directEventsToLoad.map {
             it.address().let { aTag ->
                 TypedFilter(
-                    types = COMMON_FEED_TYPES,
+                    types = EVENT_FINDER_TYPES,
                     filter =
                         JsonFilter(
                             kinds = listOf(aTag.kind),

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

@@ -23,8 +23,8 @@ package com.vitorpamplona.amethyst.service
 import com.vitorpamplona.amethyst.model.AddressableNote
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.model.User
-import com.vitorpamplona.amethyst.service.relays.COMMON_FEED_TYPES
 import com.vitorpamplona.amethyst.service.relays.EOSETime
+import com.vitorpamplona.amethyst.service.relays.EVENT_FINDER_TYPES
 import com.vitorpamplona.amethyst.service.relays.JsonFilter
 import com.vitorpamplona.amethyst.service.relays.TypedFilter
 import com.vitorpamplona.quartz.events.CommunityPostApprovalEvent
@@ -33,6 +33,8 @@ import com.vitorpamplona.quartz.events.GenericRepostEvent
 import com.vitorpamplona.quartz.events.GitReplyEvent
 import com.vitorpamplona.quartz.events.LiveActivitiesChatMessageEvent
 import com.vitorpamplona.quartz.events.LnZapEvent
+import com.vitorpamplona.quartz.events.NIP90ContentDiscoveryResponseEvent
+import com.vitorpamplona.quartz.events.NIP90StatusEvent
 import com.vitorpamplona.quartz.events.OtsEvent
 import com.vitorpamplona.quartz.events.PollNoteEvent
 import com.vitorpamplona.quartz.events.ReactionEvent
@@ -60,7 +62,7 @@ object NostrSingleEventDataSource : NostrDataSource("SingleEventFeed") {
         return groupByEOSEPresence(addressesToWatch).map {
             listOf(
                 TypedFilter(
-                    types = COMMON_FEED_TYPES,
+                    types = EVENT_FINDER_TYPES,
                     filter =
                         JsonFilter(
                             kinds =
@@ -82,7 +84,7 @@ object NostrSingleEventDataSource : NostrDataSource("SingleEventFeed") {
                         ),
                 ),
                 TypedFilter(
-                    types = COMMON_FEED_TYPES,
+                    types = EVENT_FINDER_TYPES,
                     filter =
                         JsonFilter(
                             kinds =
@@ -110,7 +112,7 @@ object NostrSingleEventDataSource : NostrDataSource("SingleEventFeed") {
             it.address()?.let { aTag ->
                 if (aTag.kind < 25000 && aTag.dTag.isBlank()) {
                     TypedFilter(
-                        types = COMMON_FEED_TYPES,
+                        types = EVENT_FINDER_TYPES,
                         filter =
                             JsonFilter(
                                 kinds = listOf(aTag.kind),
@@ -120,7 +122,7 @@ object NostrSingleEventDataSource : NostrDataSource("SingleEventFeed") {
                     )
                 } else {
                     TypedFilter(
-                        types = COMMON_FEED_TYPES,
+                        types = EVENT_FINDER_TYPES,
                         filter =
                             JsonFilter(
                                 kinds = listOf(aTag.kind),
@@ -142,7 +144,7 @@ object NostrSingleEventDataSource : NostrDataSource("SingleEventFeed") {
         return groupByEOSEPresence(eventsToWatch).map {
             listOf(
                 TypedFilter(
-                    types = COMMON_FEED_TYPES,
+                    types = EVENT_FINDER_TYPES,
                     filter =
                         JsonFilter(
                             kinds =
@@ -165,17 +167,18 @@ object NostrSingleEventDataSource : NostrDataSource("SingleEventFeed") {
                         ),
                 ),
                 TypedFilter(
-                    types = COMMON_FEED_TYPES,
+                    types = EVENT_FINDER_TYPES,
                     filter =
                         JsonFilter(
                             kinds =
                                 listOf(
                                     DeletionEvent.KIND,
+                                    NIP90ContentDiscoveryResponseEvent.KIND,
+                                    NIP90StatusEvent.KIND,
                                 ),
                             tags = mapOf("e" to it.map { it.idHex }),
                             since = findMinimumEOSEs(it),
-                            // Max amount of "replies" to download on a specific event.
-                            limit = 10,
+                            limit = 100,
                         ),
                 ),
             )
@@ -190,9 +193,10 @@ object NostrSingleEventDataSource : NostrDataSource("SingleEventFeed") {
         return groupByEOSEPresence(eventsToWatch).map {
             listOf(
                 TypedFilter(
-                    types = COMMON_FEED_TYPES,
+                    types = EVENT_FINDER_TYPES,
                     filter =
                         JsonFilter(
+                            kinds = listOf(TextNoteEvent.KIND),
                             tags = mapOf("q" to it.map { it.idHex }),
                             since = findMinimumEOSEs(it),
                             // Max amount of "replies" to download on a specific event.
@@ -221,7 +225,7 @@ object NostrSingleEventDataSource : NostrDataSource("SingleEventFeed") {
         // downloads linked events to this event.
         return listOf(
             TypedFilter(
-                types = COMMON_FEED_TYPES,
+                types = EVENT_FINDER_TYPES,
                 filter =
                     JsonFilter(
                         ids = interestedEvents.toList(),
@@ -240,7 +244,7 @@ object NostrSingleEventDataSource : NostrDataSource("SingleEventFeed") {
             eventsToWatch.forEach {
                 val eose = it.lastReactionsDownloadTime[relayUrl]
                 if (eose == null) {
-                    it.lastReactionsDownloadTime = it.lastReactionsDownloadTime + Pair(relayUrl, EOSETime(time))
+                    it.lastReactionsDownloadTime += Pair(relayUrl, EOSETime(time))
                 } else {
                     eose.time = time
                 }
@@ -249,7 +253,7 @@ object NostrSingleEventDataSource : NostrDataSource("SingleEventFeed") {
             addressesToWatch.forEach {
                 val eose = it.lastReactionsDownloadTime[relayUrl]
                 if (eose == null) {
-                    it.lastReactionsDownloadTime = it.lastReactionsDownloadTime + Pair(relayUrl, EOSETime(time))
+                    it.lastReactionsDownloadTime += Pair(relayUrl, EOSETime(time))
                 } else {
                     eose.time = time
                 }

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

@@ -21,10 +21,11 @@
 package com.vitorpamplona.amethyst.service
 
 import com.vitorpamplona.amethyst.model.User
-import com.vitorpamplona.amethyst.service.relays.COMMON_FEED_TYPES
 import com.vitorpamplona.amethyst.service.relays.EOSETime
+import com.vitorpamplona.amethyst.service.relays.EVENT_FINDER_TYPES
 import com.vitorpamplona.amethyst.service.relays.JsonFilter
 import com.vitorpamplona.amethyst.service.relays.TypedFilter
+import com.vitorpamplona.quartz.events.AdvertisedRelayListEvent
 import com.vitorpamplona.quartz.events.MetadataEvent
 import com.vitorpamplona.quartz.events.ReportEvent
 import com.vitorpamplona.quartz.events.StatusEvent
@@ -41,10 +42,10 @@ object NostrSingleUserDataSource : NostrDataSource("SingleUserFeed") {
 
         return listOf(
             TypedFilter(
-                types = COMMON_FEED_TYPES,
+                types = EVENT_FINDER_TYPES,
                 filter =
                     JsonFilter(
-                        kinds = listOf(MetadataEvent.KIND),
+                        kinds = listOf(MetadataEvent.KIND, AdvertisedRelayListEvent.KIND),
                         authors = firstTimers,
                     ),
             ),
@@ -64,16 +65,16 @@ object NostrSingleUserDataSource : NostrDataSource("SingleUserFeed") {
                 val minEOSEs = findMinimumEOSEsForUsers(group)
                 listOf(
                     TypedFilter(
-                        types = COMMON_FEED_TYPES,
+                        types = EVENT_FINDER_TYPES,
                         filter =
                             JsonFilter(
-                                kinds = listOf(MetadataEvent.KIND, StatusEvent.KIND),
+                                kinds = listOf(MetadataEvent.KIND, StatusEvent.KIND, AdvertisedRelayListEvent.KIND),
                                 authors = groupIds,
                                 since = minEOSEs,
                             ),
                     ),
                     TypedFilter(
-                        types = COMMON_FEED_TYPES,
+                        types = EVENT_FINDER_TYPES,
                         filter =
                             JsonFilter(
                                 kinds = listOf(ReportEvent.KIND),

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

@@ -41,6 +41,7 @@ import com.vitorpamplona.quartz.events.PinListEvent
 import com.vitorpamplona.quartz.events.PollNoteEvent
 import com.vitorpamplona.quartz.events.RepostEvent
 import com.vitorpamplona.quartz.events.TextNoteEvent
+import com.vitorpamplona.quartz.events.WikiNoteEvent
 
 object NostrUserProfileDataSource : NostrDataSource("UserProfileFeed") {
     var user: User? = null
@@ -79,6 +80,7 @@ object NostrUserProfileDataSource : NostrDataSource("UserProfileFeed") {
                                 PinListEvent.KIND,
                                 PollNoteEvent.KIND,
                                 HighlightEvent.KIND,
+                                WikiNoteEvent.KIND,
                             ),
                         authors = listOf(it.pubkeyHex),
                         limit = 200,

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

@@ -28,10 +28,15 @@ import com.vitorpamplona.amethyst.service.relays.JsonFilter
 import com.vitorpamplona.amethyst.service.relays.TypedFilter
 import com.vitorpamplona.quartz.events.FileHeaderEvent
 import com.vitorpamplona.quartz.events.FileStorageHeaderEvent
+import com.vitorpamplona.quartz.events.VideoHorizontalEvent
+import com.vitorpamplona.quartz.events.VideoVerticalEvent
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
 
+val SUPPORTED_VIDEO_FEED_MIME_TYPES = listOf("image/jpeg", "image/gif", "image/png", "image/webp", "video/mp4", "video/mpeg", "video/webm", "audio/aac", "audio/mpeg", "audio/webm", "audio/wav")
+val SUPPORTED_VIDEO_FEED_MIME_TYPES_SET = SUPPORTED_VIDEO_FEED_MIME_TYPES.toSet()
+
 object NostrVideoDataSource : NostrDataSource("VideoFeed") {
     lateinit var account: Account
 
@@ -40,8 +45,6 @@ object NostrVideoDataSource : NostrDataSource("VideoFeed") {
 
     var job: Job? = null
 
-    val SUPPORTED_VIDEO_MIME_TYPES = listOf("image/jpeg", "image/gif", "image/png", "image/webp", "video/mp4", "video/mpeg", "video/webm", "audio/aac", "audio/mpeg", "audio/webm", "audio/wav")
-
     override fun start() {
         job?.cancel()
         job =
@@ -68,9 +71,9 @@ object NostrVideoDataSource : NostrDataSource("VideoFeed") {
             filter =
                 JsonFilter(
                     authors = follows,
-                    kinds = listOf(FileHeaderEvent.KIND, FileStorageHeaderEvent.KIND),
+                    kinds = listOf(FileHeaderEvent.KIND, FileStorageHeaderEvent.KIND, VideoHorizontalEvent.KIND, VideoVerticalEvent.KIND),
                     limit = 200,
-                    tags = mapOf("m" to SUPPORTED_VIDEO_MIME_TYPES),
+                    tags = mapOf("m" to SUPPORTED_VIDEO_FEED_MIME_TYPES),
                     since =
                         latestEOSEs.users[account.userProfile()]
                             ?.followList
@@ -89,14 +92,14 @@ object NostrVideoDataSource : NostrDataSource("VideoFeed") {
             types = setOf(FeedType.GLOBAL),
             filter =
                 JsonFilter(
-                    kinds = listOf(FileHeaderEvent.KIND, FileStorageHeaderEvent.KIND),
+                    kinds = listOf(FileHeaderEvent.KIND, FileStorageHeaderEvent.KIND, VideoHorizontalEvent.KIND, VideoVerticalEvent.KIND),
                     tags =
                         mapOf(
                             "t" to
                                 hashToLoad
                                     .map { listOf(it, it.lowercase(), it.uppercase(), it.capitalize()) }
                                     .flatten(),
-                            "m" to SUPPORTED_VIDEO_MIME_TYPES,
+                            "m" to SUPPORTED_VIDEO_FEED_MIME_TYPES,
                         ),
                     limit = 100,
                     since =
@@ -117,14 +120,14 @@ object NostrVideoDataSource : NostrDataSource("VideoFeed") {
             types = setOf(FeedType.GLOBAL),
             filter =
                 JsonFilter(
-                    kinds = listOf(FileHeaderEvent.KIND, FileStorageHeaderEvent.KIND),
+                    kinds = listOf(FileHeaderEvent.KIND, FileStorageHeaderEvent.KIND, VideoHorizontalEvent.KIND, VideoVerticalEvent.KIND),
                     tags =
                         mapOf(
                             "g" to
                                 hashToLoad
                                     .map { listOf(it, it.lowercase(), it.uppercase(), it.capitalize()) }
                                     .flatten(),
-                            "m" to SUPPORTED_VIDEO_MIME_TYPES,
+                            "m" to SUPPORTED_VIDEO_FEED_MIME_TYPES,
                         ),
                     limit = 100,
                     since =

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

@@ -28,6 +28,8 @@ import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.model.User
 import com.vitorpamplona.amethyst.service.lnurl.LightningAddressResolver
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.collectSuccessfulSigningOperations
+import com.vitorpamplona.quartz.events.AppDefinitionEvent
 import com.vitorpamplona.quartz.events.LiveActivitiesEvent
 import com.vitorpamplona.quartz.events.LnZapEvent
 import com.vitorpamplona.quartz.events.PayInvoiceErrorResponse
@@ -35,7 +37,6 @@ import com.vitorpamplona.quartz.events.ZapSplitSetup
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import kotlin.math.round
 
@@ -59,17 +60,35 @@ class ZapPaymentHandler(val account: Account) {
         onPayViaIntent: (ImmutableList<Payable>) -> Unit,
         zapType: LnZapEvent.ZapType,
     ) = withContext(Dispatchers.IO) {
-        val zapSplitSetup = note.event?.zapSplitSetup()
-
         val noteEvent = note.event
+        val zapSplitSetup = noteEvent?.zapSplitSetup()
 
         val zapsToSend =
             if (!zapSplitSetup.isNullOrEmpty()) {
                 zapSplitSetup
             } else if (noteEvent is LiveActivitiesEvent && noteEvent.hasHost()) {
                 noteEvent.hosts().map { ZapSplitSetup(it, null, weight = 1.0, false) }
+            } else if (noteEvent is AppDefinitionEvent) {
+                val appLud16 = noteEvent.appMetaData()?.lnAddress()
+                if (appLud16 != null) {
+                    listOf(ZapSplitSetup(appLud16, null, weight = 1.0, true))
+                } else {
+                    val lud16 = note.author?.info?.lnAddress()
+
+                    if (lud16.isNullOrBlank()) {
+                        onError(
+                            context.getString(R.string.missing_lud16),
+                            context.getString(
+                                R.string.user_does_not_have_a_lightning_address_setup_to_receive_sats,
+                            ),
+                        )
+                        return@withContext
+                    }
+
+                    listOf(ZapSplitSetup(lud16, null, weight = 1.0, true))
+                }
             } else {
-                val lud16 = note.author?.info?.lud16?.trim() ?: note.author?.info?.lud06?.trim()
+                val lud16 = note.author?.info?.lnAddress()
 
                 if (lud16.isNullOrBlank()) {
                     onError(
@@ -84,101 +103,226 @@ class ZapPaymentHandler(val account: Account) {
                 listOf(ZapSplitSetup(lud16, null, weight = 1.0, true))
             }
 
-        val totalWeight = zapsToSend.sumOf { it.weight }
-
-        val invoicesToPayOnIntent = mutableListOf<Payable>()
-
-        zapsToSend.forEachIndexed { index, value ->
-            val outerProgressMin = index / zapsToSend.size.toFloat()
-            val outerProgressMax = (index + 1) / zapsToSend.size.toFloat()
-
-            val zapValue = round((amountMilliSats * value.weight / totalWeight) / 1000f).toLong() * 1000
-
-            if (value.isLnAddress) {
-                innerZap(
-                    lud16 = value.lnAddressOrPubKeyHex,
-                    note = note,
-                    amount = zapValue,
-                    pollOption = pollOption,
-                    message = message,
-                    context = context,
-                    onError = onError,
-                    onProgress = {
-                        onProgress((it * (outerProgressMax - outerProgressMin)) + outerProgressMin)
-                    },
-                    zapType = zapType,
-                    onPayInvoiceThroughIntent = {
-                        invoicesToPayOnIntent.add(
-                            Payable(
-                                info = value,
-                                user = null,
-                                amountMilliSats = zapValue,
-                                invoice = it,
-                            ),
-                        )
-                    },
-                )
+        onProgress(0.02f)
+        signAllZapRequests(note, pollOption, message, zapType, zapsToSend) { splitZapRequestPairs ->
+            if (splitZapRequestPairs.isEmpty()) {
+                onProgress(0.00f)
+                return@signAllZapRequests
             } else {
-                val user = LocalCache.getUserIfExists(value.lnAddressOrPubKeyHex)
-                val lud16 = user?.info?.lnAddress()
+                onProgress(0.05f)
+            }
 
-                if (lud16 != null) {
-                    innerZap(
-                        lud16 = lud16,
-                        note = note,
-                        amount = zapValue,
-                        pollOption = pollOption,
-                        message = message,
-                        context = context,
-                        onError = onError,
-                        onProgress = {
-                            onProgress((it * (outerProgressMax - outerProgressMin)) + outerProgressMin)
-                        },
-                        zapType = zapType,
-                        overrideUser = user,
-                        onPayInvoiceThroughIntent = {
-                            invoicesToPayOnIntent.add(
-                                Payable(
-                                    info = value,
-                                    user = user,
-                                    amountMilliSats = zapValue,
-                                    invoice = it,
-                                ),
-                            )
-                        },
-                    )
+            assembleAllInvoices(splitZapRequestPairs.toList(), amountMilliSats, message, onError, onProgress = {
+                onProgress(it * 0.7f + 0.05f) // keeps within range.
+            }, context) {
+                if (it.isEmpty()) {
+                    onProgress(0.00f)
+                    return@assembleAllInvoices
                 } else {
-                    onError(
-                        context.getString(
-                            R.string.missing_lud16,
-                        ),
-                        context.getString(
-                            R.string.user_x_does_not_have_a_lightning_address_setup_to_receive_sats,
-                            user?.toBestDisplayName() ?: value.lnAddressOrPubKeyHex,
-                        ),
+                    onProgress(0.75f)
+                }
+
+                if (account.hasWalletConnectSetup()) {
+                    payViaNWC(it.values.map { it.invoice }, note, onError, onProgress = {
+                        onProgress(it * 0.25f + 0.75f) // keeps within range.
+                    }, context) {
+                        // onProgress(1f)
+                    }
+                } else {
+                    onPayViaIntent(
+                        it.map {
+                            Payable(
+                                info = it.key.first,
+                                user = it.key.second.user,
+                                amountMilliSats = it.value.zapValue,
+                                invoice = it.value.invoice,
+                            )
+                        }.toImmutableList(),
                     )
+
+                    onProgress(0f)
                 }
             }
         }
+    }
 
-        if (invoicesToPayOnIntent.isNotEmpty()) {
-            onPayViaIntent(invoicesToPayOnIntent.toImmutableList())
-            onProgress(1f)
-        } else {
-            launch(Dispatchers.IO) {
-                // Awaits for the event to come back to LocalCache.
-                var count = 0
-                while (invoicesToPayOnIntent.size < zapsToSend.size || count < 4) {
-                    count++
-                    Thread.sleep(5000)
-                }
-                if (invoicesToPayOnIntent.isNotEmpty()) {
-                    onPayViaIntent(invoicesToPayOnIntent.toImmutableList())
-                    onProgress(1f)
+    private fun calculateZapValue(
+        amountMilliSats: Long,
+        weight: Double,
+        totalWeight: Double,
+    ): Long {
+        val shareValue = amountMilliSats * (weight / totalWeight)
+        val roundedZapValue = round(shareValue / 1000f).toLong() * 1000
+        return roundedZapValue
+    }
+
+    class SignAllZapRequestsReturn(
+        val zapRequestJson: String,
+        val user: User? = null,
+    )
+
+    suspend fun signAllZapRequests(
+        note: Note,
+        pollOption: Int?,
+        message: String,
+        zapType: LnZapEvent.ZapType,
+        zapsToSend: List<ZapSplitSetup>,
+        onAllDone: suspend (MutableMap<ZapSplitSetup, SignAllZapRequestsReturn>) -> Unit,
+    ) {
+        collectSuccessfulSigningOperations<ZapSplitSetup, SignAllZapRequestsReturn>(
+            operationsInput = zapsToSend,
+            runRequestFor = { next: ZapSplitSetup, onReady ->
+                if (next.isLnAddress) {
+                    prepareZapRequestIfNeeded(note, pollOption, message, zapType) { zapRequestJson ->
+                        if (zapRequestJson != null) {
+                            onReady(SignAllZapRequestsReturn(zapRequestJson))
+                        }
+                    }
                 } else {
-                    onProgress(1f)
+                    val user = LocalCache.getUserIfExists(next.lnAddressOrPubKeyHex)
+                    prepareZapRequestIfNeeded(note, pollOption, message, zapType, user) { zapRequestJson ->
+                        if (zapRequestJson != null) {
+                            onReady(SignAllZapRequestsReturn(zapRequestJson, user))
+                        }
+                    }
                 }
+            },
+            onReady = onAllDone,
+        )
+    }
+
+    suspend fun assembleAllInvoices(
+        invoices: List<Pair<ZapSplitSetup, SignAllZapRequestsReturn>>,
+        totalAmountMilliSats: Long,
+        message: String,
+        onError: (String, String) -> Unit,
+        onProgress: (percent: Float) -> Unit,
+        context: Context,
+        onAllDone: suspend (MutableMap<Pair<ZapSplitSetup, SignAllZapRequestsReturn>, AssembleInvoiceReturn>) -> Unit,
+    ) {
+        var progressAllPayments = 0.00f
+        val totalWeight = invoices.sumOf { it.first.weight }
+
+        collectSuccessfulSigningOperations<Pair<ZapSplitSetup, SignAllZapRequestsReturn>, AssembleInvoiceReturn>(
+            operationsInput = invoices,
+            runRequestFor = { splitZapRequestPair: Pair<ZapSplitSetup, SignAllZapRequestsReturn>, onReady ->
+                assembleInvoice(
+                    splitSetup = splitZapRequestPair.first,
+                    nostrZapRequest = splitZapRequestPair.second.zapRequestJson,
+                    zapValue = calculateZapValue(totalAmountMilliSats, splitZapRequestPair.first.weight, totalWeight),
+                    message = message,
+                    onError = onError,
+                    onProgressStep = { percentStepForThisPayment ->
+                        progressAllPayments += percentStepForThisPayment / invoices.size
+                        onProgress(progressAllPayments)
+                    },
+                    context = context,
+                    onReady = onReady,
+                )
+            },
+            onReady = onAllDone,
+        )
+    }
+
+    suspend fun payViaNWC(
+        invoices: List<String>,
+        note: Note,
+        onError: (String, String) -> Unit,
+        onProgress: (percent: Float) -> Unit,
+        context: Context,
+        onAllDone: suspend (MutableMap<String, Boolean>) -> Unit,
+    ) {
+        var progressAllPayments = 0.00f
+
+        collectSuccessfulSigningOperations<String, Boolean>(
+            operationsInput = invoices,
+            runRequestFor = { invoice: String, onReady ->
+                account.sendZapPaymentRequestFor(
+                    bolt11 = invoice,
+                    zappedNote = note,
+                    onSent = {
+                        progressAllPayments += 0.5f / invoices.size
+                        onProgress(progressAllPayments)
+                        onReady(true)
+                    },
+                    onResponse = { response ->
+                        if (response is PayInvoiceErrorResponse) {
+                            progressAllPayments += 0.5f / invoices.size
+                            onProgress(progressAllPayments)
+                            onError(
+                                context.getString(R.string.error_dialog_pay_invoice_error),
+                                context.getString(
+                                    R.string.wallet_connect_pay_invoice_error_error,
+                                    response.error?.message
+                                        ?: response.error?.code?.toString() ?: "Error parsing error message",
+                                ),
+                            )
+                        } else {
+                            progressAllPayments += 0.5f / invoices.size
+                            onProgress(progressAllPayments)
+                        }
+                    },
+                )
+            },
+            onReady = onAllDone,
+        )
+    }
+
+    class AssembleInvoiceReturn(
+        val zapValue: Long,
+        val invoice: String,
+    )
+
+    private fun assembleInvoice(
+        splitSetup: ZapSplitSetup,
+        nostrZapRequest: String,
+        zapValue: Long,
+        message: String,
+        onError: (String, String) -> Unit,
+        onProgressStep: (percent: Float) -> Unit,
+        context: Context,
+        onReady: (AssembleInvoiceReturn) -> Unit,
+    ) {
+        var progressThisPayment = 0.00f
+
+        var user: User? = null
+        val lud16 =
+            if (splitSetup.isLnAddress) {
+                splitSetup.lnAddressOrPubKeyHex
+            } else {
+                user = LocalCache.getUserIfExists(splitSetup.lnAddressOrPubKeyHex)
+                user?.info?.lnAddress()
             }
+
+        if (lud16 != null) {
+            LightningAddressResolver()
+                .lnAddressInvoice(
+                    lnaddress = lud16,
+                    milliSats = zapValue,
+                    message = message,
+                    nostrRequest = nostrZapRequest,
+                    onError = onError,
+                    onProgress = {
+                        val step = it - progressThisPayment
+                        progressThisPayment = it
+                        onProgressStep(step)
+                    },
+                    context = context,
+                    onSuccess = {
+                        onProgressStep(1 - progressThisPayment)
+                        onReady(AssembleInvoiceReturn(zapValue, it))
+                    },
+                )
+        } else {
+            onError(
+                context.getString(
+                    R.string.missing_lud16,
+                ),
+                context.getString(
+                    R.string.user_x_does_not_have_a_lightning_address_setup_to_receive_sats,
+                    user?.toBestDisplayName() ?: splitSetup.lnAddressOrPubKeyHex,
+                ),
+            )
         }
     }
 
@@ -198,63 +342,4 @@ class ZapPaymentHandler(val account: Account) {
             onReady(null)
         }
     }
-
-    private suspend fun innerZap(
-        lud16: String,
-        note: Note,
-        amount: Long,
-        pollOption: Int?,
-        message: String,
-        context: Context,
-        onError: (String, String) -> Unit,
-        onProgress: (percent: Float) -> Unit,
-        onPayInvoiceThroughIntent: (String) -> Unit,
-        zapType: LnZapEvent.ZapType,
-        overrideUser: User? = null,
-    ) {
-        onProgress(0.05f)
-
-        prepareZapRequestIfNeeded(note, pollOption, message, zapType, overrideUser) { zapRequestJson ->
-            onProgress(0.10f)
-
-            LightningAddressResolver()
-                .lnAddressInvoice(
-                    lud16,
-                    amount,
-                    message,
-                    zapRequestJson,
-                    onSuccess = {
-                        onProgress(0.7f)
-                        if (account.hasWalletConnectSetup()) {
-                            account.sendZapPaymentRequestFor(
-                                bolt11 = it,
-                                note,
-                                onResponse = { response ->
-                                    if (response is PayInvoiceErrorResponse) {
-                                        onProgress(0.0f)
-                                        onError(
-                                            context.getString(R.string.error_dialog_pay_invoice_error),
-                                            context.getString(
-                                                R.string.wallet_connect_pay_invoice_error_error,
-                                                response.error?.message
-                                                    ?: response.error?.code?.toString() ?: "Error parsing error message",
-                                            ),
-                                        )
-                                    } else {
-                                        onProgress(1f)
-                                    }
-                                },
-                            )
-                            onProgress(0.8f)
-                        } else {
-                            onPayInvoiceThroughIntent(it)
-                            onProgress(0f)
-                        }
-                    },
-                    onError = onError,
-                    onProgress = onProgress,
-                    context = context,
-                )
-        }
-    }
 }

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

@@ -28,7 +28,6 @@ import com.vitorpamplona.amethyst.service.HttpClientManager
 import com.vitorpamplona.amethyst.service.checkNotInMainThread
 import com.vitorpamplona.quartz.encoders.LnInvoiceUtil
 import com.vitorpamplona.quartz.encoders.Lud06
-import com.vitorpamplona.quartz.encoders.toLnUrl
 import okhttp3.Request
 import java.math.BigDecimal
 import java.math.RoundingMode
@@ -151,20 +150,6 @@ class LightningAddressResolver() {
         }
     }
 
-    fun lnAddressToLnUrl(
-        lnaddress: String,
-        onSuccess: (String) -> Unit,
-        onError: (String, String) -> Unit,
-        context: Context,
-    ) {
-        fetchLightningAddressJson(
-            lnaddress,
-            onSuccess = { onSuccess(it.toByteArray().toLnUrl()) },
-            onError = onError,
-            context = context,
-        )
-    }
-
     fun lnAddressInvoice(
         lnaddress: String,
         milliSats: Long,
@@ -190,7 +175,8 @@ class LightningAddressResolver() {
                         onError(
                             context.getString(R.string.error_unable_to_fetch_invoice),
                             context.getString(
-                                R.string.error_parsing_json_from_lightning_address_check_the_user_s_lightning_setup,
+                                R.string.error_parsing_json_from_lightning_address_check_the_user_s_lightning_setup_with_user,
+                                lnaddress,
                             ),
                         )
                         null
@@ -202,7 +188,8 @@ class LightningAddressResolver() {
                     onError(
                         context.getString(R.string.error_unable_to_fetch_invoice),
                         context.getString(
-                            R.string.callback_url_not_found_in_the_user_s_lightning_address_server_configuration,
+                            R.string.callback_url_not_found_in_the_user_s_lightning_address_server_configuration_with_user,
+                            lnaddress,
                         ),
                     )
                 }
@@ -227,7 +214,8 @@ class LightningAddressResolver() {
                                         context.getString(R.string.error_unable_to_fetch_invoice),
                                         context.getString(
                                             R.string
-                                                .error_parsing_json_from_lightning_address_s_invoice_fetch_check_the_user_s_lightning_setup,
+                                                .error_parsing_json_from_lightning_address_s_invoice_fetch_check_the_user_s_lightning_setup_with_user,
+                                            lnaddress,
                                         ),
                                     )
                                     null
@@ -268,7 +256,8 @@ class LightningAddressResolver() {
                                             context.getString(R.string.error_unable_to_fetch_invoice),
                                             context.getString(
                                                 R.string
-                                                    .unable_to_create_a_lightning_invoice_before_sending_the_zap_the_receiver_s_lightning_wallet_sent_the_following_error,
+                                                    .unable_to_create_a_lightning_invoice_before_sending_the_zap_the_receiver_s_lightning_wallet_sent_the_following_error_with_user,
+                                                lnaddress,
                                                 reason,
                                             ),
                                         )
@@ -279,7 +268,8 @@ class LightningAddressResolver() {
                                         context.getString(R.string.error_unable_to_fetch_invoice),
                                         context.getString(
                                             R.string
-                                                .unable_to_create_a_lightning_invoice_before_sending_the_zap_element_pr_not_found_in_the_resulting_json,
+                                                .unable_to_create_a_lightning_invoice_before_sending_the_zap_element_pr_not_found_in_the_resulting_json_with_user,
+                                            lnaddress,
                                         ),
                                     )
                                 }

app/src/main/java/com/vitorpamplona/amethyst/service/playback/MultiPlayerPlaybackManager.kt

@@ -86,6 +86,8 @@ class MultiPlayerPlaybackManager(
         applicationContext: Context,
     ): MediaSession {
         val existingSession = playingMap.get(id) ?: cache.get(id)
+        // avoids saving positions for live streams otherwise caching goes crazy
+        val mustCachePositions = !uri.contains(".m3u8", true)
         if (existingSession != null) return existingSession
 
         val player =
@@ -115,7 +117,9 @@ class MultiPlayerPlaybackManager(
                         playingMap.put(id, mediaSession)
                     } else {
                         player.setWakeMode(C.WAKE_MODE_NONE)
-                        cachedPositions.add(uri, player.currentPosition)
+                        if (mustCachePositions) {
+                            cachedPositions.add(uri, player.currentPosition)
+                        }
                         cache.put(id, mediaSession)
                         playingMap.remove(id, mediaSession)
                     }
@@ -125,20 +129,22 @@ class MultiPlayerPlaybackManager(
                     when (playbackState) {
                         STATE_IDLE -> {
                             // only saves if it wqs playing
-                            if (abs(player.currentPosition) > 1) {
+                            if (mustCachePositions && abs(player.currentPosition) > 1) {
                                 cachedPositions.add(uri, player.currentPosition)
                             }
                         }
                         STATE_READY -> {
-                            cachedPositions.get(uri)?.let { lastPosition ->
-                                if (abs(player.currentPosition - lastPosition) > 5 * 60) {
-                                    player.seekTo(lastPosition)
+                            if (mustCachePositions) {
+                                cachedPositions.get(uri)?.let { lastPosition ->
+                                    if (abs(player.currentPosition - lastPosition) > 5 * 60) {
+                                        player.seekTo(lastPosition)
+                                    }
                                 }
                             }
                         }
                         else -> {
                             // only saves if it wqs playing
-                            if (abs(player.currentPosition) > 1) {
+                            if (mustCachePositions && abs(player.currentPosition) > 1) {
                                 cachedPositions.add(uri, player.currentPosition)
                             }
                         }
@@ -150,7 +156,9 @@ class MultiPlayerPlaybackManager(
                     newPosition: PositionInfo,
                     reason: Int,
                 ) {
-                    cachedPositions.add(uri, newPosition.positionMs)
+                    if (mustCachePositions && player.playbackState != STATE_IDLE) {
+                        cachedPositions.add(uri, newPosition.positionMs)
+                    }
                 }
             },
         )

app/src/main/java/com/vitorpamplona/amethyst/service/playback/PlaybackClientController.kt

@@ -27,13 +27,13 @@ import android.util.Log
 import android.util.LruCache
 import androidx.media3.session.MediaController
 import androidx.media3.session.SessionToken
-import com.google.common.util.concurrent.MoreExecutors
 import kotlinx.coroutines.CancellationException
+import java.util.concurrent.Executors
 
 object PlaybackClientController {
+    var executorService = Executors.newCachedThreadPool()
     val cache = LruCache<Int, SessionToken>(1)
 
-    @androidx.annotation.OptIn(androidx.media3.common.util.UnstableApi::class)
     fun prepareController(
         controllerID: String,
         videoUri: String,
@@ -67,7 +67,7 @@ object PlaybackClientController {
                         Log.e("Playback Client", "Failed to load Playback Client for $videoUri", e)
                     }
                 },
-                MoreExecutors.directExecutor(),
+                executorService,
             )
         } catch (e: Exception) {
             if (e is CancellationException) throw e

app/src/main/java/com/vitorpamplona/amethyst/service/playback/PlaybackService.kt

@@ -32,55 +32,53 @@ import androidx.media3.exoplayer.source.MediaSource
 import androidx.media3.exoplayer.upstream.LoadErrorHandlingPolicy
 import androidx.media3.session.MediaSession
 import androidx.media3.session.MediaSessionService
+import com.vitorpamplona.amethyst.Amethyst
 import com.vitorpamplona.amethyst.service.HttpClientManager
-import okhttp3.OkHttpClient
 
-class WssOrHttpFactory(httpClient: OkHttpClient) : MediaSource.Factory {
-    @UnstableApi
-    val http = DefaultMediaSourceFactory(OkHttpDataSource.Factory(httpClient))
+/**
+ * HLS LiveStreams cannot use cache.
+ */
+@UnstableApi
+class CustomMediaSourceFactory() : MediaSource.Factory {
+    private var cachingFactory: MediaSource.Factory =
+        DefaultMediaSourceFactory(Amethyst.instance.videoCache.get(HttpClientManager.getHttpClient()))
+    private var nonCachingFactory: MediaSource.Factory =
+        DefaultMediaSourceFactory(OkHttpDataSource.Factory(HttpClientManager.getHttpClient()))
 
-    @UnstableApi
-    val wss = DefaultMediaSourceFactory(WssStreamDataSource.Factory(httpClient))
-
-    @OptIn(UnstableApi::class)
     override fun setDrmSessionManagerProvider(drmSessionManagerProvider: DrmSessionManagerProvider): MediaSource.Factory {
-        http.setDrmSessionManagerProvider(drmSessionManagerProvider)
-        wss.setDrmSessionManagerProvider(drmSessionManagerProvider)
+        cachingFactory.setDrmSessionManagerProvider(drmSessionManagerProvider)
+        nonCachingFactory.setDrmSessionManagerProvider(drmSessionManagerProvider)
         return this
     }
 
-    @OptIn(UnstableApi::class)
     override fun setLoadErrorHandlingPolicy(loadErrorHandlingPolicy: LoadErrorHandlingPolicy): MediaSource.Factory {
-        http.setLoadErrorHandlingPolicy(loadErrorHandlingPolicy)
-        wss.setLoadErrorHandlingPolicy(loadErrorHandlingPolicy)
+        cachingFactory.setLoadErrorHandlingPolicy(loadErrorHandlingPolicy)
+        nonCachingFactory.setLoadErrorHandlingPolicy(loadErrorHandlingPolicy)
         return this
     }
 
-    @OptIn(UnstableApi::class)
     override fun getSupportedTypes(): IntArray {
-        return http.supportedTypes
+        return nonCachingFactory.supportedTypes
     }
 
-    @OptIn(UnstableApi::class)
     override fun createMediaSource(mediaItem: MediaItem): MediaSource {
-        return if (mediaItem.mediaId.startsWith("wss")) {
-            wss.createMediaSource(mediaItem)
-        } else {
-            http.createMediaSource(mediaItem)
+        if (mediaItem.mediaId.contains(".m3u8", true)) {
+            return nonCachingFactory.createMediaSource(mediaItem)
         }
+        return cachingFactory.createMediaSource(mediaItem)
     }
 }
 
-@UnstableApi // Extend MediaSessionService
 class PlaybackService : MediaSessionService() {
     private var videoViewedPositionCache = VideoViewedPositionCache()
 
     private var managerAllInOne: MultiPlayerPlaybackManager? = null
 
+    @OptIn(UnstableApi::class)
     fun newAllInOneDataSource(): MediaSource.Factory {
         // This might be needed for live kit.
         // return WssOrHttpFactory(HttpClientManager.getHttpClient())
-        return DefaultMediaSourceFactory(OkHttpDataSource.Factory(HttpClientManager.getHttpClient()))
+        return CustomMediaSourceFactory()
     }
 
     fun lazyDS(): MultiPlayerPlaybackManager {

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

@@ -27,6 +27,8 @@ import androidx.media3.datasource.cache.CacheDataSource
 import androidx.media3.datasource.cache.LeastRecentlyUsedCacheEvictor
 import androidx.media3.datasource.cache.SimpleCache
 import androidx.media3.datasource.okhttp.OkHttpDataSource
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
 import okhttp3.OkHttpClient
 import java.io.File
 
@@ -41,16 +43,17 @@ class VideoCache {
 
     lateinit var cacheDataSourceFactory: CacheDataSource.Factory
 
-    @Synchronized
-    fun initFileCache(context: Context) {
+    suspend fun initFileCache(context: Context) {
         exoDatabaseProvider = StandaloneDatabaseProvider(context)
 
-        simpleCache =
-            SimpleCache(
-                File(context.cacheDir, "exoplayer"),
-                leastRecentlyUsedCacheEvictor,
-                exoDatabaseProvider,
-            )
+        withContext(Dispatchers.IO) {
+            simpleCache =
+                SimpleCache(
+                    File(context.cacheDir, "exoplayer"),
+                    leastRecentlyUsedCacheEvictor,
+                    exoDatabaseProvider,
+                )
+        }
     }
 
     // This method should be called when proxy setting changes.

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

@@ -21,13 +21,13 @@
 package com.vitorpamplona.amethyst.service.relays
 
 import android.util.Log
+import com.vitorpamplona.amethyst.model.RelaySetupInfo
 import com.vitorpamplona.amethyst.service.checkNotInMainThread
 import com.vitorpamplona.quartz.events.Event
 import com.vitorpamplona.quartz.events.EventInterface
 import kotlinx.coroutines.DelicateCoroutinesApi
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import java.util.UUID
 
@@ -42,10 +42,10 @@ object Client : RelayPool.Listener {
 
     @Synchronized
     fun reconnect(
-        relays: Array<Relay>?,
+        relays: Array<RelaySetupInfo>?,
         onlyIfChanged: Boolean = false,
     ) {
-        Log.d("Relay", "Relay Pool Reconnecting to ${relays?.size} relays")
+        Log.d("Relay", "Relay Pool Reconnecting to ${relays?.size} relays: \n${relays?.joinToString("\n") { it.url + " " + it.read + " " + it.write + " " + it.feedTypes.joinToString(",") { it.name } }}")
         checkNotInMainThread()
 
         if (onlyIfChanged) {
@@ -57,10 +57,11 @@ object Client : RelayPool.Listener {
                 }
 
                 if (relays != null) {
+                    val newRelays = relays.map { Relay(it.url, it.read, it.write, it.feedTypes) }
                     RelayPool.register(this)
-                    RelayPool.loadRelays(relays.toList())
+                    RelayPool.loadRelays(newRelays)
                     RelayPool.requestAndWatch()
-                    this.relays = relays
+                    this.relays = newRelays.toTypedArray()
                 }
             }
         } else {
@@ -71,15 +72,16 @@ object Client : RelayPool.Listener {
             }
 
             if (relays != null) {
+                val newRelays = relays.map { Relay(it.url, it.read, it.write, it.feedTypes) }
                 RelayPool.register(this)
-                RelayPool.loadRelays(relays.toList())
+                RelayPool.loadRelays(newRelays)
                 RelayPool.requestAndWatch()
-                this.relays = relays
+                this.relays = newRelays.toTypedArray()
             }
         }
     }
 
-    fun isSameRelaySetConfig(newRelayConfig: Array<Relay>?): Boolean {
+    fun isSameRelaySetConfig(newRelayConfig: Array<RelaySetupInfo>?): Boolean {
         if (relays.size != newRelayConfig?.size) return false
 
         relays.forEach { oldRelayInfo ->
@@ -101,6 +103,34 @@ object Client : RelayPool.Listener {
         RelayPool.sendFilter(subscriptionId, filters)
     }
 
+    fun sendFilterAndStopOnFirstResponse(
+        subscriptionId: String = UUID.randomUUID().toString().substring(0..10),
+        filters: List<TypedFilter> = listOf(),
+        onResponse: (Event) -> Unit,
+    ) {
+        checkNotInMainThread()
+
+        subscribe(
+            object : Listener() {
+                override fun onEvent(
+                    event: Event,
+                    subId: String,
+                    relay: Relay,
+                    afterEOSE: Boolean,
+                ) {
+                    if (subId == subscriptionId) {
+                        onResponse(event)
+                        unsubscribe(this)
+                        close(subscriptionId)
+                    }
+                }
+            },
+        )
+
+        subscriptions = subscriptions + Pair(subscriptionId, filters)
+        RelayPool.sendFilter(subscriptionId, filters)
+    }
+
     fun sendFilterOnlyIfDisconnected(
         subscriptionId: String = UUID.randomUUID().toString().substring(0..10),
         filters: List<TypedFilter> = listOf(),
@@ -115,7 +145,7 @@ object Client : RelayPool.Listener {
         signedEvent: EventInterface,
         relay: String? = null,
         feedTypes: Set<FeedType>? = null,
-        relayList: List<Relay>? = null,
+        relayList: List<RelaySetupInfo>? = null,
         onDone: (() -> Unit)? = null,
     ) {
         checkNotInMainThread()
@@ -125,47 +155,21 @@ object Client : RelayPool.Listener {
         } else if (relay == null) {
             RelayPool.send(signedEvent)
         } else {
-            val useConnectedRelayIfPresent = RelayPool.getRelays(relay)
-
-            if (useConnectedRelayIfPresent.isNotEmpty()) {
-                useConnectedRelayIfPresent.forEach { it.send(signedEvent) }
-            } else {
-                /** temporary connection */
-                newSporadicRelay(
-                    relay,
-                    feedTypes,
-                    onConnected = { myRelay -> myRelay.send(signedEvent) },
-                    onDone = onDone,
-                )
+            RelayPool.getOrCreateRelay(relay, feedTypes, onDone) {
+                it.send(signedEvent)
             }
         }
     }
 
-    @OptIn(DelicateCoroutinesApi::class)
-    private fun newSporadicRelay(
-        url: String,
-        feedTypes: Set<FeedType>?,
-        onConnected: (Relay) -> Unit,
-        onDone: (() -> Unit)?,
+    fun sendPrivately(
+        signedEvent: EventInterface,
+        relayList: List<String>,
     ) {
-        val relay = Relay(url, true, true, feedTypes ?: emptySet())
-        RelayPool.addRelay(relay)
+        checkNotInMainThread()
 
-        relay.connectAndRun {
-            allSubscriptions().forEach {
-                relay.sendFilter(it.key, it.value)
-            }
-
-            onConnected(relay)
-
-            GlobalScope.launch(Dispatchers.IO) {
-                delay(60000) // waits for a reply
-                relay.disconnect()
-                RelayPool.removeRelay(relay)
-
-                if (onDone != null) {
-                    onDone()
-                }
+        relayList.forEach { relayUrl ->
+            RelayPool.getOrCreateRelay(relayUrl, emptySet(), { }) {
+                it.sendOverride(signedEvent)
             }
         }
     }
@@ -193,19 +197,6 @@ object Client : RelayPool.Listener {
         }
     }
 
-    @OptIn(DelicateCoroutinesApi::class)
-    override fun onError(
-        error: Error,
-        subscriptionId: String,
-        relay: Relay,
-    ) {
-        // Releases the Web thread for the new payload.
-        // May need to add a processing queue if processing new events become too costly.
-        GlobalScope.launch(Dispatchers.Default) {
-            listeners.forEach { it.onError(error, subscriptionId, relay) }
-        }
-    }
-
     @OptIn(DelicateCoroutinesApi::class)
     override fun onRelayStateChange(
         type: Relay.StateType,
@@ -283,13 +274,6 @@ object Client : RelayPool.Listener {
             afterEOSE: Boolean,
         ) = Unit
 
-        /** A new or repeat message was received */
-        open fun onError(
-            error: Error,
-            subscriptionId: String,
-            relay: Relay,
-        ) = Unit
-
         /** Connected to or disconnected from a relay */
         open fun onRelayStateChange(
             type: Relay.StateType,

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

@@ -21,6 +21,7 @@
 package com.vitorpamplona.amethyst.service.relays
 
 import com.vitorpamplona.amethyst.model.RelaySetupInfo
+import com.vitorpamplona.quartz.encoders.RelayUrlFormatter
 
 object Constants {
     val activeTypes = setOf(FeedType.FOLLOWS, FeedType.PRIVATE_DMS)
@@ -36,28 +37,26 @@ object Constants {
     val defaultRelays =
         arrayOf(
             // Free relays for only DMs, Chats and Follows due to the amount of spam
-            RelaySetupInfo("wss://nostr.bitcoiner.social", read = true, write = true, feedTypes = activeTypesChats),
-            RelaySetupInfo("wss://relay.nostr.bg", read = true, write = true, feedTypes = activeTypesChats),
-            RelaySetupInfo("wss://nostr.oxtr.dev", read = true, write = true, feedTypes = activeTypesChats),
-            RelaySetupInfo("wss://nostr.orangepill.dev", read = true, write = true, feedTypes = activeTypes),
-            RelaySetupInfo("wss://nostr.fmt.wiz.biz", read = true, write = false, feedTypes = activeTypesChats),
-            RelaySetupInfo("wss://relay.damus.io", read = true, write = true, feedTypes = activeTypes),
+            RelaySetupInfo(RelayUrlFormatter.normalize("wss://nostr.bitcoiner.social"), read = true, write = true, feedTypes = activeTypesChats),
+            RelaySetupInfo(RelayUrlFormatter.normalize("wss://relay.nostr.bg"), read = true, write = true, feedTypes = activeTypesChats),
+            RelaySetupInfo(RelayUrlFormatter.normalize("wss://nostr.oxtr.dev"), read = true, write = true, feedTypes = activeTypesChats),
+            RelaySetupInfo(RelayUrlFormatter.normalize("wss://nostr.fmt.wiz.biz"), read = true, write = false, feedTypes = activeTypesChats),
+            RelaySetupInfo(RelayUrlFormatter.normalize("wss://relay.damus.io"), read = true, write = true, feedTypes = activeTypes),
             // Global
-            RelaySetupInfo("wss://nostr.mom", read = true, write = true, feedTypes = activeTypesGlobalChats),
-            RelaySetupInfo("wss://nos.lol", read = true, write = true, feedTypes = activeTypesGlobalChats),
+            RelaySetupInfo(RelayUrlFormatter.normalize("wss://nostr.mom"), read = true, write = true, feedTypes = activeTypesGlobalChats),
+            RelaySetupInfo(RelayUrlFormatter.normalize("wss://nos.lol"), read = true, write = true, feedTypes = activeTypesGlobalChats),
             // Paid relays
-            RelaySetupInfo("wss://nostr.wine", read = true, write = false, feedTypes = activeTypesGlobalChats),
+            RelaySetupInfo(RelayUrlFormatter.normalize("wss://nostr.wine"), read = true, write = false, feedTypes = activeTypesGlobalChats),
             // Supporting NIP-50
-            RelaySetupInfo("wss://relay.nostr.band", read = true, write = false, feedTypes = activeTypesSearch),
-            RelaySetupInfo("wss://nostr.wine", read = true, write = false, feedTypes = activeTypesSearch),
-            RelaySetupInfo("wss://relay.noswhere.com", read = true, write = false, feedTypes = activeTypesSearch),
+            RelaySetupInfo(RelayUrlFormatter.normalize("wss://relay.nostr.band"), read = true, write = false, feedTypes = activeTypesSearch),
+            RelaySetupInfo(RelayUrlFormatter.normalize("wss://nostr.wine"), read = true, write = false, feedTypes = activeTypesSearch),
+            RelaySetupInfo(RelayUrlFormatter.normalize("wss://relay.noswhere.com"), read = true, write = false, feedTypes = activeTypesSearch),
         )
 
-    val forcedRelayForSearch =
-        arrayOf(
-            RelaySetupInfo("wss://relay.nostr.band", read = true, write = false, feedTypes = activeTypesSearch),
-            RelaySetupInfo("wss://nostr.wine", read = true, write = false, feedTypes = activeTypesSearch),
-            RelaySetupInfo("wss://relay.noswhere.com", read = true, write = false, feedTypes = activeTypesSearch),
+    val defaultSearchRelaySet =
+        setOf(
+            RelayUrlFormatter.normalize("wss://relay.nostr.band"),
+            RelayUrlFormatter.normalize("wss://nostr.wine"),
+            RelayUrlFormatter.normalize("wss://relay.noswhere.com"),
         )
-    val forcedRelaysForSearchSet = forcedRelayForSearch.map { it.url }
 }

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

@@ -23,6 +23,7 @@ package com.vitorpamplona.amethyst.service.relays
 import android.util.Log
 import com.vitorpamplona.amethyst.BuildConfig
 import com.vitorpamplona.amethyst.model.RelayBriefInfoCache
+import com.vitorpamplona.amethyst.model.RelaySetupInfo
 import com.vitorpamplona.amethyst.service.HttpClientManager
 import com.vitorpamplona.amethyst.service.checkNotInMainThread
 import com.vitorpamplona.quartz.encoders.HexKey
@@ -50,43 +51,33 @@ enum class FeedType {
 val COMMON_FEED_TYPES =
     setOf(FeedType.FOLLOWS, FeedType.PUBLIC_CHATS, FeedType.PRIVATE_DMS, FeedType.GLOBAL)
 
+val EVENT_FINDER_TYPES =
+    setOf(FeedType.FOLLOWS, FeedType.PUBLIC_CHATS, FeedType.GLOBAL)
+
 class Relay(
     val url: String,
     val read: Boolean = true,
     val write: Boolean = true,
     val activeTypes: Set<FeedType> = FeedType.values().toSet(),
 ) {
-    val brief = RelayBriefInfoCache.get(url)
-
     companion object {
         // waits 3 minutes to reconnect once things fail
         const val RECONNECTING_IN_SECONDS = 60 * 3
     }
 
-    private val httpClient =
-        if (url.startsWith("ws://127.0.0.1") || url.startsWith("ws://localhost")) {
-            HttpClientManager.getHttpClient(false)
-        } else {
-            HttpClientManager.getHttpClient()
-        }
+    val brief = RelayBriefInfoCache.get(url)
 
     private var listeners = setOf<Listener>()
     private var socket: WebSocket? = null
     private var isReady: Boolean = false
     private var usingCompression: Boolean = false
 
-    var eventDownloadCounterInBytes = 0
-    var eventUploadCounterInBytes = 0
+    private var lastConnectTentative: Long = 0L
 
-    var spamCounter = 0
-    var errorCounter = 0
-    var pingInMs: Long? = null
+    private var afterEOSEPerSubscription = mutableMapOf<String, Boolean>()
 
-    var lastConnectTentative: Long = 0L
-
-    var afterEOSEPerSubscription = mutableMapOf<String, Boolean>()
-
-    val authResponse = mutableMapOf<HexKey, Boolean>()
+    private val authResponse = mutableMapOf<HexKey, Boolean>()
+    private val sendWhenReady = mutableListOf<EventInterface>()
 
     fun register(listener: Listener) {
         listeners = listeners.plus(listener)
@@ -112,7 +103,7 @@ class Relay(
     private var connectingBlock = AtomicBoolean()
 
     fun connectAndRun(onConnected: (Relay) -> Unit) {
-        Log.d("Relay", "Relay.connect $url hasProxy: ${this.httpClient.proxy != null}")
+        Log.d("Relay", "Relay.connect $url isAlreadyConnecting: ${connectingBlock.get()}")
         // BRB is crashing OkHttp Deflater object :(
         if (url.contains("brb.io")) return
 
@@ -121,26 +112,29 @@ class Relay(
             return
         }
 
-        checkNotInMainThread()
-
-        if (socket != null) return
-
-        lastConnectTentative = TimeUtils.now()
-
         try {
+            checkNotInMainThread()
+
+            if (socket != null) {
+                connectingBlock.set(false)
+                return
+            }
+
+            lastConnectTentative = TimeUtils.now()
+
             val request =
                 Request.Builder()
                     .header("User-Agent", "Amethyst/${BuildConfig.VERSION_NAME}")
                     .url(url.trim())
                     .build()
 
-            socket = httpClient.newWebSocket(request, RelayListener(onConnected))
+            socket = HttpClientManager.getHttpClientForUrl(url).newWebSocket(request, RelayListener(onConnected))
         } catch (e: Exception) {
             if (e is CancellationException) throw e
 
-            errorCounter++
+            RelayStats.newError(url, e.message)
+
             markConnectionAsClosed()
-            Log.e("Relay", "Relay Invalid $url")
             e.printStackTrace()
         } finally {
             connectingBlock.set(false)
@@ -164,6 +158,13 @@ class Relay(
             // Log.w("Relay", "Relay OnOpen, Loading All subscriptions $url")
             onConnected(this@Relay)
 
+            synchronized(sendWhenReady) {
+                sendWhenReady.forEach {
+                    send(it)
+                }
+                sendWhenReady.clear()
+            }
+
             listeners.forEach { it.onRelayStateChange(this@Relay, StateType.CONNECT, null) }
         }
 
@@ -173,7 +174,7 @@ class Relay(
         ) {
             checkNotInMainThread()
 
-            eventDownloadCounterInBytes += text.bytesUsedInMemory()
+            RelayStats.addBytesReceived(url, text.bytesUsedInMemory())
 
             try {
                 processNewRelayMessage(text)
@@ -225,21 +226,25 @@ class Relay(
         ) {
             checkNotInMainThread()
 
-            errorCounter++
-
             socket?.cancel() // 1000, "Normal close"
+
+            // checks if this is an actual failure. Closing the socket generates an onFailure as well.
+            if (!(socket == null && (t.message == "Socket is closed" || t.message == "Socket closed"))) {
+                RelayStats.newError(url, response?.message ?: t.message)
+
+                Log.w("Relay", "Relay onFailure $url, ${response?.message} $response ${t.message} $socket")
+                t.printStackTrace()
+                listeners.forEach {
+                    it.onError(
+                        this@Relay,
+                        "",
+                        Error("WebSocket Failure. Response: $response. Exception: ${t.message}", t),
+                    )
+                }
+            }
+
             // Failures disconnect the relay.
             markConnectionAsClosed()
-
-            Log.w("Relay", "Relay onFailure $url, ${response?.message} $response")
-            t.printStackTrace()
-            listeners.forEach {
-                it.onError(
-                    this@Relay,
-                    "",
-                    Error("WebSocket Failure. Response: $response. Exception: ${t.message}", t),
-                )
-            }
         }
     }
 
@@ -249,8 +254,9 @@ class Relay(
     ) {
         this.resetEOSEStatuses()
         this.isReady = true
-        this.pingInMs = pingInMs
         this.usingCompression = usingCompression
+
+        RelayStats.setPing(url, pingInMs)
     }
 
     fun markConnectionAsClosed() {
@@ -269,6 +275,7 @@ class Relay(
                 val event = Event.fromJson(msgArray.get(2))
 
                 // Log.w("Relay", "Relay onEVENT ${event.kind} $url, $subscriptionId ${msgArray.get(2)}")
+
                 listeners.forEach {
                     it.onEvent(
                         this@Relay,
@@ -291,6 +298,8 @@ class Relay(
                     val message = msgArray.get(1).asText()
                     Log.w("Relay", "Relay onNotice $url, $message")
 
+                    RelayStats.newNotice(url, message)
+
                     it.onError(this@Relay, message, Error("Relay sent notice: $message"))
                 }
             "OK" ->
@@ -321,7 +330,9 @@ class Relay(
                     it.onNotify(this@Relay, msgArray[1].asText())
                 }
             "CLOSED" -> listeners.forEach { Log.w("Relay", "Relay onClosed $url, $newMessage") }
-            else ->
+            else -> {
+                RelayStats.newError(url, "Unsupported message: $newMessage")
+
                 listeners.forEach {
                     Log.w("Relay", "Unsupported message: $newMessage")
                     it.onError(
@@ -330,6 +341,7 @@ class Relay(
                         Error("Unknown type $type on channel. Msg was $newMessage"),
                     )
                 }
+            }
         }
     }
 
@@ -374,10 +386,8 @@ class Relay(
                                 it.filter.toJson(url)
                             }
 
-                        // Log.d("Relay", "onFilterSent $url $requestId $request")
+                        writeToSocket(request)
 
-                        socket?.send(request)
-                        eventUploadCounterInBytes += request.bytesUsedInMemory()
                         resetEOSEStatuses()
                     }
                 }
@@ -437,30 +447,36 @@ class Relay(
         }
     }
 
+    // This function sends the event regardless of the relay being write or not.
+    fun sendOverride(signedEvent: EventInterface) {
+        checkNotInMainThread()
+
+        if (signedEvent is RelayAuthEvent) {
+            sendAuth(signedEvent)
+        } else {
+            sendEvent(signedEvent)
+        }
+    }
+
     fun send(signedEvent: EventInterface) {
         checkNotInMainThread()
 
         if (signedEvent is RelayAuthEvent) {
-            authResponse.put(signedEvent.id, false)
-            // specific protocol for this event.
-            val event = """["AUTH",${signedEvent.toJson()}]"""
-            socket?.send(event)
-            eventUploadCounterInBytes += event.bytesUsedInMemory()
+            sendAuth(signedEvent)
         } else {
             if (write) {
-                val event = """["EVENT",${signedEvent.toJson()}]"""
                 if (isConnected()) {
                     if (isReady) {
-                        socket?.send(event)
-                        eventUploadCounterInBytes += event.bytesUsedInMemory()
+                        writeToSocket("""["EVENT",${signedEvent.toJson()}]""")
+                    } else {
+                        synchronized(sendWhenReady) {
+                            sendWhenReady.add(signedEvent)
+                        }
                     }
                 } else {
                     // sends all filters after connection is successful.
                     connectAndRun {
-                        checkNotInMainThread()
-
-                        socket?.send(event)
-                        eventUploadCounterInBytes += event.bytesUsedInMemory()
+                        writeToSocket("""["EVENT",${signedEvent.toJson()}]""")
 
                         // Sends everything.
                         renewFilters()
@@ -470,19 +486,49 @@ class Relay(
         }
     }
 
-    fun close(subscriptionId: String) {
-        checkNotInMainThread()
-
-        val msg = """["CLOSE","$subscriptionId"]"""
-        // Log.d("Relay", "Close Subscription $url $msg")
-        socket?.send(msg)
+    private fun sendAuth(signedEvent: RelayAuthEvent) {
+        authResponse.put(signedEvent.id, false)
+        writeToSocket("""["AUTH",${signedEvent.toJson()}]""")
     }
 
-    fun isSameRelayConfig(other: Relay): Boolean {
+    private fun sendEvent(signedEvent: EventInterface) {
+        if (isConnected()) {
+            if (isReady) {
+                writeToSocket("""["EVENT",${signedEvent.toJson()}]""")
+            }
+        } else {
+            // sends all filters after connection is successful.
+            connectAndRun {
+                writeToSocket("""["EVENT",${signedEvent.toJson()}]""")
+
+                // Sends everything.
+                renewFilters()
+            }
+        }
+    }
+
+    private fun writeToSocket(str: String) {
+        socket?.let {
+            checkNotInMainThread()
+
+            it.send(str)
+            RelayStats.addBytesSent(url, str.bytesUsedInMemory())
+
+            if (BuildConfig.DEBUG) {
+                Log.d("Relay", "Relay send $url $str")
+            }
+        }
+    }
+
+    fun close(subscriptionId: String) {
+        writeToSocket("""["CLOSE","$subscriptionId"]""")
+    }
+
+    fun isSameRelayConfig(other: RelaySetupInfo): Boolean {
         return url == other.url &&
             write == other.write &&
             read == other.read &&
-            activeTypes == other.activeTypes
+            activeTypes == other.feedTypes
     }
 
     enum class StateType {

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

@@ -21,13 +21,19 @@
 package com.vitorpamplona.amethyst.service.relays
 
 import androidx.compose.runtime.Immutable
+import com.vitorpamplona.amethyst.model.RelaySetupInfo
 import com.vitorpamplona.amethyst.service.checkNotInMainThread
 import com.vitorpamplona.quartz.events.Event
 import com.vitorpamplona.quartz.events.EventInterface
+import kotlinx.coroutines.DelicateCoroutinesApi
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.channels.BufferOverflow
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.SharedFlow
 import kotlinx.coroutines.flow.asSharedFlow
+import kotlinx.coroutines.launch
 
 /**
  * RelayPool manages the connection to multiple Relays and lets consumers deal with simple events.
@@ -58,6 +64,58 @@ object RelayPool : Relay.Listener {
         return relays.filter { it.url == url }
     }
 
+    fun getOrCreateRelay(
+        url: String,
+        feedTypes: Set<FeedType>? = null,
+        onDone: (() -> Unit)? = null,
+        whenConnected: (Relay) -> Unit,
+    ) {
+        synchronized(this) {
+            val matching = getRelays(url)
+            if (matching.isNotEmpty()) {
+                matching.forEach { whenConnected(it) }
+            } else {
+                /** temporary connection */
+                newSporadicRelay(
+                    url,
+                    feedTypes,
+                    onConnected = whenConnected,
+                    onDone = onDone,
+                )
+            }
+        }
+    }
+
+    @OptIn(DelicateCoroutinesApi::class)
+    fun newSporadicRelay(
+        url: String,
+        feedTypes: Set<FeedType>?,
+        onConnected: (Relay) -> Unit,
+        onDone: (() -> Unit)?,
+        timeout: Long = 60000,
+    ) {
+        val relay = Relay(url, true, true, feedTypes ?: emptySet())
+        addRelay(relay)
+
+        relay.connectAndRun {
+            Client.allSubscriptions().forEach {
+                relay.sendFilter(it.key, it.value)
+            }
+
+            onConnected(relay)
+
+            GlobalScope.launch(Dispatchers.IO) {
+                delay(timeout) // waits for a reply
+                relay.disconnect()
+                removeRelay(relay)
+
+                if (onDone != null) {
+                    onDone()
+                }
+            }
+        }
+    }
+
     fun loadRelays(relayList: List<Relay>) {
         if (!relayList.isNullOrEmpty()) {
             relayList.forEach { addRelay(it) }
@@ -91,16 +149,20 @@ object RelayPool : Relay.Listener {
     }
 
     fun sendToSelectedRelays(
-        list: List<Relay>,
+        list: List<RelaySetupInfo>,
         signedEvent: EventInterface,
     ) {
-        list.forEach { relay -> relays.filter { it.url == relay.url }.forEach { it.send(signedEvent) } }
+        list.forEach { relay -> relays.filter { it.url == relay.url }.forEach { it.sendOverride(signedEvent) } }
     }
 
     fun send(signedEvent: EventInterface) {
         relays.forEach { it.send(signedEvent) }
     }
 
+    fun sendOverride(signedEvent: EventInterface) {
+        relays.forEach { it.sendOverride(signedEvent) }
+    }
+
     fun close(subscriptionId: String) {
         relays.forEach { it.close(subscriptionId) }
     }
@@ -137,12 +199,6 @@ object RelayPool : Relay.Listener {
             afterEOSE: Boolean,
         )
 
-        fun onError(
-            error: Error,
-            subscriptionId: String,
-            relay: Relay,
-        )
-
         fun onRelayStateChange(
             type: Relay.StateType,
             relay: Relay,
@@ -181,7 +237,6 @@ object RelayPool : Relay.Listener {
         subscriptionId: String,
         error: Error,
     ) {
-        listeners.forEach { it.onError(error, subscriptionId, relay) }
         updateStatus()
     }
 

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

@@ -0,0 +1,138 @@
+/**
+ * Copyright (c) 2024 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.service.relays
+
+import androidx.collection.LruCache
+import com.vitorpamplona.quartz.utils.TimeUtils
+
+object RelayStats {
+    private val innerCache = mutableMapOf<String, RelayStat>()
+
+    fun get(url: String): RelayStat {
+        return innerCache.getOrPut(url) { RelayStat() }
+    }
+
+    fun addBytesReceived(
+        url: String,
+        bytesUsedInMemory: Int,
+    ) {
+        get(url).addBytesReceived(bytesUsedInMemory)
+    }
+
+    fun addBytesSent(
+        url: String,
+        bytesUsedInMemory: Int,
+    ) {
+        get(url).addBytesSent(bytesUsedInMemory)
+    }
+
+    fun newError(
+        url: String,
+        error: String?,
+    ) {
+        get(url).newError(error)
+    }
+
+    fun newNotice(
+        url: String,
+        notice: String?,
+    ) {
+        get(url).newNotice(notice)
+    }
+
+    fun setPing(
+        url: String,
+        pingInMs: Long,
+    ) {
+        get(url).pingInMs = pingInMs
+    }
+
+    fun newSpam(
+        url: String,
+        explanation: String,
+    ) {
+        get(url).newSpam(explanation)
+    }
+}
+
+class RelayStat(
+    var receivedBytes: Long = 0L,
+    var sentBytes: Long = 0L,
+    var spamCounter: Long = 0L,
+    var errorCounter: Long = 0L,
+    var pingInMs: Long = 0L,
+) {
+    val messages = LruCache<RelayDebugMessage, RelayDebugMessage>(100)
+
+    fun newNotice(notice: String?) {
+        val debugMessage =
+            RelayDebugMessage(
+                type = RelayDebugMessageType.NOTICE,
+                message = notice ?: "No error message provided",
+            )
+
+        messages.put(debugMessage, debugMessage)
+    }
+
+    fun newError(error: String?) {
+        errorCounter++
+
+        val debugMessage =
+            RelayDebugMessage(
+                type = RelayDebugMessageType.ERROR,
+                message = error ?: "No error message provided",
+            )
+
+        messages.put(debugMessage, debugMessage)
+    }
+
+    fun addBytesReceived(bytesUsedInMemory: Int) {
+        receivedBytes += bytesUsedInMemory
+    }
+
+    fun addBytesSent(bytesUsedInMemory: Int) {
+        sentBytes += bytesUsedInMemory
+    }
+
+    fun newSpam(spamDescriptor: String) {
+        spamCounter++
+
+        val debugMessage =
+            RelayDebugMessage(
+                type = RelayDebugMessageType.SPAM,
+                message = spamDescriptor,
+            )
+
+        messages.put(debugMessage, debugMessage)
+    }
+}
+
+class RelayDebugMessage(
+    val type: RelayDebugMessageType,
+    val message: String,
+    val time: Long = TimeUtils.now(),
+)
+
+enum class RelayDebugMessageType {
+    SPAM,
+    NOTICE,
+    ERROR,
+}

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

@@ -0,0 +1,74 @@
+/**
+ * Copyright (c) 2024 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.ui
+
+import androidx.compose.material3.windowsizeclass.ExperimentalMaterial3WindowSizeClassApi
+import androidx.compose.material3.windowsizeclass.calculateWindowSizeClass
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.lifecycle.viewmodel.compose.viewModel
+import com.google.accompanist.adaptive.calculateDisplayFeatures
+import com.vitorpamplona.amethyst.ServiceManager
+import com.vitorpamplona.amethyst.ui.screen.AccountScreen
+import com.vitorpamplona.amethyst.ui.screen.AccountStateViewModel
+import com.vitorpamplona.amethyst.ui.screen.SharedPreferencesViewModel
+import com.vitorpamplona.amethyst.ui.theme.AmethystTheme
+
+@OptIn(ExperimentalMaterial3WindowSizeClassApi::class)
+@Composable
+fun prepareSharedViewModel(act: MainActivity): SharedPreferencesViewModel {
+    val sharedPreferencesViewModel: SharedPreferencesViewModel = viewModel()
+
+    val displayFeatures = calculateDisplayFeatures(act)
+    val windowSizeClass = calculateWindowSizeClass(act)
+
+    LaunchedEffect(key1 = sharedPreferencesViewModel) {
+        sharedPreferencesViewModel.init()
+        sharedPreferencesViewModel.updateDisplaySettings(windowSizeClass, displayFeatures)
+    }
+
+    LaunchedEffect(key1 = displayFeatures, key2 = windowSizeClass) {
+        sharedPreferencesViewModel.updateDisplaySettings(windowSizeClass, displayFeatures)
+    }
+
+    LaunchedEffect(act.isOnMobileDataState) {
+        sharedPreferencesViewModel.updateConnectivityStatusState(act.isOnMobileDataState)
+    }
+
+    return sharedPreferencesViewModel
+}
+
+@Composable
+fun AppScreen(
+    sharedPreferencesViewModel: SharedPreferencesViewModel,
+    serviceManager: ServiceManager,
+) {
+    AmethystTheme(sharedPreferencesViewModel) {
+        val accountStateViewModel: AccountStateViewModel = viewModel()
+        accountStateViewModel.serviceManager = serviceManager
+
+        LaunchedEffect(key1 = Unit) {
+            accountStateViewModel.tryLoginExistingAccountAsync()
+        }
+
+        AccountScreen(accountStateViewModel, sharedPreferencesViewModel)
+    }
+}

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

@@ -33,16 +33,7 @@ import androidx.activity.compose.setContent
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.annotation.RequiresApi
 import androidx.appcompat.app.AppCompatActivity
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Surface
-import androidx.compose.material3.windowsizeclass.ExperimentalMaterial3WindowSizeClassApi
-import androidx.compose.material3.windowsizeclass.calculateWindowSizeClass
-import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.mutableStateOf
-import androidx.compose.ui.Modifier
-import androidx.lifecycle.viewmodel.compose.viewModel
-import com.google.accompanist.adaptive.calculateDisplayFeatures
 import com.vitorpamplona.amethyst.LocalPreferences
 import com.vitorpamplona.amethyst.ServiceManager
 import com.vitorpamplona.amethyst.model.LocalCache
@@ -53,10 +44,6 @@ import com.vitorpamplona.amethyst.ui.components.DEFAULT_MUTED_SETTING
 import com.vitorpamplona.amethyst.ui.components.keepPlayingMutex
 import com.vitorpamplona.amethyst.ui.navigation.Route
 import com.vitorpamplona.amethyst.ui.navigation.debugState
-import com.vitorpamplona.amethyst.ui.screen.AccountScreen
-import com.vitorpamplona.amethyst.ui.screen.AccountStateViewModel
-import com.vitorpamplona.amethyst.ui.screen.SharedPreferencesViewModel
-import com.vitorpamplona.amethyst.ui.theme.AmethystTheme
 import com.vitorpamplona.quartz.encoders.Nip19Bech32
 import com.vitorpamplona.quartz.encoders.Nip47WalletConnect
 import com.vitorpamplona.quartz.events.ChannelCreateEvent
@@ -76,14 +63,13 @@ import java.util.Timer
 import kotlin.concurrent.schedule
 
 class MainActivity : AppCompatActivity() {
-    private val isOnMobileDataState = mutableStateOf(false)
+    val isOnMobileDataState = mutableStateOf(false)
     private val isOnWifiDataState = mutableStateOf(false)
 
     // Service Manager is only active when the activity is active.
     val serviceManager = ServiceManager()
     private var shouldPauseService = true
 
-    @OptIn(ExperimentalMaterial3WindowSizeClassApi::class)
     @RequiresApi(Build.VERSION_CODES.R)
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -91,36 +77,8 @@ class MainActivity : AppCompatActivity() {
         Log.d("Lifetime Event", "MainActivity.onCreate")
 
         setContent {
-            val sharedPreferencesViewModel: SharedPreferencesViewModel = viewModel()
-
-            val displayFeatures = calculateDisplayFeatures(this)
-            val windowSizeClass = calculateWindowSizeClass(this)
-
-            LaunchedEffect(key1 = sharedPreferencesViewModel) {
-                sharedPreferencesViewModel.init()
-                sharedPreferencesViewModel.updateDisplaySettings(windowSizeClass, displayFeatures)
-            }
-
-            LaunchedEffect(isOnMobileDataState) {
-                sharedPreferencesViewModel.updateConnectivityStatusState(isOnMobileDataState)
-            }
-
-            AmethystTheme(sharedPreferencesViewModel) {
-                // A surface container using the 'background' color from the theme
-                Surface(
-                    modifier = Modifier.fillMaxSize(),
-                    color = MaterialTheme.colorScheme.background,
-                ) {
-                    val accountStateViewModel: AccountStateViewModel = viewModel()
-                    accountStateViewModel.serviceManager = serviceManager
-
-                    LaunchedEffect(key1 = Unit) {
-                        accountStateViewModel.tryLoginExistingAccountAsync()
-                    }
-
-                    AccountScreen(accountStateViewModel, sharedPreferencesViewModel)
-                }
-            }
+            val sharedPreferencesViewModel = prepareSharedViewModel(act = this)
+            AppScreen(sharedPreferencesViewModel = sharedPreferencesViewModel, serviceManager = serviceManager)
         }
     }
 

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

@@ -304,11 +304,13 @@ fun EditPostView(
                                             } else if (RichTextParser.isVideoUrl(myUrlPreview)) {
                                                 VideoView(
                                                     myUrlPreview,
+                                                    mimeType = null,
                                                     roundedCorner = true,
+                                                    isFiniteHeight = false,
                                                     accountViewModel = accountViewModel,
                                                 )
                                             } else {
-                                                LoadUrlPreview(myUrlPreview, myUrlPreview, accountViewModel)
+                                                LoadUrlPreview(myUrlPreview, myUrlPreview, null, accountViewModel)
                                             }
                                         } else if (RichTextParser.startsWithNIP19Scheme(myUrlPreview)) {
                                             val bgColor = MaterialTheme.colorScheme.background
@@ -323,7 +325,7 @@ fun EditPostView(
                                                 nav = nav,
                                             )
                                         } else if (RichTextParser.isUrlWithoutScheme(myUrlPreview)) {
-                                            LoadUrlPreview("https://$myUrlPreview", myUrlPreview, accountViewModel)
+                                            LoadUrlPreview("https://$myUrlPreview", myUrlPreview, null, accountViewModel)
                                         }
                                     }
                                 }

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

@@ -36,11 +36,11 @@ import com.vitorpamplona.amethyst.commons.richtext.RichTextParser
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.model.RelaySetupInfo
 import com.vitorpamplona.amethyst.model.User
 import com.vitorpamplona.amethyst.service.FileHeader
 import com.vitorpamplona.amethyst.service.Nip96Uploader
 import com.vitorpamplona.amethyst.service.NostrSearchEventOrUserDataSource
-import com.vitorpamplona.amethyst.service.relays.Relay
 import com.vitorpamplona.amethyst.ui.components.MediaCompressor
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.quartz.events.FileHeaderEvent
@@ -109,11 +109,11 @@ open class EditPostViewModel() : ViewModel() {
         editedFromNote = edit
     }
 
-    fun sendPost(relayList: List<Relay>? = null) {
+    fun sendPost(relayList: List<RelaySetupInfo>? = null) {
         viewModelScope.launch(Dispatchers.IO) { innerSendPost(relayList) }
     }
 
-    suspend fun innerSendPost(relayList: List<Relay>? = null) {
+    suspend fun innerSendPost(relayList: List<RelaySetupInfo>? = null) {
         if (accountViewModel == null) {
             cancel()
             return

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

@@ -29,6 +29,8 @@ import android.os.Environment
 import android.provider.MediaStore
 import android.webkit.MimeTypeMap
 import androidx.annotation.RequiresApi
+import androidx.core.net.toFile
+import androidx.core.net.toUri
 import com.vitorpamplona.amethyst.BuildConfig
 import com.vitorpamplona.amethyst.service.HttpClientManager
 import kotlinx.coroutines.CancellationException
@@ -45,6 +47,33 @@ import java.io.File
 import java.util.UUID
 
 object ImageSaver {
+    fun saveImage(
+        videoUri: String?,
+        mimeType: String?,
+        localContext: Context,
+        onSuccess: () -> Any?,
+        onError: (Throwable) -> Any?,
+    ) {
+        if (videoUri != null) {
+            if (!videoUri.startsWith("file")) {
+                saveImage(
+                    context = localContext,
+                    url = videoUri,
+                    onSuccess = onSuccess,
+                    onError = onError,
+                )
+            } else {
+                saveImage(
+                    context = localContext,
+                    localFile = videoUri.toUri().toFile(),
+                    mimeType = mimeType,
+                    onSuccess = onSuccess,
+                    onError = onError,
+                )
+            }
+        }
+    }
+
     /**
      * Saves the image to the gallery. May require a storage permission.
      *

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

@@ -31,10 +31,10 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.model.Account
+import com.vitorpamplona.amethyst.model.RelaySetupInfo
 import com.vitorpamplona.amethyst.service.FileHeader
 import com.vitorpamplona.amethyst.service.Nip96MediaServers
 import com.vitorpamplona.amethyst.service.Nip96Uploader
-import com.vitorpamplona.amethyst.service.relays.Relay
 import com.vitorpamplona.amethyst.ui.components.MediaCompressor
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.Dispatchers
@@ -80,7 +80,7 @@ open class NewMediaModel : ViewModel() {
 
     fun upload(
         context: Context,
-        relayList: List<Relay>? = null,
+        relayList: List<RelaySetupInfo>? = null,
     ) {
         isUploadingImage = true
 
@@ -188,7 +188,7 @@ open class NewMediaModel : ViewModel() {
         localContentType: String?,
         alt: String,
         sensitiveContent: Boolean,
-        relayList: List<Relay>? = null,
+        relayList: List<RelaySetupInfo>? = null,
         context: Context,
     ) {
         uploadingPercentage.value = 0.40f
@@ -272,7 +272,7 @@ open class NewMediaModel : ViewModel() {
         mimeType: String?,
         alt: String,
         sensitiveContent: Boolean,
-        relayList: List<Relay>? = null,
+        relayList: List<RelaySetupInfo>? = null,
         context: Context,
     ) {
         if (bytes.size > 80000) {

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

@@ -251,7 +251,9 @@ fun ImageVideoPost(
             postViewModel.galleryUri?.let {
                 VideoView(
                     videoUri = it.toString(),
+                    mimeType = postViewModel.mediaType,
                     roundedCorner = false,
+                    isFiniteHeight = false,
                     accountViewModel = accountViewModel,
                 )
             }

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

@@ -425,11 +425,13 @@ fun NewPostView(
                                             } else if (RichTextParser.isVideoUrl(myUrlPreview)) {
                                                 VideoView(
                                                     myUrlPreview,
+                                                    mimeType = null,
                                                     roundedCorner = true,
+                                                    isFiniteHeight = false,
                                                     accountViewModel = accountViewModel,
                                                 )
                                             } else {
-                                                LoadUrlPreview(myUrlPreview, myUrlPreview, accountViewModel)
+                                                LoadUrlPreview(myUrlPreview, myUrlPreview, null, accountViewModel)
                                             }
                                         } else if (RichTextParser.startsWithNIP19Scheme(myUrlPreview)) {
                                             val bgColor = MaterialTheme.colorScheme.background
@@ -444,7 +446,7 @@ fun NewPostView(
                                                 nav = nav,
                                             )
                                         } else if (RichTextParser.isUrlWithoutScheme(myUrlPreview)) {
-                                            LoadUrlPreview("https://$myUrlPreview", myUrlPreview, accountViewModel)
+                                            LoadUrlPreview("https://$myUrlPreview", myUrlPreview, null, accountViewModel)
                                         }
                                     }
                                 }
@@ -1736,7 +1738,7 @@ fun ImageVideoDescription(
                         )
                     }
                 } else {
-                    VideoView(uri.toString(), roundedCorner = true, accountViewModel = accountViewModel)
+                    VideoView(uri.toString(), roundedCorner = true, isFiniteHeight = false, mimeType = mediaType, accountViewModel = accountViewModel)
                 }
             }
 

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

@@ -40,12 +40,12 @@ import com.vitorpamplona.amethyst.commons.richtext.RichTextParser
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.model.RelaySetupInfo
 import com.vitorpamplona.amethyst.model.User
 import com.vitorpamplona.amethyst.service.FileHeader
 import com.vitorpamplona.amethyst.service.LocationUtil
 import com.vitorpamplona.amethyst.service.Nip96Uploader
 import com.vitorpamplona.amethyst.service.NostrSearchEventOrUserDataSource
-import com.vitorpamplona.amethyst.service.relays.Relay
 import com.vitorpamplona.amethyst.ui.components.MediaCompressor
 import com.vitorpamplona.amethyst.ui.components.Split
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
@@ -92,10 +92,10 @@ open class NewPostViewModel() : ViewModel() {
 
     var accountViewModel: AccountViewModel? = null
     var account: Account? = null
-    var requiresNIP24: Boolean = false
+    var requiresNIP17: Boolean = false
 
-    var originalNote: Note? = null
-    var forkedFromNote: Note? = null
+    var originalNote: Note? by mutableStateOf<Note?>(null)
+    var forkedFromNote: Note? by mutableStateOf<Note?>(null)
 
     var pTags by mutableStateOf<List<User>?>(null)
     var eTags by mutableStateOf<List<Note>?>(null)
@@ -169,8 +169,8 @@ open class NewPostViewModel() : ViewModel() {
     var wantsZapraiser by mutableStateOf(false)
     var zapRaiserAmount by mutableStateOf<Long?>(null)
 
-    // NIP24 Wrapped DMs / Group messages
-    var nip24 by mutableStateOf(false)
+    // NIP17 Wrapped DMs / Group messages
+    var nip17 by mutableStateOf(false)
 
     val draftTextChanges = Channel<String>(Channel.CONFLATED)
 
@@ -425,8 +425,8 @@ open class NewPostViewModel() : ViewModel() {
                 TextFieldValue(draftEvent.content())
             }
 
-        requiresNIP24 = draftEvent is ChatMessageEvent
-        nip24 = draftEvent is ChatMessageEvent
+        requiresNIP17 = draftEvent is ChatMessageEvent
+        nip17 = draftEvent is ChatMessageEvent
 
         if (draftEvent is ChatMessageEvent) {
             toUsers =
@@ -438,7 +438,7 @@ open class NewPostViewModel() : ViewModel() {
         urlPreview = findUrlInMessage()
     }
 
-    fun sendPost(relayList: List<Relay>? = null) {
+    fun sendPost(relayList: List<RelaySetupInfo>? = null) {
         viewModelScope.launch(Dispatchers.IO) {
             innerSendPost(relayList, null)
             accountViewModel?.deleteDraft(draftTag)
@@ -446,18 +446,18 @@ open class NewPostViewModel() : ViewModel() {
         }
     }
 
-    fun sendDraft(relayList: List<Relay>? = null) {
+    fun sendDraft(relayList: List<RelaySetupInfo>? = null) {
         viewModelScope.launch {
             sendDraftSync(relayList)
         }
     }
 
-    suspend fun sendDraftSync(relayList: List<Relay>? = null) {
+    suspend fun sendDraftSync(relayList: List<RelaySetupInfo>? = null) {
         innerSendPost(relayList, draftTag)
     }
 
     private suspend fun innerSendPost(
-        relayList: List<Relay>? = null,
+        relayList: List<RelaySetupInfo>? = null,
         localDraft: String?,
     ) = withContext(Dispatchers.IO) {
         if (accountViewModel == null) {
@@ -557,7 +557,7 @@ open class NewPostViewModel() : ViewModel() {
                     .toSet()
                     .toList()
 
-            account?.sendNIP24PrivateMessage(
+            account?.sendNIP17PrivateMessage(
                 message = tagger.message,
                 toUsers = receivers,
                 subject = subject.text.ifBlank { null },
@@ -571,8 +571,8 @@ open class NewPostViewModel() : ViewModel() {
                 draftTag = localDraft,
             )
         } else if (!dmUsers.isNullOrEmpty()) {
-            if (nip24 || dmUsers.size > 1) {
-                account?.sendNIP24PrivateMessage(
+            if (nip17 || dmUsers.size > 1) {
+                account?.sendNIP17PrivateMessage(
                     message = tagger.message,
                     toUsers = dmUsers.map { it.pubkeyHex },
                     subject = subject.text.ifBlank { null },
@@ -843,11 +843,7 @@ open class NewPostViewModel() : ViewModel() {
     }
 
     open fun findUrlInMessage(): String? {
-        return message.text.split('\n').firstNotNullOfOrNull { paragraph ->
-            paragraph.split(' ').firstOrNull { word: String ->
-                RichTextParser.isValidURL(word) || RichTextParser.isUrlWithoutScheme(word)
-            }
-        }
+        return RichTextParser().parseValidUrls(message.text).firstOrNull()
     }
 
     open fun removeFromReplyList(userToRemove: User) {
@@ -1041,7 +1037,7 @@ open class NewPostViewModel() : ViewModel() {
             onReady = { header: FileHeader ->
                 account?.createHeader(imageUrl, magnet, header, alt, sensitiveContent, originalHash) { event ->
                     isUploadingImage = false
-                    nip94attachments = nip94attachments + event
+                    nip94attachments = nip94attachments.filter { it.url() != event.url() } + event
 
                     message = message.insertUrlAtCursor(imageUrl)
                     urlPreview = findUrlInMessage()
@@ -1131,10 +1127,10 @@ open class NewPostViewModel() : ViewModel() {
     }
 
     fun toggleNIP04And24() {
-        if (requiresNIP24) {
-            nip24 = true
+        if (requiresNIP17) {
+            nip17 = true
         } else {
-            nip24 = !nip24
+            nip17 = !nip17
         }
         if (message.text.isNotBlank()) {
             saveDraft()

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

@@ -63,15 +63,16 @@ fun NotifyRequestDialog(
             val background = remember { mutableStateOf(defaultBackground) }
 
             TranslatableRichTextViewer(
-                textContent,
+                content = textContent,
                 canPreview = true,
                 quotesLeft = 1,
-                Modifier.fillMaxWidth(),
-                EmptyTagList,
-                background,
-                textContent,
-                accountViewModel,
-                nav,
+                modifier = Modifier.fillMaxWidth(),
+                tags = EmptyTagList,
+                backgroundColor = background,
+                id = textContent,
+                callbackUri = null,
+                accountViewModel = accountViewModel,
+                nav = nav,
             )
         },
         confirmButton = {

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

@@ -1,337 +0,0 @@
-/**
- * Copyright (c) 2024 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.ui.actions
-
-import androidx.compose.animation.Crossfade
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.ExperimentalLayoutApi
-import androidx.compose.foundation.layout.FlowRow
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.rememberScrollState
-import androidx.compose.foundation.verticalScroll
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Surface
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.remember
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import androidx.compose.ui.window.Dialog
-import androidx.compose.ui.window.DialogProperties
-import com.vitorpamplona.amethyst.R
-import com.vitorpamplona.amethyst.model.RelayBriefInfoCache
-import com.vitorpamplona.amethyst.ui.components.ClickableEmail
-import com.vitorpamplona.amethyst.ui.components.ClickableUrl
-import com.vitorpamplona.amethyst.ui.note.LoadUser
-import com.vitorpamplona.amethyst.ui.note.RenderRelayIcon
-import com.vitorpamplona.amethyst.ui.note.UserCompose
-import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
-import com.vitorpamplona.amethyst.ui.theme.DoubleHorzSpacer
-import com.vitorpamplona.amethyst.ui.theme.DoubleVertSpacer
-import com.vitorpamplona.amethyst.ui.theme.StdPadding
-import com.vitorpamplona.amethyst.ui.theme.largeRelayIconModifier
-import com.vitorpamplona.quartz.encoders.Nip11RelayInformation
-
-@OptIn(ExperimentalLayoutApi::class)
-@Composable
-fun RelayInformationDialog(
-    onClose: () -> Unit,
-    relayBriefInfo: RelayBriefInfoCache.RelayBriefInfo,
-    relayInfo: Nip11RelayInformation,
-    accountViewModel: AccountViewModel,
-    nav: (String) -> Unit,
-) {
-    val automaticallyShowProfilePicture =
-        remember {
-            accountViewModel.settings.showProfilePictures.value
-        }
-
-    Dialog(
-        onDismissRequest = { onClose() },
-        properties =
-            DialogProperties(
-                usePlatformDefaultWidth = false,
-                dismissOnClickOutside = false,
-            ),
-    ) {
-        Surface {
-            val scrollState = rememberScrollState()
-
-            Column(
-                modifier = Modifier.padding(10.dp).fillMaxSize().verticalScroll(scrollState),
-            ) {
-                Row(
-                    modifier = Modifier.fillMaxWidth(),
-                    horizontalArrangement = Arrangement.SpaceBetween,
-                    verticalAlignment = Alignment.CenterVertically,
-                ) {
-                    CloseButton(onPress = { onClose() })
-                }
-
-                Row(
-                    verticalAlignment = Alignment.CenterVertically,
-                    horizontalArrangement = Arrangement.Center,
-                    modifier = StdPadding.fillMaxWidth(),
-                ) {
-                    Column {
-                        RenderRelayIcon(
-                            relayBriefInfo.displayUrl,
-                            relayInfo.icon ?: relayBriefInfo.favIcon,
-                            automaticallyShowProfilePicture,
-                            MaterialTheme.colorScheme.largeRelayIconModifier,
-                        )
-                    }
-
-                    Spacer(modifier = DoubleHorzSpacer)
-
-                    Column(horizontalAlignment = Alignment.CenterHorizontally) {
-                        Row { Title(relayInfo.name?.trim() ?: "") }
-
-                        Row { SubtitleContent(relayInfo.description?.trim() ?: "") }
-                    }
-                }
-
-                Section(stringResource(R.string.owner))
-
-                relayInfo.pubkey?.let {
-                    DisplayOwnerInformation(it, accountViewModel) {
-                        onClose()
-                        nav(it)
-                    }
-                }
-
-                Section(stringResource(R.string.software))
-
-                DisplaySoftwareInformation(relayInfo)
-
-                Section(stringResource(R.string.version))
-
-                SectionContent(relayInfo.version ?: "")
-
-                Section(stringResource(R.string.contact))
-
-                Box(modifier = Modifier.padding(start = 10.dp)) {
-                    relayInfo.contact?.let {
-                        if (it.startsWith("https:")) {
-                            ClickableUrl(urlText = it, url = it)
-                        } else if (it.startsWith("mailto:") || it.contains('@')) {
-                            ClickableEmail(it)
-                        } else {
-                            SectionContent(it)
-                        }
-                    }
-                }
-
-                Section(stringResource(R.string.supports))
-
-                DisplaySupportedNips(relayInfo)
-
-                relayInfo.fees?.admission?.let {
-                    if (it.isNotEmpty()) {
-                        Section(stringResource(R.string.admission_fees))
-
-                        it.forEach { item -> SectionContent("${item.amount?.div(1000) ?: 0} sats") }
-                    }
-                }
-
-                relayInfo.payments_url?.let {
-                    Section(stringResource(R.string.payments_url))
-
-                    Box(modifier = Modifier.padding(start = 10.dp)) {
-                        ClickableUrl(
-                            urlText = it,
-                            url = it,
-                        )
-                    }
-                }
-
-                relayInfo.limitation?.let {
-                    Section(stringResource(R.string.limitations))
-                    val authRequiredText =
-                        if (it.auth_required ?: false) stringResource(R.string.yes) else stringResource(R.string.no)
-
-                    val paymentRequiredText =
-                        if (it.payment_required ?: false) stringResource(R.string.yes) else stringResource(R.string.no)
-
-                    val restrictedWritesText =
-                        if (it.restricted_writes ?: false) stringResource(R.string.yes) else stringResource(R.string.no)
-
-                    Column {
-                        SectionContent(
-                            "${stringResource(R.string.message_length)}: ${it.max_message_length ?: 0}",
-                        )
-                        SectionContent(
-                            "${stringResource(R.string.subscriptions)}: ${it.max_subscriptions ?: 0}",
-                        )
-                        SectionContent("${stringResource(R.string.filters)}: ${it.max_filters ?: 0}")
-                        SectionContent(
-                            "${stringResource(R.string.subscription_id_length)}: ${it.max_subid_length ?: 0}",
-                        )
-                        SectionContent("${stringResource(R.string.minimum_prefix)}: ${it.min_prefix ?: 0}")
-                        SectionContent(
-                            "${stringResource(R.string.maximum_event_tags)}: ${it.max_event_tags ?: 0}",
-                        )
-                        SectionContent(
-                            "${stringResource(R.string.content_length)}: ${it.max_content_length ?: 0}",
-                        )
-                        SectionContent(
-                            "${stringResource(R.string.max_limit)}: ${it.max_limit ?: 0}",
-                        )
-                        SectionContent("${stringResource(R.string.minimum_pow)}: ${it.min_pow_difficulty ?: 0}")
-                        SectionContent("${stringResource(R.string.auth)}: $authRequiredText")
-                        SectionContent("${stringResource(R.string.payment)}: $paymentRequiredText")
-                        SectionContent("${stringResource(R.string.restricted_writes)}: $restrictedWritesText")
-                    }
-                }
-
-                relayInfo.relay_countries?.let {
-                    Section(stringResource(R.string.countries))
-
-                    FlowRow { it.forEach { item -> SectionContent(item) } }
-                }
-
-                relayInfo.language_tags?.let {
-                    Section(stringResource(R.string.languages))
-
-                    FlowRow { it.forEach { item -> SectionContent(item) } }
-                }
-
-                relayInfo.tags?.let {
-                    Section(stringResource(R.string.tags))
-
-                    FlowRow { it.forEach { item -> SectionContent(item) } }
-                }
-
-                relayInfo.posting_policy?.let {
-                    Section(stringResource(R.string.posting_policy))
-
-                    Box(Modifier.padding(10.dp)) {
-                        ClickableUrl(
-                            it,
-                            it,
-                        )
-                    }
-                }
-            }
-        }
-    }
-}
-
-@Composable
-@OptIn(ExperimentalLayoutApi::class)
-private fun DisplaySupportedNips(relayInfo: Nip11RelayInformation) {
-    FlowRow {
-        relayInfo.supported_nips?.forEach { item ->
-            val text = item.toString().padStart(2, '0')
-            Box(Modifier.padding(10.dp)) {
-                ClickableUrl(
-                    urlText = text,
-                    url = "https://github.com/nostr-protocol/nips/blob/master/$text.md",
-                )
-            }
-        }
-
-        relayInfo.supported_nip_extensions?.forEach { item ->
-            val text = item.padStart(2, '0')
-            Box(Modifier.padding(10.dp)) {
-                ClickableUrl(
-                    urlText = text,
-                    url = "https://github.com/nostr-protocol/nips/blob/master/$text.md",
-                )
-            }
-        }
-    }
-}
-
-@Composable
-private fun DisplaySoftwareInformation(relayInfo: Nip11RelayInformation) {
-    val url = (relayInfo.software ?: "").replace("git+", "")
-    Box(modifier = Modifier.padding(start = 10.dp)) {
-        ClickableUrl(
-            urlText = url,
-            url = url,
-        )
-    }
-}
-
-@Composable
-private fun DisplayOwnerInformation(
-    userHex: String,
-    accountViewModel: AccountViewModel,
-    nav: (String) -> Unit,
-) {
-    LoadUser(baseUserHex = userHex, accountViewModel) {
-        Crossfade(it) {
-            if (it != null) {
-                UserCompose(
-                    baseUser = it,
-                    accountViewModel = accountViewModel,
-                    nav = nav,
-                )
-            }
-        }
-    }
-}
-
-@Composable
-fun Title(text: String) {
-    Text(
-        text = text,
-        fontWeight = FontWeight.Bold,
-        fontSize = 24.sp,
-    )
-}
-
-@Composable
-fun SubtitleContent(text: String) {
-    Text(
-        text = text,
-    )
-}
-
-@Composable
-fun Section(text: String) {
-    Spacer(modifier = DoubleVertSpacer)
-    Text(
-        text = text,
-        fontWeight = FontWeight.Bold,
-        fontSize = 20.sp,
-    )
-    Spacer(modifier = DoubleVertSpacer)
-}
-
-@Composable
-fun SectionContent(text: String) {
-    Text(
-        modifier = Modifier.padding(start = 10.dp),
-        text = text,
-    )
-}

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

@@ -47,8 +47,9 @@ import androidx.compose.ui.window.Dialog
 import androidx.compose.ui.window.DialogProperties
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.model.RelayBriefInfoCache
+import com.vitorpamplona.amethyst.model.RelaySetupInfo
 import com.vitorpamplona.amethyst.service.Nip11Retriever
-import com.vitorpamplona.amethyst.service.relays.Relay
+import com.vitorpamplona.amethyst.ui.actions.relays.RelayInformationDialog
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.theme.FeedPadding
 import com.vitorpamplona.quartz.encoders.Nip11RelayInformation
@@ -56,7 +57,7 @@ import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.toImmutableList
 
 data class RelayList(
-    val relay: Relay,
+    val relay: RelaySetupInfo,
     val relayInfo: RelayBriefInfoCache.RelayBriefInfo,
     val isSelected: Boolean,
 )
@@ -68,9 +69,9 @@ data class RelayInfoDialog(
 
 @Composable
 fun RelaySelectionDialog(
-    preSelectedList: ImmutableList<Relay>,
+    preSelectedList: ImmutableList<RelaySetupInfo>,
     onClose: () -> Unit,
-    onPost: (list: ImmutableList<Relay>) -> Unit,
+    onPost: (list: ImmutableList<RelaySetupInfo>) -> Unit,
     accountViewModel: AccountViewModel,
     nav: (String) -> Unit,
 ) {
@@ -78,7 +79,7 @@ fun RelaySelectionDialog(
 
     var relays by remember {
         mutableStateOf(
-            accountViewModel.account.activeWriteRelays().map {
+            accountViewModel.account.connectToRelays.value.map {
                 RelayList(
                     relay = it,
                     relayInfo = RelayBriefInfoCache.RelayBriefInfo(it.url),

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

@@ -34,7 +34,6 @@ import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.quartz.encoders.decodePublicKey
 import com.vitorpamplona.quartz.encoders.toHexKey
 import kotlin.coroutines.cancellation.CancellationException
-import kotlin.math.roundToInt
 
 data class RangesChanges(val original: TextRange, val modified: TextRange)
 
@@ -55,71 +54,69 @@ fun buildAnnotatedStringWithUrlHighlighting(
             val builderBefore = StringBuilder() // important to correctly measure Tag start and end
             val builderAfter = StringBuilder() // important to correctly measure Tag start and end
             append(
-                text
-                    .split('\n').joinToString("\n") { paragraph: String ->
-                        paragraph
-                            .split(' ').joinToString(" ") { word: String ->
-                                try {
-                                    if (word.startsWith("@npub") && word.length >= 64) {
-                                        val keyB32 = word.substring(0, 64)
-                                        val restOfWord = word.substring(64)
+                text.text.split('\n').joinToString("\n") { paragraph: String ->
+                    paragraph.split(' ').joinToString(" ") { word: String ->
+                        try {
+                            if (word.startsWith("@npub") && word.length >= 64) {
+                                val keyB32 = word.substring(0, 64)
+                                val restOfWord = word.substring(64)
 
-                                        val startIndex = builderBefore.toString().length
+                                val startIndex = builderBefore.toString().length
 
-                                        builderBefore.append(
-                                            "$keyB32$restOfWord ",
-                                        ) // accounts for the \n at the end of each paragraph
+                                builderBefore.append(
+                                    "$keyB32$restOfWord ",
+                                ) // accounts for the \n at the end of each paragraph
 
-                                        val endIndex = startIndex + keyB32.length
+                                val endIndex = startIndex + keyB32.length
 
-                                        val key = decodePublicKey(keyB32.removePrefix("@"))
-                                        val user = LocalCache.getOrCreateUser(key.toHexKey())
+                                val key = decodePublicKey(keyB32.removePrefix("@"))
+                                val user = LocalCache.getOrCreateUser(key.toHexKey())
 
-                                        val newWord = "@${user.toBestDisplayName()}"
-                                        val startNew = builderAfter.toString().length
+                                val newWord = "@${user.toBestDisplayName()}"
+                                val startNew = builderAfter.toString().length
 
-                                        builderAfter.append(
-                                            "$newWord$restOfWord ",
-                                        ) // accounts for the \n at the end of each paragraph
+                                builderAfter.append(
+                                    "$newWord$restOfWord ",
+                                ) // accounts for the \n at the end of each paragraph
 
-                                        substitutions.add(
-                                            RangesChanges(
-                                                TextRange(startIndex, endIndex),
-                                                TextRange(startNew, startNew + newWord.length),
-                                            ),
-                                        )
-                                        newWord + restOfWord
-                                    } else if (Patterns.WEB_URL.matcher(word).matches()) {
-                                        val startIndex = builderBefore.toString().length
-                                        val endIndex = startIndex + word.length
+                                substitutions.add(
+                                    RangesChanges(
+                                        TextRange(startIndex, endIndex),
+                                        TextRange(startNew, startNew + newWord.length),
+                                    ),
+                                )
+                                newWord + restOfWord
+                            } else if (Patterns.WEB_URL.matcher(word).matches()) {
+                                val startIndex = builderBefore.toString().length
+                                val endIndex = startIndex + word.length
 
-                                        val startNew = builderAfter.toString().length
-                                        val endNew = startNew + word.length
+                                val startNew = builderAfter.toString().length
+                                val endNew = startNew + word.length
 
-                                        substitutions.add(
-                                            RangesChanges(
-                                                TextRange(startIndex, endIndex),
-                                                TextRange(startNew, endNew),
-                                            ),
-                                        )
+                                substitutions.add(
+                                    RangesChanges(
+                                        TextRange(startIndex, endIndex),
+                                        TextRange(startNew, endNew),
+                                    ),
+                                )
 
-                                        builderBefore.append("$word ")
-                                        builderAfter.append("$word ")
-                                        word
-                                    } else {
-                                        builderBefore.append("$word ")
-                                        builderAfter.append("$word ")
-                                        word
-                                    }
-                                } catch (e: Exception) {
-                                    if (e is CancellationException) throw e
-                                    // if it can't parse the key, don't try to change.
-                                    builderBefore.append("$word ")
-                                    builderAfter.append("$word ")
-                                    word
-                                }
+                                builderBefore.append("$word ")
+                                builderAfter.append("$word ")
+                                word
+                            } else {
+                                builderBefore.append("$word ")
+                                builderAfter.append("$word ")
+                                word
                             }
-                    },
+                        } catch (e: Exception) {
+                            if (e is CancellationException) throw e
+                            // if it can't parse the key, don't try to change.
+                            builderBefore.append("$word ")
+                            builderAfter.append("$word ")
+                            word
+                        }
+                    }
+                },
             )
 
             substitutions.forEach {
@@ -144,16 +141,15 @@ fun buildAnnotatedStringWithUrlHighlighting(
                 if (inInsideRange != null) {
                     val percentInRange =
                         (offset - inInsideRange.original.start) / (inInsideRange.original.length.toFloat())
-                    return (inInsideRange.modified.start + inInsideRange.modified.length * percentInRange)
-                        .roundToInt()
+                    return (inInsideRange.modified.start + inInsideRange.modified.length * percentInRange).toInt()
                 }
 
                 val lastRangeThrough = substitutions.lastOrNull { offset >= it.original.end }
 
-                if (lastRangeThrough != null) {
-                    return lastRangeThrough.modified.end + (offset - lastRangeThrough.original.end)
+                return if (lastRangeThrough != null) {
+                    lastRangeThrough.modified.end + (offset - lastRangeThrough.original.end)
                 } else {
-                    return offset
+                    offset
                 }
             }
 
@@ -164,16 +160,15 @@ fun buildAnnotatedStringWithUrlHighlighting(
                 if (inInsideRange != null) {
                     val percentInRange =
                         (offset - inInsideRange.modified.start) / (inInsideRange.modified.length.toFloat())
-                    return (inInsideRange.original.start + inInsideRange.original.length * percentInRange)
-                        .roundToInt()
+                    return (inInsideRange.original.start + inInsideRange.original.length * percentInRange).toInt()
                 }
 
                 val lastRangeThrough = substitutions.lastOrNull { offset >= it.modified.end }
 
-                if (lastRangeThrough != null) {
-                    return lastRangeThrough.original.end + (offset - lastRangeThrough.modified.end)
+                return if (lastRangeThrough != null) {
+                    lastRangeThrough.original.end + (offset - lastRangeThrough.modified.end)
                 } else {
-                    return offset
+                    offset
                 }
             }
         }

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

@@ -0,0 +1,139 @@
+/**
+ * Copyright (c) 2024 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.ui.actions.relays
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.Card
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Text
+import androidx.compose.material3.TopAppBar
+import androidx.compose.material3.TopAppBarDefaults
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.window.Dialog
+import androidx.compose.ui.window.DialogProperties
+import androidx.lifecycle.viewmodel.compose.viewModel
+import com.vitorpamplona.amethyst.R
+import com.vitorpamplona.amethyst.ui.actions.CloseButton
+import com.vitorpamplona.amethyst.ui.actions.SaveButton
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
+import com.vitorpamplona.amethyst.ui.theme.StdHorzSpacer
+import com.vitorpamplona.amethyst.ui.theme.StdVertSpacer
+import com.vitorpamplona.amethyst.ui.theme.imageModifier
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun AddDMRelayListDialog(
+    onClose: () -> Unit,
+    accountViewModel: AccountViewModel,
+    nav: (String) -> Unit,
+) {
+    val postViewModel: DMRelayListViewModel = viewModel()
+
+    LaunchedEffect(Unit) { postViewModel.load(accountViewModel.account) }
+
+    Dialog(
+        onDismissRequest = onClose,
+        properties = DialogProperties(usePlatformDefaultWidth = false),
+    ) {
+        Scaffold(
+            topBar = {
+                TopAppBar(
+                    title = {
+                        Row(
+                            modifier = Modifier.fillMaxWidth(),
+                            horizontalArrangement = Arrangement.SpaceBetween,
+                            verticalAlignment = Alignment.CenterVertically,
+                        ) {
+                            Spacer(modifier = StdHorzSpacer)
+
+                            Text(stringResource(R.string.dm_relays_title))
+
+                            SaveButton(
+                                onPost = {
+                                    postViewModel.create()
+                                    onClose()
+                                },
+                                true,
+                            )
+                        }
+                    },
+                    navigationIcon = {
+                        Spacer(modifier = StdHorzSpacer)
+                        CloseButton(
+                            onPress = {
+                                postViewModel.clear()
+                                onClose()
+                            },
+                        )
+                    },
+                    colors =
+                        TopAppBarDefaults.topAppBarColors(
+                            containerColor = MaterialTheme.colorScheme.surface,
+                        ),
+                )
+            },
+        ) { pad ->
+            Column(
+                modifier =
+                    Modifier.padding(
+                        16.dp,
+                        pad.calculateTopPadding(),
+                        16.dp,
+                        pad.calculateBottomPadding(),
+                    ),
+                verticalArrangement = Arrangement.SpaceAround,
+            ) {
+                Explanation()
+
+                DMRelayList(postViewModel, accountViewModel, onClose, nav)
+            }
+        }
+    }
+}
+
+@Composable
+private fun Explanation() {
+    Card(modifier = MaterialTheme.colorScheme.imageModifier) {
+        Column(modifier = Modifier.padding(16.dp)) {
+            Text(
+                text = stringResource(id = R.string.dm_relays_not_found_editing),
+            )
+
+            Spacer(modifier = StdVertSpacer)
+
+            Text(
+                text = stringResource(id = R.string.dm_relays_not_found_examples),
+            )
+        }
+    }
+}

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

@@ -0,0 +1,139 @@
+/**
+ * Copyright (c) 2024 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.ui.actions.relays
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.Card
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Text
+import androidx.compose.material3.TopAppBar
+import androidx.compose.material3.TopAppBarDefaults
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.window.Dialog
+import androidx.compose.ui.window.DialogProperties
+import androidx.lifecycle.viewmodel.compose.viewModel
+import com.vitorpamplona.amethyst.R
+import com.vitorpamplona.amethyst.ui.actions.CloseButton
+import com.vitorpamplona.amethyst.ui.actions.SaveButton
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
+import com.vitorpamplona.amethyst.ui.theme.StdHorzSpacer
+import com.vitorpamplona.amethyst.ui.theme.StdVertSpacer
+import com.vitorpamplona.amethyst.ui.theme.imageModifier
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun AddSearchRelayListDialog(
+    onClose: () -> Unit,
+    accountViewModel: AccountViewModel,
+    nav: (String) -> Unit,
+) {
+    val postViewModel: SearchRelayListViewModel = viewModel()
+
+    LaunchedEffect(Unit) { postViewModel.load(accountViewModel.account) }
+
+    Dialog(
+        onDismissRequest = onClose,
+        properties = DialogProperties(usePlatformDefaultWidth = false),
+    ) {
+        Scaffold(
+            topBar = {
+                TopAppBar(
+                    title = {
+                        Row(
+                            modifier = Modifier.fillMaxWidth(),
+                            horizontalArrangement = Arrangement.SpaceBetween,
+                            verticalAlignment = Alignment.CenterVertically,
+                        ) {
+                            Spacer(modifier = StdHorzSpacer)
+
+                            Text(stringResource(R.string.search_relays_title))
+
+                            SaveButton(
+                                onPost = {
+                                    postViewModel.create()
+                                    onClose()
+                                },
+                                true,
+                            )
+                        }
+                    },
+                    navigationIcon = {
+                        Spacer(modifier = StdHorzSpacer)
+                        CloseButton(
+                            onPress = {
+                                postViewModel.clear()
+                                onClose()
+                            },
+                        )
+                    },
+                    colors =
+                        TopAppBarDefaults.topAppBarColors(
+                            containerColor = MaterialTheme.colorScheme.surface,
+                        ),
+                )
+            },
+        ) { pad ->
+            Column(
+                modifier =
+                    Modifier.padding(
+                        16.dp,
+                        pad.calculateTopPadding(),
+                        16.dp,
+                        pad.calculateBottomPadding(),
+                    ),
+                verticalArrangement = Arrangement.SpaceAround,
+            ) {
+                Explanation()
+
+                SearchRelayList(postViewModel, accountViewModel, onClose, nav)
+            }
+        }
+    }
+}
+
+@Composable
+private fun Explanation() {
+    Card(modifier = MaterialTheme.colorScheme.imageModifier) {
+        Column(modifier = Modifier.padding(16.dp)) {
+            Text(
+                text = stringResource(id = R.string.search_relays_not_found_editing),
+            )
+
+            Spacer(modifier = StdVertSpacer)
+
+            Text(
+                text = stringResource(id = R.string.search_relays_not_found_examples),
+            )
+        }
+    }
+}

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

@@ -0,0 +1,308 @@
+/**
+ * Copyright (c) 2024 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.ui.actions.relays
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.OutlinedButton
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Text
+import androidx.compose.material3.TopAppBar
+import androidx.compose.material3.TopAppBarDefaults
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.window.Dialog
+import androidx.compose.ui.window.DialogProperties
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import androidx.lifecycle.viewmodel.compose.viewModel
+import com.vitorpamplona.amethyst.R
+import com.vitorpamplona.amethyst.service.relays.Constants
+import com.vitorpamplona.amethyst.service.relays.RelayStat
+import com.vitorpamplona.amethyst.ui.actions.CloseButton
+import com.vitorpamplona.amethyst.ui.actions.SaveButton
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
+import com.vitorpamplona.amethyst.ui.theme.FeedPadding
+import com.vitorpamplona.amethyst.ui.theme.MinHorzSpacer
+import com.vitorpamplona.amethyst.ui.theme.RowColSpacing
+import com.vitorpamplona.amethyst.ui.theme.StdHorzSpacer
+import com.vitorpamplona.amethyst.ui.theme.grayText
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun AllRelayListView(
+    onClose: () -> Unit,
+    relayToAdd: String = "",
+    accountViewModel: AccountViewModel,
+    nav: (String) -> Unit,
+) {
+    val kind3ViewModel: Kind3RelayListViewModel = viewModel()
+    val kind3FeedState by kind3ViewModel.relays.collectAsStateWithLifecycle()
+
+    val dmViewModel: DMRelayListViewModel = viewModel()
+    val dmFeedState by dmViewModel.relays.collectAsStateWithLifecycle()
+
+    val nip65ViewModel: Nip65RelayListViewModel = viewModel()
+    val homeFeedState by nip65ViewModel.homeRelays.collectAsStateWithLifecycle()
+    val notifFeedState by nip65ViewModel.notificationRelays.collectAsStateWithLifecycle()
+
+    val privateOutboxViewModel: PrivateOutboxRelayListViewModel = viewModel()
+    val privateOutboxFeedState by privateOutboxViewModel.relays.collectAsStateWithLifecycle()
+
+    val searchViewModel: SearchRelayListViewModel = viewModel()
+    val searchFeedState by searchViewModel.relays.collectAsStateWithLifecycle()
+
+    val localViewModel: LocalRelayListViewModel = viewModel()
+    val localFeedState by localViewModel.relays.collectAsStateWithLifecycle()
+
+    LaunchedEffect(Unit) {
+        kind3ViewModel.load(accountViewModel.account)
+        dmViewModel.load(accountViewModel.account)
+        nip65ViewModel.load(accountViewModel.account)
+        searchViewModel.load(accountViewModel.account)
+        localViewModel.load(accountViewModel.account)
+        privateOutboxViewModel.load(accountViewModel.account)
+    }
+
+    Dialog(
+        onDismissRequest = onClose,
+        properties = DialogProperties(usePlatformDefaultWidth = false),
+    ) {
+        Scaffold(
+            topBar = {
+                TopAppBar(
+                    title = {
+                        Row(
+                            modifier = Modifier.fillMaxWidth(),
+                            horizontalArrangement = Arrangement.SpaceBetween,
+                            verticalAlignment = Alignment.CenterVertically,
+                        ) {
+                            Spacer(modifier = MinHorzSpacer)
+
+                            Text(
+                                text = stringResource(R.string.relay_settings),
+                                style = MaterialTheme.typography.titleLarge,
+                            )
+
+                            SaveButton(
+                                onPost = {
+                                    kind3ViewModel.create()
+                                    dmViewModel.create()
+                                    nip65ViewModel.create()
+                                    searchViewModel.create()
+                                    localViewModel.create()
+                                    privateOutboxViewModel.create()
+                                    onClose()
+                                },
+                                true,
+                            )
+                        }
+                    },
+                    navigationIcon = {
+                        Row {
+                            Spacer(modifier = StdHorzSpacer)
+                            CloseButton(
+                                onPress = {
+                                    kind3ViewModel.clear()
+                                    dmViewModel.clear()
+                                    nip65ViewModel.clear()
+                                    searchViewModel.clear()
+                                    localViewModel.clear()
+                                    privateOutboxViewModel.clear()
+                                    onClose()
+                                },
+                            )
+                        }
+                    },
+                    colors =
+                        TopAppBarDefaults.topAppBarColors(
+                            containerColor = MaterialTheme.colorScheme.surface,
+                        ),
+                )
+            },
+        ) { pad ->
+            Column(
+                modifier =
+                    Modifier
+                        .fillMaxSize()
+                        .padding(
+                            16.dp,
+                            pad.calculateTopPadding(),
+                            16.dp,
+                            pad.calculateBottomPadding(),
+                        ),
+                verticalArrangement = Arrangement.SpaceAround,
+            ) {
+                LazyColumn(contentPadding = FeedPadding) {
+                    item {
+                        SettingsCategory(
+                            stringResource(R.string.public_home_section),
+                            stringResource(R.string.public_home_section_explainer),
+                            Modifier.padding(bottom = 8.dp),
+                        )
+                    }
+                    renderNip65HomeItems(homeFeedState, nip65ViewModel, accountViewModel, onClose, nav)
+
+                    item {
+                        SettingsCategory(
+                            stringResource(R.string.public_notif_section),
+                            stringResource(R.string.public_notif_section_explainer),
+                        )
+                    }
+                    renderNip65NotifItems(notifFeedState, nip65ViewModel, accountViewModel, onClose, nav)
+
+                    item {
+                        SettingsCategory(
+                            stringResource(R.string.private_inbox_section),
+                            stringResource(R.string.private_inbox_section_explainer),
+                        )
+                    }
+                    renderDMItems(dmFeedState, dmViewModel, accountViewModel, onClose, nav)
+
+                    item {
+                        SettingsCategory(
+                            stringResource(R.string.private_outbox_section),
+                            stringResource(R.string.private_outbox_section_explainer),
+                        )
+                    }
+                    renderPrivateOutboxItems(privateOutboxFeedState, privateOutboxViewModel, accountViewModel, onClose, nav)
+
+                    item {
+                        SettingsCategoryWithButton(
+                            stringResource(R.string.search_section),
+                            stringResource(R.string.search_section_explainer),
+                            action = {
+                                ResetSearchRelays(searchViewModel)
+                            },
+                        )
+                    }
+                    renderSearchItems(searchFeedState, searchViewModel, accountViewModel, onClose, nav)
+
+                    item {
+                        SettingsCategory(
+                            stringResource(R.string.local_section),
+                            stringResource(R.string.local_section_explainer),
+                        )
+                    }
+                    renderLocalItems(localFeedState, localViewModel, accountViewModel, onClose, nav)
+
+                    item {
+                        SettingsCategoryWithButton(
+                            stringResource(R.string.kind_3_section),
+                            stringResource(R.string.kind_3_section_description),
+                            action = {
+                                ResetKind3Relays(kind3ViewModel)
+                            },
+                        )
+                    }
+                    renderKind3Items(kind3FeedState, kind3ViewModel, accountViewModel, onClose, nav, relayToAdd)
+                }
+            }
+        }
+    }
+}
+
+@Composable
+fun ResetKind3Relays(postViewModel: Kind3RelayListViewModel) {
+    OutlinedButton(
+        onClick = {
+            postViewModel.deleteAll()
+            postViewModel.addAll(Constants.defaultRelays)
+            postViewModel.loadRelayDocuments()
+        },
+    ) {
+        Text(stringResource(R.string.default_relays))
+    }
+}
+
+@Composable
+fun ResetSearchRelays(postViewModel: SearchRelayListViewModel) {
+    OutlinedButton(
+        onClick = {
+            postViewModel.deleteAll()
+            Constants.defaultSearchRelaySet.forEach { postViewModel.addRelay(BasicRelaySetupInfo(it, RelayStat())) }
+            postViewModel.loadRelayDocuments()
+        },
+    ) {
+        Text(stringResource(R.string.default_relays))
+    }
+}
+
+@Composable
+fun SettingsCategory(
+    title: String,
+    description: String? = null,
+    modifier: Modifier = Modifier.padding(top = 24.dp, bottom = 8.dp),
+) {
+    Column(modifier) {
+        Text(
+            text = title,
+            color = MaterialTheme.colorScheme.primary,
+            style = MaterialTheme.typography.titleSmall,
+        )
+        if (description != null) {
+            Text(
+                description,
+                style = MaterialTheme.typography.bodyMedium,
+                color = MaterialTheme.colorScheme.grayText,
+            )
+        }
+    }
+}
+
+@Composable
+fun SettingsCategoryWithButton(
+    title: String,
+    description: String? = null,
+    action: @Composable () -> Unit,
+    modifier: Modifier = Modifier.padding(top = 24.dp, bottom = 8.dp),
+) {
+    Row(modifier, horizontalArrangement = RowColSpacing) {
+        Column(modifier = Modifier.weight(1f)) {
+            Text(
+                text = title,
+                color = MaterialTheme.colorScheme.primary,
+                style = MaterialTheme.typography.titleSmall,
+            )
+            if (description != null) {
+                Text(
+                    text = description,
+                    style = MaterialTheme.typography.bodyMedium,
+                    color = MaterialTheme.colorScheme.grayText,
+                )
+            }
+        }
+
+        action()
+    }
+}

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

@@ -0,0 +1,47 @@
+/**
+ * Copyright (c) 2024 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.ui.actions.relays
+
+import androidx.compose.runtime.Immutable
+import com.vitorpamplona.amethyst.model.RelayBriefInfoCache
+import com.vitorpamplona.amethyst.service.relays.FeedType
+import com.vitorpamplona.amethyst.service.relays.RelayStat
+
+@Immutable
+data class BasicRelaySetupInfo(
+    val url: String,
+    val relayStat: RelayStat,
+    val paidRelay: Boolean = false,
+) {
+    val briefInfo: RelayBriefInfoCache.RelayBriefInfo = RelayBriefInfoCache.RelayBriefInfo(url)
+}
+
+@Immutable
+data class Kind3BasicRelaySetupInfo(
+    val url: String,
+    val read: Boolean,
+    val write: Boolean,
+    val feedTypes: Set<FeedType>,
+    val relayStat: RelayStat,
+    val paidRelay: Boolean = false,
+) {
+    val briefInfo: RelayBriefInfoCache.RelayBriefInfo = RelayBriefInfoCache.RelayBriefInfo(url)
+}

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

@@ -0,0 +1,97 @@
+/**
+ * Copyright (c) 2024 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.ui.actions.relays
+
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.HorizontalDivider
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
+import com.vitorpamplona.amethyst.service.Nip11CachedRetriever
+import com.vitorpamplona.amethyst.ui.note.RenderRelayIcon
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
+import com.vitorpamplona.amethyst.ui.theme.DividerThickness
+import com.vitorpamplona.amethyst.ui.theme.HalfHorzPadding
+import com.vitorpamplona.amethyst.ui.theme.HalfStartPadding
+import com.vitorpamplona.amethyst.ui.theme.ReactionRowHeightChat
+import com.vitorpamplona.amethyst.ui.theme.largeRelayIconModifier
+
+@Composable
+fun BasicRelaySetupInfoClickableRow(
+    item: BasicRelaySetupInfo,
+    loadProfilePicture: Boolean,
+    onDelete: (BasicRelaySetupInfo) -> Unit,
+    onClick: () -> Unit,
+    accountViewModel: AccountViewModel,
+) {
+    Column(Modifier.fillMaxWidth()) {
+        Row(
+            verticalAlignment = Alignment.CenterVertically,
+            modifier = Modifier.padding(vertical = 5.dp),
+        ) {
+            Column(Modifier.clickable(onClick = onClick)) {
+                val iconUrlFromRelayInfoDoc =
+                    remember(item) {
+                        Nip11CachedRetriever.getFromCache(item.url)?.icon
+                    }
+
+                RenderRelayIcon(
+                    item.briefInfo.displayUrl,
+                    iconUrlFromRelayInfoDoc ?: item.briefInfo.favIcon,
+                    loadProfilePicture,
+                    MaterialTheme.colorScheme.largeRelayIconModifier,
+                )
+            }
+
+            Spacer(modifier = HalfHorzPadding)
+
+            Column(Modifier.weight(1f)) {
+                RelayNameAndRemoveButton(
+                    item,
+                    onClick,
+                    onDelete,
+                    ReactionRowHeightChat.fillMaxWidth(),
+                )
+
+                Row(
+                    verticalAlignment = Alignment.CenterVertically,
+                    modifier = ReactionRowHeightChat.fillMaxWidth(),
+                ) {
+                    RelayStatusRow(
+                        item = item,
+                        modifier = HalfStartPadding.weight(1f),
+                        accountViewModel = accountViewModel,
+                    )
+                }
+            }
+        }
+
+        HorizontalDivider(thickness = DividerThickness)
+    }
+}

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

@@ -0,0 +1,111 @@
+/**
+ * Copyright (c) 2024 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.ui.actions.relays
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.platform.LocalContext
+import com.vitorpamplona.amethyst.R
+import com.vitorpamplona.amethyst.model.RelayBriefInfoCache
+import com.vitorpamplona.amethyst.service.Nip11Retriever
+import com.vitorpamplona.amethyst.ui.actions.RelayInfoDialog
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
+
+@Composable
+fun BasicRelaySetupInfoDialog(
+    item: BasicRelaySetupInfo,
+    onDelete: (BasicRelaySetupInfo) -> Unit,
+    accountViewModel: AccountViewModel,
+    nav: (String) -> Unit,
+) {
+    var relayInfo: RelayInfoDialog? by remember { mutableStateOf(null) }
+    val context = LocalContext.current
+
+    relayInfo?.let {
+        RelayInformationDialog(
+            onClose = { relayInfo = null },
+            relayInfo = it.relayInfo,
+            relayBriefInfo = it.relayBriefInfo,
+            accountViewModel = accountViewModel,
+            nav = nav,
+        )
+    }
+
+    val automaticallyShowProfilePicture =
+        remember {
+            accountViewModel.settings.showProfilePictures.value
+        }
+
+    BasicRelaySetupInfoClickableRow(
+        item = item,
+        loadProfilePicture = automaticallyShowProfilePicture,
+        onDelete = onDelete,
+        accountViewModel = accountViewModel,
+        onClick = {
+            accountViewModel.retrieveRelayDocument(
+                item.url,
+                onInfo = {
+                    relayInfo = RelayInfoDialog(RelayBriefInfoCache.RelayBriefInfo(item.url), it)
+                },
+                onError = { url, errorCode, exceptionMessage ->
+                    val msg =
+                        when (errorCode) {
+                            Nip11Retriever.ErrorCode.FAIL_TO_ASSEMBLE_URL ->
+                                context.getString(
+                                    R.string.relay_information_document_error_assemble_url,
+                                    url,
+                                    exceptionMessage,
+                                )
+
+                            Nip11Retriever.ErrorCode.FAIL_TO_REACH_SERVER ->
+                                context.getString(
+                                    R.string.relay_information_document_error_assemble_url,
+                                    url,
+                                    exceptionMessage,
+                                )
+
+                            Nip11Retriever.ErrorCode.FAIL_TO_PARSE_RESULT ->
+                                context.getString(
+                                    R.string.relay_information_document_error_assemble_url,
+                                    url,
+                                    exceptionMessage,
+                                )
+
+                            Nip11Retriever.ErrorCode.FAIL_WITH_HTTP_STATUS ->
+                                context.getString(
+                                    R.string.relay_information_document_error_assemble_url,
+                                    url,
+                                    exceptionMessage,
+                                )
+                        }
+
+                    accountViewModel.toast(
+                        context.getString(R.string.unable_to_download_relay_document),
+                        msg,
+                    )
+                },
+            )
+        },
+    )
+}

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

@@ -0,0 +1,113 @@
+/**
+ * Copyright (c) 2024 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.ui.actions.relays
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.vitorpamplona.amethyst.model.Account
+import com.vitorpamplona.amethyst.service.Nip11CachedRetriever
+import com.vitorpamplona.amethyst.service.relays.RelayStats
+import com.vitorpamplona.quartz.encoders.RelayUrlFormatter
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.launch
+
+abstract class BasicRelaySetupInfoModel : ViewModel() {
+    lateinit var account: Account
+
+    private val _relays = MutableStateFlow<List<BasicRelaySetupInfo>>(emptyList())
+    val relays = _relays.asStateFlow()
+
+    var hasModified = false
+
+    fun load(account: Account) {
+        this.account = account
+        clear()
+        loadRelayDocuments()
+    }
+
+    abstract fun getRelayList(): List<String>?
+
+    abstract fun saveRelayList(urlList: List<String>)
+
+    fun create() {
+        if (hasModified) {
+            viewModelScope.launch(Dispatchers.IO) {
+                saveRelayList(_relays.value.map { it.url })
+                clear()
+            }
+        }
+    }
+
+    fun loadRelayDocuments() {
+        viewModelScope.launch(Dispatchers.IO) {
+            _relays.value.forEach { item ->
+                Nip11CachedRetriever.loadRelayInfo(
+                    dirtyUrl = item.url,
+                    onInfo = {
+                        togglePaidRelay(item, it.limitation?.payment_required ?: false)
+                    },
+                    onError = { url, errorCode, exceptionMessage -> },
+                )
+            }
+        }
+    }
+
+    fun clear() {
+        var hasModified = false
+        _relays.update {
+            val relayList = getRelayList() ?: emptyList()
+
+            relayList.map { relayUrl ->
+                BasicRelaySetupInfo(
+                    RelayUrlFormatter.normalize(relayUrl),
+                    RelayStats.get(relayUrl),
+                )
+            }.distinctBy { it.url }.sortedBy { it.relayStat.receivedBytes }.reversed()
+        }
+    }
+
+    fun addRelay(relay: BasicRelaySetupInfo) {
+        if (relays.value.any { it.url == relay.url }) return
+
+        _relays.update { it.plus(relay) }
+        hasModified = true
+    }
+
+    fun deleteRelay(relay: BasicRelaySetupInfo) {
+        _relays.update { it.minus(relay) }
+        hasModified = true
+    }
+
+    fun deleteAll() {
+        _relays.update { relays -> emptyList() }
+        hasModified = true
+    }
+
+    fun togglePaidRelay(
+        relay: BasicRelaySetupInfo,
+        paid: Boolean,
+    ) {
+        _relays.update { it.updated(relay, relay.copy(paidRelay = paid)) }
+    }
+}

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

@@ -0,0 +1,57 @@
+/**
+ * Copyright (c) 2024 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.ui.actions.relays
+
+fun countToHumanReadableBytes(counter: Int) =
+    when {
+        counter >= 1000000000 -> "${Math.round(counter / 1000000000f)} GB"
+        counter >= 1000000 -> "${Math.round(counter / 1000000f)} MB"
+        counter >= 1000 -> "${Math.round(counter / 1000f)} KB"
+        else -> "$counter"
+    }
+
+fun countToHumanReadableBytes(counter: Long) =
+    when {
+        counter >= 1000000000 -> "${Math.round(counter / 1000000000f)} GB"
+        counter >= 1000000 -> "${Math.round(counter / 1000000f)} MB"
+        counter >= 1000 -> "${Math.round(counter / 1000f)} KB"
+        else -> "$counter"
+    }
+
+fun countToHumanReadable(
+    counter: Int,
+    str: String,
+) = when {
+    counter >= 1000000000 -> "${Math.round(counter / 1000000000f)}G $str"
+    counter >= 1000000 -> "${Math.round(counter / 1000000f)}M $str"
+    counter >= 1000 -> "${Math.round(counter / 1000f)}K $str"
+    else -> "$counter $str"
+}
+
+fun countToHumanReadable(
+    counter: Long,
+    str: String,
+) = when {
+    counter >= 1000000000 -> "${Math.round(counter / 1000000000f)}G $str"
+    counter >= 1000000 -> "${Math.round(counter / 1000000f)}M $str"
+    counter >= 1000 -> "${Math.round(counter / 1000f)}K $str"
+    else -> "$counter $str"
+}

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

@@ -0,0 +1,77 @@
+/**
+ * Copyright (c) 2024 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.ui.actions.relays
+
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.LazyListScope
+import androidx.compose.foundation.lazy.itemsIndexed
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
+import com.vitorpamplona.amethyst.ui.theme.FeedPadding
+import com.vitorpamplona.amethyst.ui.theme.StdVertSpacer
+
+@Composable
+fun DMRelayList(
+    postViewModel: DMRelayListViewModel,
+    accountViewModel: AccountViewModel,
+    onClose: () -> Unit,
+    nav: (String) -> Unit,
+) {
+    val feedState by postViewModel.relays.collectAsStateWithLifecycle()
+
+    Row(verticalAlignment = Alignment.CenterVertically) {
+        LazyColumn(
+            contentPadding = FeedPadding,
+        ) {
+            renderDMItems(feedState, postViewModel, accountViewModel, onClose, nav)
+        }
+    }
+}
+
+fun LazyListScope.renderDMItems(
+    feedState: List<BasicRelaySetupInfo>,
+    postViewModel: DMRelayListViewModel,
+    accountViewModel: AccountViewModel,
+    onClose: () -> Unit,
+    nav: (String) -> Unit,
+) {
+    itemsIndexed(feedState, key = { _, item -> "DM" + item.url }) { index, item ->
+        BasicRelaySetupInfoDialog(
+            item,
+            onDelete = { postViewModel.deleteRelay(item) },
+            accountViewModel = accountViewModel,
+        ) {
+            onClose()
+            nav(it)
+        }
+    }
+
+    item {
+        Spacer(modifier = StdVertSpacer)
+        RelayUrlEditField { postViewModel.addRelay(it) }
+    }
+}

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

@@ -0,0 +1,31 @@
+/**
+ * Copyright (c) 2024 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.ui.actions.relays
+
+class DMRelayListViewModel : BasicRelaySetupInfoModel() {
+    override fun getRelayList(): List<String>? {
+        return account.getDMRelayList()?.relays()
+    }
+
+    override fun saveRelayList(urlList: List<String>) {
+        account.saveDMRelayList(urlList)
+    }
+}

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

@@ -18,13 +18,12 @@
  * 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.actions
+package com.vitorpamplona.amethyst.ui.actions.relays
 
 import android.widget.Toast
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.combinedClickable
-import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
@@ -32,6 +31,7 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.LazyListScope
 import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Cancel
@@ -40,23 +40,17 @@ import androidx.compose.material.icons.filled.Download
 import androidx.compose.material.icons.filled.Groups
 import androidx.compose.material.icons.filled.Paid
 import androidx.compose.material.icons.filled.Public
-import androidx.compose.material.icons.filled.Search
 import androidx.compose.material.icons.filled.SyncProblem
 import androidx.compose.material.icons.filled.Upload
 import androidx.compose.material3.Button
 import androidx.compose.material3.ButtonDefaults
-import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.OutlinedTextField
-import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
-import androidx.compose.material3.TopAppBar
-import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
@@ -72,224 +66,98 @@ import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import androidx.compose.ui.window.Dialog
-import androidx.compose.ui.window.DialogProperties
-import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import androidx.lifecycle.viewmodel.compose.viewModel
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.model.RelayBriefInfoCache
-import com.vitorpamplona.amethyst.model.RelaySetupInfo
 import com.vitorpamplona.amethyst.service.Nip11CachedRetriever
 import com.vitorpamplona.amethyst.service.Nip11Retriever
 import com.vitorpamplona.amethyst.service.relays.Constants
-import com.vitorpamplona.amethyst.service.relays.Constants.defaultRelays
 import com.vitorpamplona.amethyst.service.relays.FeedType
+import com.vitorpamplona.amethyst.service.relays.RelayStat
+import com.vitorpamplona.amethyst.ui.actions.RelayInfoDialog
 import com.vitorpamplona.amethyst.ui.note.RenderRelayIcon
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.theme.ButtonBorder
 import com.vitorpamplona.amethyst.ui.theme.DividerThickness
 import com.vitorpamplona.amethyst.ui.theme.FeedPadding
-import com.vitorpamplona.amethyst.ui.theme.Font14SP
 import com.vitorpamplona.amethyst.ui.theme.HalfHorzPadding
 import com.vitorpamplona.amethyst.ui.theme.HalfStartPadding
 import com.vitorpamplona.amethyst.ui.theme.ReactionRowHeightChat
 import com.vitorpamplona.amethyst.ui.theme.Size30Modifier
 import com.vitorpamplona.amethyst.ui.theme.Size35dp
-import com.vitorpamplona.amethyst.ui.theme.StdHorzSpacer
 import com.vitorpamplona.amethyst.ui.theme.StdVertSpacer
 import com.vitorpamplona.amethyst.ui.theme.WarningColor
 import com.vitorpamplona.amethyst.ui.theme.allGoodColor
 import com.vitorpamplona.amethyst.ui.theme.largeRelayIconModifier
 import com.vitorpamplona.amethyst.ui.theme.placeholderText
 import com.vitorpamplona.amethyst.ui.theme.warningColor
+import com.vitorpamplona.quartz.encoders.RelayUrlFormatter
 import kotlinx.coroutines.launch
-import java.lang.Math.round
 
-@OptIn(ExperimentalMaterial3Api::class)
 @Composable
-fun NewRelayListView(
-    onClose: () -> Unit,
+fun Kind3RelayListView(
+    feedState: List<Kind3BasicRelaySetupInfo>,
+    postViewModel: Kind3RelayListViewModel,
     accountViewModel: AccountViewModel,
-    relayToAdd: String = "",
+    onClose: () -> Unit,
     nav: (String) -> Unit,
+    relayToAdd: String,
 ) {
-    val postViewModel: NewRelayListViewModel = viewModel()
-    val feedState by postViewModel.relays.collectAsStateWithLifecycle()
-
-    LaunchedEffect(Unit) { postViewModel.load(accountViewModel.account) }
-
-    Dialog(
-        onDismissRequest = onClose,
-        properties = DialogProperties(usePlatformDefaultWidth = false),
-    ) {
-        Scaffold(
-            topBar = {
-                TopAppBar(
-                    title = {
-                        Row(
-                            modifier = Modifier.fillMaxWidth(),
-                            horizontalArrangement = Arrangement.SpaceBetween,
-                            verticalAlignment = Alignment.CenterVertically,
-                        ) {
-                            Spacer(modifier = StdHorzSpacer)
-
-                            Button(
-                                onClick = {
-                                    postViewModel.deleteAll()
-                                    defaultRelays.forEach { postViewModel.addRelay(it) }
-                                    postViewModel.loadRelayDocuments()
-                                },
-                            ) {
-                                Text(stringResource(R.string.default_relays))
-                            }
-
-                            SaveButton(
-                                onPost = {
-                                    postViewModel.create()
-                                    onClose()
-                                },
-                                true,
-                            )
-                        }
-                    },
-                    navigationIcon = {
-                        Spacer(modifier = StdHorzSpacer)
-                        CloseButton(
-                            onPress = {
-                                postViewModel.clear()
-                                onClose()
-                            },
-                        )
-                    },
-                    colors =
-                        TopAppBarDefaults.topAppBarColors(
-                            containerColor = MaterialTheme.colorScheme.surface,
-                        ),
-                )
-            },
-        ) { pad ->
-            Column(
-                modifier =
-                    Modifier.padding(
-                        16.dp,
-                        pad.calculateTopPadding(),
-                        16.dp,
-                        pad.calculateBottomPadding(),
-                    ),
-                verticalArrangement = Arrangement.SpaceAround,
-            ) {
-                Row(modifier = Modifier.weight(1f), verticalAlignment = Alignment.CenterVertically) {
-                    LazyColumn(
-                        contentPadding = FeedPadding,
-                    ) {
-                        itemsIndexed(feedState, key = { _, item -> item.url }) { index, item ->
-                            ServerConfig(
-                                item,
-                                onToggleDownload = { postViewModel.toggleDownload(it) },
-                                onToggleUpload = { postViewModel.toggleUpload(it) },
-                                onToggleFollows = { postViewModel.toggleFollows(it) },
-                                onTogglePrivateDMs = { postViewModel.toggleMessages(it) },
-                                onTogglePublicChats = { postViewModel.togglePublicChats(it) },
-                                onToggleGlobal = { postViewModel.toggleGlobal(it) },
-                                onToggleSearch = { postViewModel.toggleSearch(it) },
-                                onDelete = { postViewModel.deleteRelay(it) },
-                                accountViewModel = accountViewModel,
-                            ) {
-                                onClose()
-                                nav(it)
-                            }
-                        }
-                    }
-                }
-
-                Spacer(modifier = StdVertSpacer)
-
-                EditableServerConfig(relayToAdd) { postViewModel.addRelay(it) }
-            }
+    Row(modifier = Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically) {
+        LazyColumn(contentPadding = FeedPadding) {
+            renderKind3Items(feedState, postViewModel, accountViewModel, onClose, nav, relayToAdd)
         }
     }
 }
 
-@Composable
-fun ServerConfigHeader() {
-    Column(Modifier.fillMaxWidth()) {
-        Row(verticalAlignment = Alignment.CenterVertically) {
-            Column(Modifier.weight(1f)) {
-                Row(verticalAlignment = Alignment.CenterVertically) {
-                    Text(
-                        text = stringResource(R.string.relay_address),
-                        modifier = Modifier.weight(1f),
-                        maxLines = 1,
-                        overflow = TextOverflow.Ellipsis,
-                    )
-                }
-            }
-
-            Column(Modifier.weight(1.4f)) {
-                Row(verticalAlignment = Alignment.CenterVertically) {
-                    Spacer(modifier = Modifier.size(30.dp))
-
-                    Text(
-                        text = stringResource(R.string.bytes),
-                        maxLines = 1,
-                        fontSize = Font14SP,
-                        modifier = Modifier.weight(1.2f),
-                        color = MaterialTheme.colorScheme.placeholderText,
-                    )
-
-                    Spacer(modifier = Modifier.size(5.dp))
-
-                    Text(
-                        text = stringResource(id = R.string.bytes),
-                        maxLines = 1,
-                        fontSize = Font14SP,
-                        modifier = Modifier.weight(1.2f),
-                        color = MaterialTheme.colorScheme.placeholderText,
-                    )
-
-                    Spacer(modifier = Modifier.size(5.dp))
-
-                    Text(
-                        text = stringResource(R.string.errors),
-                        maxLines = 1,
-                        fontSize = Font14SP,
-                        modifier = Modifier.weight(1f),
-                        color = MaterialTheme.colorScheme.placeholderText,
-                    )
-
-                    Spacer(modifier = Modifier.size(5.dp))
-
-                    Text(
-                        text = stringResource(R.string.spam),
-                        maxLines = 1,
-                        fontSize = Font14SP,
-                        modifier = Modifier.weight(1f),
-                        color = MaterialTheme.colorScheme.placeholderText,
-                    )
-
-                    Spacer(modifier = Modifier.size(2.dp))
-                }
-            }
+fun LazyListScope.renderKind3Items(
+    feedState: List<Kind3BasicRelaySetupInfo>,
+    postViewModel: Kind3RelayListViewModel,
+    accountViewModel: AccountViewModel,
+    onClose: () -> Unit,
+    nav: (String) -> Unit,
+    relayToAdd: String,
+) {
+    itemsIndexed(feedState, key = { _, item -> "kind3" + item.url }) { index, item ->
+        LoadRelayInfo(
+            item,
+            onToggleDownload = { postViewModel.toggleDownload(it) },
+            onToggleUpload = { postViewModel.toggleUpload(it) },
+            onToggleFollows = { postViewModel.toggleFollows(it) },
+            onTogglePrivateDMs = { postViewModel.toggleMessages(it) },
+            onTogglePublicChats = { postViewModel.togglePublicChats(it) },
+            onToggleGlobal = { postViewModel.toggleGlobal(it) },
+            onToggleSearch = { postViewModel.toggleSearch(it) },
+            onDelete = { postViewModel.deleteRelay(it) },
+            accountViewModel = accountViewModel,
+        ) {
+            onClose()
+            nav(it)
         }
+    }
 
-        HorizontalDivider(thickness = DividerThickness)
+    item {
+        Spacer(modifier = StdVertSpacer)
+        Kind3RelayEditBox(relayToAdd) { postViewModel.addRelay(it) }
     }
 }
 
 @Preview
 @Composable
 fun ServerConfigPreview() {
-    ServerConfigClickableLine(
+    ClickableRelayItem(
         loadProfilePicture = true,
         item =
-            RelaySetupInfo(
+            Kind3BasicRelaySetupInfo(
                 url = "nostr.mom",
                 read = true,
                 write = true,
-                errorCount = 23,
-                downloadCountInBytes = 10000,
-                uploadCountInBytes = 10000000,
-                spamCount = 10,
+                relayStat =
+                    RelayStat(
+                        errorCounter = 23,
+                        receivedBytes = 10000,
+                        sentBytes = 10000000,
+                        spamCounter = 10,
+                    ),
                 feedTypes = Constants.activeTypesGlobalChats,
                 paidRelay = true,
             ),
@@ -306,16 +174,16 @@ fun ServerConfigPreview() {
 }
 
 @Composable
-fun ServerConfig(
-    item: RelaySetupInfo,
-    onToggleDownload: (RelaySetupInfo) -> Unit,
-    onToggleUpload: (RelaySetupInfo) -> Unit,
-    onToggleFollows: (RelaySetupInfo) -> Unit,
-    onTogglePrivateDMs: (RelaySetupInfo) -> Unit,
-    onTogglePublicChats: (RelaySetupInfo) -> Unit,
-    onToggleGlobal: (RelaySetupInfo) -> Unit,
-    onToggleSearch: (RelaySetupInfo) -> Unit,
-    onDelete: (RelaySetupInfo) -> Unit,
+fun LoadRelayInfo(
+    item: Kind3BasicRelaySetupInfo,
+    onToggleDownload: (Kind3BasicRelaySetupInfo) -> Unit,
+    onToggleUpload: (Kind3BasicRelaySetupInfo) -> Unit,
+    onToggleFollows: (Kind3BasicRelaySetupInfo) -> Unit,
+    onTogglePrivateDMs: (Kind3BasicRelaySetupInfo) -> Unit,
+    onTogglePublicChats: (Kind3BasicRelaySetupInfo) -> Unit,
+    onToggleGlobal: (Kind3BasicRelaySetupInfo) -> Unit,
+    onToggleSearch: (Kind3BasicRelaySetupInfo) -> Unit,
+    onDelete: (Kind3BasicRelaySetupInfo) -> Unit,
     accountViewModel: AccountViewModel,
     nav: (String) -> Unit,
 ) {
@@ -337,7 +205,7 @@ fun ServerConfig(
             accountViewModel.settings.showProfilePictures.value
         }
 
-    ServerConfigClickableLine(
+    ClickableRelayItem(
         item = item,
         loadProfilePicture = automaticallyShowProfilePicture,
         onToggleDownload = onToggleDownload,
@@ -351,7 +219,9 @@ fun ServerConfig(
         onClick = {
             accountViewModel.retrieveRelayDocument(
                 item.url,
-                onInfo = { relayInfo = RelayInfoDialog(RelayBriefInfoCache.RelayBriefInfo(item.url), it) },
+                onInfo = {
+                    relayInfo = RelayInfoDialog(RelayBriefInfoCache.RelayBriefInfo(item.url), it)
+                },
                 onError = { url, errorCode, exceptionMessage ->
                     val msg =
                         when (errorCode) {
@@ -361,18 +231,21 @@ fun ServerConfig(
                                     url,
                                     exceptionMessage,
                                 )
+
                             Nip11Retriever.ErrorCode.FAIL_TO_REACH_SERVER ->
                                 context.getString(
                                     R.string.relay_information_document_error_assemble_url,
                                     url,
                                     exceptionMessage,
                                 )
+
                             Nip11Retriever.ErrorCode.FAIL_TO_PARSE_RESULT ->
                                 context.getString(
                                     R.string.relay_information_document_error_assemble_url,
                                     url,
                                     exceptionMessage,
                                 )
+
                             Nip11Retriever.ErrorCode.FAIL_WITH_HTTP_STATUS ->
                                 context.getString(
                                     R.string.relay_information_document_error_assemble_url,
@@ -392,17 +265,17 @@ fun ServerConfig(
 }
 
 @Composable
-fun ServerConfigClickableLine(
-    item: RelaySetupInfo,
+fun ClickableRelayItem(
+    item: Kind3BasicRelaySetupInfo,
     loadProfilePicture: Boolean,
-    onToggleDownload: (RelaySetupInfo) -> Unit,
-    onToggleUpload: (RelaySetupInfo) -> Unit,
-    onToggleFollows: (RelaySetupInfo) -> Unit,
-    onTogglePrivateDMs: (RelaySetupInfo) -> Unit,
-    onTogglePublicChats: (RelaySetupInfo) -> Unit,
-    onToggleGlobal: (RelaySetupInfo) -> Unit,
-    onToggleSearch: (RelaySetupInfo) -> Unit,
-    onDelete: (RelaySetupInfo) -> Unit,
+    onToggleDownload: (Kind3BasicRelaySetupInfo) -> Unit,
+    onToggleUpload: (Kind3BasicRelaySetupInfo) -> Unit,
+    onToggleFollows: (Kind3BasicRelaySetupInfo) -> Unit,
+    onTogglePrivateDMs: (Kind3BasicRelaySetupInfo) -> Unit,
+    onTogglePublicChats: (Kind3BasicRelaySetupInfo) -> Unit,
+    onToggleGlobal: (Kind3BasicRelaySetupInfo) -> Unit,
+    onToggleSearch: (Kind3BasicRelaySetupInfo) -> Unit,
+    onDelete: (Kind3BasicRelaySetupInfo) -> Unit,
     onClick: () -> Unit,
 ) {
     Column(Modifier.fillMaxWidth()) {
@@ -433,13 +306,12 @@ fun ServerConfigClickableLine(
                     verticalAlignment = Alignment.CenterVertically,
                     modifier = ReactionRowHeightChat.fillMaxWidth(),
                 ) {
-                    RenderActiveToggles(
+                    ActiveToggles(
                         item = item,
                         onToggleFollows = onToggleFollows,
                         onTogglePrivateDMs = onTogglePrivateDMs,
                         onTogglePublicChats = onTogglePublicChats,
                         onToggleGlobal = onToggleGlobal,
-                        onToggleSearch = onToggleSearch,
                     )
                 }
 
@@ -447,7 +319,7 @@ fun ServerConfigClickableLine(
                     verticalAlignment = Alignment.CenterVertically,
                     modifier = ReactionRowHeightChat.fillMaxWidth(),
                 ) {
-                    RenderStatusRow(
+                    StatusRow(
                         item = item,
                         onToggleDownload = onToggleDownload,
                         onToggleUpload = onToggleUpload,
@@ -463,10 +335,10 @@ fun ServerConfigClickableLine(
 
 @Composable
 @OptIn(ExperimentalFoundationApi::class)
-private fun RenderStatusRow(
-    item: RelaySetupInfo,
-    onToggleDownload: (RelaySetupInfo) -> Unit,
-    onToggleUpload: (RelaySetupInfo) -> Unit,
+private fun StatusRow(
+    item: Kind3BasicRelaySetupInfo,
+    onToggleDownload: (Kind3BasicRelaySetupInfo) -> Unit,
+    onToggleUpload: (Kind3BasicRelaySetupInfo) -> Unit,
     modifier: Modifier,
 ) {
     val scope = rememberCoroutineScope()
@@ -501,7 +373,7 @@ private fun RenderStatusRow(
     )
 
     Text(
-        text = countToHumanReadableBytes(item.downloadCountInBytes),
+        text = countToHumanReadableBytes(item.relayStat.receivedBytes),
         maxLines = 1,
         fontSize = 12.sp,
         modifier = modifier,
@@ -537,7 +409,7 @@ private fun RenderStatusRow(
     )
 
     Text(
-        text = countToHumanReadableBytes(item.uploadCountInBytes),
+        text = countToHumanReadableBytes(item.relayStat.sentBytes),
         maxLines = 1,
         fontSize = 12.sp,
         modifier = modifier,
@@ -563,7 +435,7 @@ private fun RenderStatusRow(
                     },
                 ),
         tint =
-            if (item.errorCount > 0) {
+            if (item.relayStat.errorCounter > 0) {
                 MaterialTheme.colorScheme.warningColor
             } else {
                 MaterialTheme.colorScheme.allGoodColor
@@ -571,7 +443,7 @@ private fun RenderStatusRow(
     )
 
     Text(
-        text = countToHumanReadable(item.errorCount, "errors"),
+        text = countToHumanReadable(item.relayStat.errorCounter, "errors"),
         maxLines = 1,
         fontSize = 12.sp,
         modifier = modifier,
@@ -597,7 +469,7 @@ private fun RenderStatusRow(
                     },
                 ),
         tint =
-            if (item.spamCount > 0) {
+            if (item.relayStat.spamCounter > 0) {
                 MaterialTheme.colorScheme.warningColor
             } else {
                 MaterialTheme.colorScheme.allGoodColor
@@ -605,7 +477,7 @@ private fun RenderStatusRow(
     )
 
     Text(
-        text = countToHumanReadable(item.spamCount, "spam"),
+        text = countToHumanReadable(item.relayStat.spamCounter, "spam"),
         maxLines = 1,
         fontSize = 12.sp,
         modifier = modifier,
@@ -615,13 +487,12 @@ private fun RenderStatusRow(
 
 @Composable
 @OptIn(ExperimentalFoundationApi::class)
-private fun RenderActiveToggles(
-    item: RelaySetupInfo,
-    onToggleFollows: (RelaySetupInfo) -> Unit,
-    onTogglePrivateDMs: (RelaySetupInfo) -> Unit,
-    onTogglePublicChats: (RelaySetupInfo) -> Unit,
-    onToggleGlobal: (RelaySetupInfo) -> Unit,
-    onToggleSearch: (RelaySetupInfo) -> Unit,
+private fun ActiveToggles(
+    item: Kind3BasicRelaySetupInfo,
+    onToggleFollows: (Kind3BasicRelaySetupInfo) -> Unit,
+    onTogglePrivateDMs: (Kind3BasicRelaySetupInfo) -> Unit,
+    onTogglePublicChats: (Kind3BasicRelaySetupInfo) -> Unit,
+    onToggleGlobal: (Kind3BasicRelaySetupInfo) -> Unit,
 ) {
     val scope = rememberCoroutineScope()
     val context = LocalContext.current
@@ -767,47 +638,13 @@ private fun RenderActiveToggles(
                 },
         )
     }
-
-    IconButton(
-        modifier = Size30Modifier,
-        onClick = { onToggleSearch(item) },
-    ) {
-        Icon(
-            imageVector = Icons.Default.Search,
-            stringResource(R.string.search_feed),
-            modifier =
-                Modifier.padding(horizontal = 5.dp)
-                    .size(15.dp)
-                    .combinedClickable(
-                        onClick = { onToggleSearch(item) },
-                        onLongClick = {
-                            scope.launch {
-                                Toast.makeText(
-                                    context,
-                                    context.getString(R.string.search_feed),
-                                    Toast.LENGTH_SHORT,
-                                )
-                                    .show()
-                            }
-                        },
-                    ),
-            tint =
-                if (item.feedTypes.contains(FeedType.SEARCH)) {
-                    MaterialTheme.colorScheme.allGoodColor
-                } else {
-                    MaterialTheme.colorScheme.onSurface.copy(
-                        alpha = 0.32f,
-                    )
-                },
-        )
-    }
 }
 
 @Composable
 private fun FirstLine(
-    item: RelaySetupInfo,
+    item: Kind3BasicRelaySetupInfo,
     onClick: () -> Unit,
-    onDelete: (RelaySetupInfo) -> Unit,
+    onDelete: (Kind3BasicRelaySetupInfo) -> Unit,
     modifier: Modifier,
 ) {
     Row(verticalAlignment = Alignment.CenterVertically, modifier = modifier) {
@@ -844,9 +681,9 @@ private fun FirstLine(
 }
 
 @Composable
-fun EditableServerConfig(
+fun Kind3RelayEditBox(
     relayToAdd: String,
-    onNewRelay: (RelaySetupInfo) -> Unit,
+    onNewRelay: (Kind3BasicRelaySetupInfo) -> Unit,
 ) {
     var url by remember { mutableStateOf<String>(relayToAdd) }
     var read by remember { mutableStateOf(true) }
@@ -899,18 +736,15 @@ fun EditableServerConfig(
         Button(
             onClick = {
                 if (url.isNotBlank() && url != "/") {
-                    var addedWSS =
-                        if (!url.startsWith("wss://") && !url.startsWith("ws://")) {
-                            if (url.endsWith(".onion") || url.endsWith(".onion/")) {
-                                "ws://$url"
-                            } else {
-                                "wss://$url"
-                            }
-                        } else {
-                            url
-                        }
-                    if (url.endsWith("/")) addedWSS = addedWSS.dropLast(1)
-                    onNewRelay(RelaySetupInfo(addedWSS, read, write, feedTypes = FeedType.values().toSet()))
+                    onNewRelay(
+                        Kind3BasicRelaySetupInfo(
+                            url = RelayUrlFormatter.normalize(url),
+                            read = read,
+                            write = write,
+                            feedTypes = FeedType.entries.toSet(),
+                            relayStat = RelayStat(),
+                        ),
+                    )
                     url = ""
                     write = true
                     read = true
@@ -931,21 +765,3 @@ fun EditableServerConfig(
         }
     }
 }
-
-fun countToHumanReadableBytes(counter: Int) =
-    when {
-        counter >= 1000000000 -> "${round(counter / 1000000000f)} GB"
-        counter >= 1000000 -> "${round(counter / 1000000f)} MB"
-        counter >= 1000 -> "${round(counter / 1000f)} KB"
-        else -> "$counter"
-    }
-
-fun countToHumanReadable(
-    counter: Int,
-    str: String,
-) = when {
-    counter >= 1000000000 -> "${round(counter / 1000000000f)}G $str"
-    counter >= 1000000 -> "${round(counter / 1000000f)}M $str"
-    counter >= 1000 -> "${round(counter / 1000f)}K $str"
-    else -> "$counter $str"
-}

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

@@ -18,7 +18,7 @@
  * 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.actions
+package com.vitorpamplona.amethyst.ui.actions.relays
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
@@ -27,8 +27,8 @@ import com.vitorpamplona.amethyst.model.RelaySetupInfo
 import com.vitorpamplona.amethyst.service.Nip11CachedRetriever
 import com.vitorpamplona.amethyst.service.relays.Constants
 import com.vitorpamplona.amethyst.service.relays.FeedType
-import com.vitorpamplona.amethyst.service.relays.RelayPool
-import com.vitorpamplona.quartz.events.ContactListEvent
+import com.vitorpamplona.amethyst.service.relays.RelayStats
+import com.vitorpamplona.quartz.encoders.RelayUrlFormatter
 import kotlinx.collections.immutable.toImmutableSet
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -36,12 +36,14 @@ import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
 
-class NewRelayListViewModel : ViewModel() {
+class Kind3RelayListViewModel : ViewModel() {
     private lateinit var account: Account
 
-    private val _relays = MutableStateFlow<List<RelaySetupInfo>>(emptyList())
+    private val _relays = MutableStateFlow<List<Kind3BasicRelaySetupInfo>>(emptyList())
     val relays = _relays.asStateFlow()
 
+    var hasModified = false
+
     fun load(account: Account) {
         this.account = account
         clear()
@@ -49,9 +51,18 @@ class NewRelayListViewModel : ViewModel() {
     }
 
     fun create() {
-        relays.let {
+        if (hasModified) {
             viewModelScope.launch(Dispatchers.IO) {
-                account.saveRelayList(it.value)
+                account.saveKind3RelayList(
+                    relays.value.map {
+                        RelaySetupInfo(
+                            it.url,
+                            it.read,
+                            it.write,
+                            it.feedTypes,
+                        )
+                    },
+                )
                 clear()
             }
         }
@@ -72,38 +83,13 @@ class NewRelayListViewModel : ViewModel() {
     }
 
     fun clear() {
+        hasModified = false
         _relays.update {
             var relayFile = account.userProfile().latestContactList?.relays()
 
             if (relayFile != null) {
-                // Ugly, but forces nostr.band as the only search-supporting relay today.
-                // TODO: Remove when search becomes more available.
-
-                val needsSearchRelay =
-                    relayFile.none { it.key.removeSuffix("/") in Constants.forcedRelaysForSearchSet } &&
-                        relayFile.none {
-                            account.localRelays
-                                .filter { localRelay -> localRelay.url == it.key }
-                                .firstOrNull()
-                                ?.feedTypes
-                                ?.contains(FeedType.SEARCH)
-                                ?: false
-                        }
-
-                if (needsSearchRelay) {
-                    relayFile =
-                        relayFile +
-                        Constants.forcedRelayForSearch.map {
-                            Pair(
-                                it.url,
-                                ContactListEvent.ReadWrite(it.read, it.write),
-                            )
-                        }
-                }
-
                 relayFile
                     .map {
-                        val liveRelay = RelayPool.getRelay(it.key)
                         val localInfoFeedTypes =
                             account.localRelays
                                 .filter { localRelay -> localRelay.url == it.key }
@@ -115,102 +101,114 @@ class NewRelayListViewModel : ViewModel() {
                                     ?.feedTypes
                                 ?: FeedType.values().toSet().toImmutableSet()
 
-                        val errorCounter = liveRelay?.errorCounter ?: 0
-                        val eventDownloadCounter = liveRelay?.eventDownloadCounterInBytes ?: 0
-                        val eventUploadCounter = liveRelay?.eventUploadCounterInBytes ?: 0
-                        val spamCounter = liveRelay?.spamCounter ?: 0
-
-                        RelaySetupInfo(
-                            it.key,
-                            it.value.read,
-                            it.value.write,
-                            errorCounter,
-                            eventDownloadCounter,
-                            eventUploadCounter,
-                            spamCounter,
-                            localInfoFeedTypes,
+                        Kind3BasicRelaySetupInfo(
+                            url = RelayUrlFormatter.normalize(it.key),
+                            read = it.value.read,
+                            write = it.value.write,
+                            feedTypes = localInfoFeedTypes,
+                            relayStat = RelayStats.get(it.key),
                         )
                     }
                     .distinctBy { it.url }
-                    .sortedBy { it.downloadCountInBytes }
+                    .sortedBy { it.relayStat.receivedBytes }
                     .reversed()
             } else {
                 account.localRelays
                     .map {
-                        val liveRelay = RelayPool.getRelay(it.url)
-
-                        val errorCounter = liveRelay?.errorCounter ?: 0
-                        val eventDownloadCounter = liveRelay?.eventDownloadCounterInBytes ?: 0
-                        val eventUploadCounter = liveRelay?.eventUploadCounterInBytes ?: 0
-                        val spamCounter = liveRelay?.spamCounter ?: 0
-
-                        RelaySetupInfo(
-                            it.url,
-                            it.read,
-                            it.write,
-                            errorCounter,
-                            eventDownloadCounter,
-                            eventUploadCounter,
-                            spamCounter,
-                            it.feedTypes,
+                        Kind3BasicRelaySetupInfo(
+                            url = RelayUrlFormatter.normalize(it.url),
+                            read = it.read,
+                            write = it.write,
+                            feedTypes = it.feedTypes,
+                            relayStat = RelayStats.get(it.url),
                         )
                     }
                     .distinctBy { it.url }
-                    .sortedBy { it.downloadCountInBytes }
+                    .sortedBy { it.relayStat.receivedBytes }
                     .reversed()
             }
         }
     }
 
-    fun addRelay(relay: RelaySetupInfo) {
+    fun addAll(defaultRelays: Array<RelaySetupInfo>) {
+        hasModified = true
+
+        _relays.update {
+            defaultRelays.map {
+                Kind3BasicRelaySetupInfo(
+                    url = RelayUrlFormatter.normalize(it.url),
+                    read = it.read,
+                    write = it.write,
+                    feedTypes = it.feedTypes,
+                    relayStat = RelayStats.get(it.url),
+                )
+            }
+                .distinctBy { it.url }
+                .sortedBy { it.relayStat.receivedBytes }
+                .reversed()
+        }
+    }
+
+    fun addRelay(relay: Kind3BasicRelaySetupInfo) {
         if (relays.value.any { it.url == relay.url }) return
 
         _relays.update { it.plus(relay) }
+
+        hasModified = true
     }
 
-    fun deleteRelay(relay: RelaySetupInfo) {
+    fun deleteRelay(relay: Kind3BasicRelaySetupInfo) {
         _relays.update { it.minus(relay) }
+        hasModified = true
     }
 
     fun deleteAll() {
         _relays.update { relays -> emptyList() }
+        hasModified = true
     }
 
-    fun toggleDownload(relay: RelaySetupInfo) {
+    fun toggleDownload(relay: Kind3BasicRelaySetupInfo) {
         _relays.update { it.updated(relay, relay.copy(read = !relay.read)) }
+        hasModified = true
     }
 
-    fun toggleUpload(relay: RelaySetupInfo) {
+    fun toggleUpload(relay: Kind3BasicRelaySetupInfo) {
         _relays.update { it.updated(relay, relay.copy(write = !relay.write)) }
+        hasModified = true
     }
 
-    fun toggleFollows(relay: RelaySetupInfo) {
+    fun toggleFollows(relay: Kind3BasicRelaySetupInfo) {
         val newTypes = togglePresenceInSet(relay.feedTypes, FeedType.FOLLOWS)
         _relays.update { it.updated(relay, relay.copy(feedTypes = newTypes)) }
+        hasModified = true
     }
 
-    fun toggleMessages(relay: RelaySetupInfo) {
+    fun toggleMessages(relay: Kind3BasicRelaySetupInfo) {
         val newTypes = togglePresenceInSet(relay.feedTypes, FeedType.PRIVATE_DMS)
         _relays.update { it.updated(relay, relay.copy(feedTypes = newTypes)) }
+        hasModified = true
     }
 
-    fun togglePublicChats(relay: RelaySetupInfo) {
+    fun togglePublicChats(relay: Kind3BasicRelaySetupInfo) {
         val newTypes = togglePresenceInSet(relay.feedTypes, FeedType.PUBLIC_CHATS)
         _relays.update { it.updated(relay, relay.copy(feedTypes = newTypes)) }
+        hasModified = true
     }
 
-    fun toggleGlobal(relay: RelaySetupInfo) {
+    fun toggleGlobal(relay: Kind3BasicRelaySetupInfo) {
         val newTypes = togglePresenceInSet(relay.feedTypes, FeedType.GLOBAL)
         _relays.update { it.updated(relay, relay.copy(feedTypes = newTypes)) }
+        hasModified = true
     }
 
-    fun toggleSearch(relay: RelaySetupInfo) {
+    fun toggleSearch(relay: Kind3BasicRelaySetupInfo) {
         val newTypes = togglePresenceInSet(relay.feedTypes, FeedType.SEARCH)
         _relays.update { it.updated(relay, relay.copy(feedTypes = newTypes)) }
+        hasModified = true
     }
 
     fun togglePaidRelay(
-        relay: RelaySetupInfo,
+        relay: Kind3BasicRelaySetupInfo,
         paid: Boolean,
     ) {
         _relays.update { it.updated(relay, relay.copy(paidRelay = paid)) }

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

@@ -0,0 +1,77 @@
+/**
+ * Copyright (c) 2024 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.ui.actions.relays
+
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.LazyListScope
+import androidx.compose.foundation.lazy.itemsIndexed
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
+import com.vitorpamplona.amethyst.ui.theme.FeedPadding
+import com.vitorpamplona.amethyst.ui.theme.StdVertSpacer
+
+@Composable
+fun LocalRelayList(
+    postViewModel: LocalRelayListViewModel,
+    accountViewModel: AccountViewModel,
+    onClose: () -> Unit,
+    nav: (String) -> Unit,
+) {
+    val feedState by postViewModel.relays.collectAsStateWithLifecycle()
+
+    Row(verticalAlignment = Alignment.CenterVertically) {
+        LazyColumn(
+            contentPadding = FeedPadding,
+        ) {
+            renderLocalItems(feedState, postViewModel, accountViewModel, onClose, nav)
+        }
+    }
+}
+
+fun LazyListScope.renderLocalItems(
+    feedState: List<BasicRelaySetupInfo>,
+    postViewModel: LocalRelayListViewModel,
+    accountViewModel: AccountViewModel,
+    onClose: () -> Unit,
+    nav: (String) -> Unit,
+) {
+    itemsIndexed(feedState, key = { _, item -> "Local" + item.url }) { index, item ->
+        BasicRelaySetupInfoDialog(
+            item,
+            onDelete = { postViewModel.deleteRelay(item) },
+            accountViewModel = accountViewModel,
+        ) {
+            onClose()
+            nav(it)
+        }
+    }
+
+    item {
+        Spacer(modifier = StdVertSpacer)
+        RelayUrlEditField { postViewModel.addRelay(it) }
+    }
+}

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

@@ -0,0 +1,31 @@
+/**
+ * Copyright (c) 2024 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.ui.actions.relays
+
+class LocalRelayListViewModel : BasicRelaySetupInfoModel() {
+    override fun getRelayList(): List<String>? {
+        return account.localRelayServers.toList()
+    }
+
+    override fun saveRelayList(urlList: List<String>) {
+        account.updateLocalRelayServers(urlList.toSet())
+    }
+}

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

@@ -0,0 +1,103 @@
+/**
+ * Copyright (c) 2024 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.ui.actions.relays
+
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.LazyListScope
+import androidx.compose.foundation.lazy.itemsIndexed
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
+import com.vitorpamplona.amethyst.ui.theme.FeedPadding
+import com.vitorpamplona.amethyst.ui.theme.StdVertSpacer
+
+@Composable
+fun Nip65RelayList(
+    postViewModel: Nip65RelayListViewModel,
+    accountViewModel: AccountViewModel,
+    onClose: () -> Unit,
+    nav: (String) -> Unit,
+) {
+    val homeFeedState by postViewModel.homeRelays.collectAsStateWithLifecycle()
+    val notifFeedState by postViewModel.notificationRelays.collectAsStateWithLifecycle()
+
+    Row(verticalAlignment = Alignment.CenterVertically) {
+        LazyColumn(
+            contentPadding = FeedPadding,
+        ) {
+            renderNip65HomeItems(homeFeedState, postViewModel, accountViewModel, onClose, nav)
+            renderNip65NotifItems(notifFeedState, postViewModel, accountViewModel, onClose, nav)
+        }
+    }
+}
+
+fun LazyListScope.renderNip65HomeItems(
+    feedState: List<BasicRelaySetupInfo>,
+    postViewModel: Nip65RelayListViewModel,
+    accountViewModel: AccountViewModel,
+    onClose: () -> Unit,
+    nav: (String) -> Unit,
+) {
+    itemsIndexed(feedState, key = { _, item -> "Nip65Home" + item.url }) { index, item ->
+        BasicRelaySetupInfoDialog(
+            item,
+            onDelete = { postViewModel.deleteHomeRelay(item) },
+            accountViewModel = accountViewModel,
+        ) {
+            onClose()
+            nav(it)
+        }
+    }
+
+    item {
+        Spacer(modifier = StdVertSpacer)
+        RelayUrlEditField { postViewModel.addHomeRelay(it) }
+    }
+}
+
+fun LazyListScope.renderNip65NotifItems(
+    feedState: List<BasicRelaySetupInfo>,
+    postViewModel: Nip65RelayListViewModel,
+    accountViewModel: AccountViewModel,
+    onClose: () -> Unit,
+    nav: (String) -> Unit,
+) {
+    itemsIndexed(feedState, key = { _, item -> "Nip65Notif" + item.url }) { index, item ->
+        BasicRelaySetupInfoDialog(
+            item,
+            onDelete = { postViewModel.deleteNotifRelay(item) },
+            accountViewModel = accountViewModel,
+        ) {
+            onClose()
+            nav(it)
+        }
+    }
+
+    item {
+        Spacer(modifier = StdVertSpacer)
+        RelayUrlEditField { postViewModel.addNotifRelay(it) }
+    }
+}

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

@@ -0,0 +1,175 @@
+/**
+ * Copyright (c) 2024 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.ui.actions.relays
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.vitorpamplona.amethyst.model.Account
+import com.vitorpamplona.amethyst.service.Nip11CachedRetriever
+import com.vitorpamplona.amethyst.service.relays.RelayStats
+import com.vitorpamplona.quartz.encoders.RelayUrlFormatter
+import com.vitorpamplona.quartz.events.AdvertisedRelayListEvent
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.launch
+
+class Nip65RelayListViewModel : ViewModel() {
+    private lateinit var account: Account
+
+    private val _homeRelays = MutableStateFlow<List<BasicRelaySetupInfo>>(emptyList())
+    val homeRelays = _homeRelays.asStateFlow()
+
+    private val _notificationRelays = MutableStateFlow<List<BasicRelaySetupInfo>>(emptyList())
+    val notificationRelays = _notificationRelays.asStateFlow()
+
+    var hasModified = false
+
+    fun load(account: Account) {
+        this.account = account
+        clear()
+        loadRelayDocuments()
+    }
+
+    fun create() {
+        if (hasModified) {
+            viewModelScope.launch(Dispatchers.IO) {
+                val writes = _homeRelays.value.map { it.url }.toSet()
+                val reads = _notificationRelays.value.map { it.url }.toSet()
+
+                val urls = writes.union(reads)
+
+                account.sendNip65RelayList(
+                    urls.map {
+                        val type =
+                            if (writes.contains(it) && reads.contains(it)) {
+                                AdvertisedRelayListEvent.AdvertisedRelayType.BOTH
+                            } else if (writes.contains(it)) {
+                                AdvertisedRelayListEvent.AdvertisedRelayType.WRITE
+                            } else {
+                                AdvertisedRelayListEvent.AdvertisedRelayType.READ
+                            }
+                        AdvertisedRelayListEvent.AdvertisedRelayInfo(it, type)
+                    },
+                )
+                clear()
+            }
+        }
+    }
+
+    fun loadRelayDocuments() {
+        viewModelScope.launch(Dispatchers.IO) {
+            _homeRelays.value.forEach { item ->
+                Nip11CachedRetriever.loadRelayInfo(
+                    dirtyUrl = item.url,
+                    onInfo = {
+                        toggleHomePaidRelay(item, it.limitation?.payment_required ?: false)
+                    },
+                    onError = { url, errorCode, exceptionMessage -> },
+                )
+            }
+
+            _notificationRelays.value.forEach { item ->
+                Nip11CachedRetriever.loadRelayInfo(
+                    dirtyUrl = item.url,
+                    onInfo = {
+                        toggleNotifPaidRelay(item, it.limitation?.payment_required ?: false)
+                    },
+                    onError = { url, errorCode, exceptionMessage -> },
+                )
+            }
+        }
+    }
+
+    fun clear() {
+        hasModified = false
+        _homeRelays.update {
+            val relayList = account.getNIP65RelayList()?.writeRelays() ?: emptyList()
+
+            relayList.map { relayUrl ->
+                BasicRelaySetupInfo(
+                    RelayUrlFormatter.normalize(relayUrl),
+                    RelayStats.get(relayUrl),
+                )
+            }.distinctBy { it.url }.sortedBy { it.relayStat.receivedBytes }.reversed()
+        }
+
+        _notificationRelays.update {
+            val relayList = account.getNIP65RelayList()?.readRelays() ?: emptyList()
+
+            relayList.map { relayUrl ->
+                BasicRelaySetupInfo(
+                    RelayUrlFormatter.normalize(relayUrl),
+                    RelayStats.get(relayUrl),
+                )
+            }.distinctBy { it.url }.sortedBy { it.relayStat.receivedBytes }.reversed()
+        }
+    }
+
+    fun addHomeRelay(relay: BasicRelaySetupInfo) {
+        if (_homeRelays.value.any { it.url == relay.url }) return
+
+        _homeRelays.update { it.plus(relay) }
+        hasModified = true
+    }
+
+    fun deleteHomeRelay(relay: BasicRelaySetupInfo) {
+        _homeRelays.update { it.minus(relay) }
+        hasModified = true
+    }
+
+    fun deleteHomeAll() {
+        _homeRelays.update { relays -> emptyList() }
+        hasModified = true
+    }
+
+    fun toggleHomePaidRelay(
+        relay: BasicRelaySetupInfo,
+        paid: Boolean,
+    ) {
+        _homeRelays.update { it.updated(relay, relay.copy(paidRelay = paid)) }
+    }
+
+    fun addNotifRelay(relay: BasicRelaySetupInfo) {
+        if (_notificationRelays.value.any { it.url == relay.url }) return
+
+        _notificationRelays.update { it.plus(relay) }
+        hasModified = true
+    }
+
+    fun deleteNotifRelay(relay: BasicRelaySetupInfo) {
+        _notificationRelays.update { it.minus(relay) }
+        hasModified = true
+    }
+
+    fun deleteNotifAll() {
+        _notificationRelays.update { relays -> emptyList() }
+        hasModified = true
+    }
+
+    fun toggleNotifPaidRelay(
+        relay: BasicRelaySetupInfo,
+        paid: Boolean,
+    ) {
+        _notificationRelays.update { it.updated(relay, relay.copy(paidRelay = paid)) }
+    }
+}

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

@@ -0,0 +1,77 @@
+/**
+ * Copyright (c) 2024 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.ui.actions.relays
+
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.LazyListScope
+import androidx.compose.foundation.lazy.itemsIndexed
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
+import com.vitorpamplona.amethyst.ui.theme.FeedPadding
+import com.vitorpamplona.amethyst.ui.theme.StdVertSpacer
+
+@Composable
+fun PrivateOutboxRelayList(
+    postViewModel: PrivateOutboxRelayListViewModel,
+    accountViewModel: AccountViewModel,
+    onClose: () -> Unit,
+    nav: (String) -> Unit,
+) {
+    val feedState by postViewModel.relays.collectAsStateWithLifecycle()
+
+    Row(verticalAlignment = Alignment.CenterVertically) {
+        LazyColumn(
+            contentPadding = FeedPadding,
+        ) {
+            renderPrivateOutboxItems(feedState, postViewModel, accountViewModel, onClose, nav)
+        }
+    }
+}
+
+fun LazyListScope.renderPrivateOutboxItems(
+    feedState: List<BasicRelaySetupInfo>,
+    postViewModel: PrivateOutboxRelayListViewModel,
+    accountViewModel: AccountViewModel,
+    onClose: () -> Unit,
+    nav: (String) -> Unit,
+) {
+    itemsIndexed(feedState, key = { _, item -> "Outbox" + item.url }) { index, item ->
+        BasicRelaySetupInfoDialog(
+            item,
+            onDelete = { postViewModel.deleteRelay(item) },
+            accountViewModel = accountViewModel,
+        ) {
+            onClose()
+            nav(it)
+        }
+    }
+
+    item {
+        Spacer(modifier = StdVertSpacer)
+        RelayUrlEditField { postViewModel.addRelay(it) }
+    }
+}

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

@@ -0,0 +1,31 @@
+/**
+ * Copyright (c) 2024 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.ui.actions.relays
+
+class PrivateOutboxRelayListViewModel : BasicRelaySetupInfoModel() {
+    override fun getRelayList(): List<String>? {
+        return account.getPrivateOutboxRelayList()?.relays()
+    }
+
+    override fun saveRelayList(urlList: List<String>) {
+        account.savePrivateOutboxRelayList(urlList)
+    }
+}

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

@@ -0,0 +1,394 @@
+/**
+ * Copyright (c) 2024 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.ui.actions.relays
+
+import androidx.compose.animation.Crossfade
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.ExperimentalLayoutApi
+import androidx.compose.foundation.layout.FlowRow
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import androidx.compose.ui.window.Dialog
+import androidx.compose.ui.window.DialogProperties
+import com.vitorpamplona.amethyst.R
+import com.vitorpamplona.amethyst.model.RelayBriefInfoCache
+import com.vitorpamplona.amethyst.service.relays.RelayStats
+import com.vitorpamplona.amethyst.ui.actions.CloseButton
+import com.vitorpamplona.amethyst.ui.components.ClickableEmail
+import com.vitorpamplona.amethyst.ui.components.ClickableUrl
+import com.vitorpamplona.amethyst.ui.components.TranslatableRichTextViewer
+import com.vitorpamplona.amethyst.ui.note.LoadUser
+import com.vitorpamplona.amethyst.ui.note.RenderRelayIcon
+import com.vitorpamplona.amethyst.ui.note.UserCompose
+import com.vitorpamplona.amethyst.ui.note.timeAgo
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
+import com.vitorpamplona.amethyst.ui.theme.DoubleHorzSpacer
+import com.vitorpamplona.amethyst.ui.theme.DoubleVertSpacer
+import com.vitorpamplona.amethyst.ui.theme.StdPadding
+import com.vitorpamplona.amethyst.ui.theme.StdVertSpacer
+import com.vitorpamplona.amethyst.ui.theme.largeRelayIconModifier
+import com.vitorpamplona.quartz.encoders.Nip11RelayInformation
+import com.vitorpamplona.quartz.events.EmptyTagList
+import kotlinx.collections.immutable.toImmutableList
+
+@OptIn(ExperimentalLayoutApi::class)
+@Composable
+fun RelayInformationDialog(
+    onClose: () -> Unit,
+    relayBriefInfo: RelayBriefInfoCache.RelayBriefInfo,
+    relayInfo: Nip11RelayInformation,
+    accountViewModel: AccountViewModel,
+    nav: (String) -> Unit,
+) {
+    val messages =
+        remember(relayBriefInfo) {
+            RelayStats.get(url = relayBriefInfo.url).messages.snapshot().values.sortedByDescending { it.time }.toImmutableList()
+        }
+
+    val automaticallyShowProfilePicture =
+        remember {
+            accountViewModel.settings.showProfilePictures.value
+        }
+
+    Dialog(
+        onDismissRequest = { onClose() },
+        properties =
+            DialogProperties(
+                usePlatformDefaultWidth = false,
+                dismissOnClickOutside = false,
+            ),
+    ) {
+        Surface {
+            val color = mutableStateOf(Color.Transparent)
+            val context = LocalContext.current
+
+            LazyColumn(
+                modifier =
+                    Modifier
+                        .padding(10.dp)
+                        .fillMaxSize(),
+            ) {
+                item {
+                    Row(
+                        modifier = Modifier.fillMaxWidth(),
+                        horizontalArrangement = Arrangement.SpaceBetween,
+                        verticalAlignment = Alignment.CenterVertically,
+                    ) {
+                        CloseButton(onPress = { onClose() })
+                    }
+                }
+                item {
+                    Row(
+                        verticalAlignment = Alignment.CenterVertically,
+                        horizontalArrangement = Arrangement.Center,
+                        modifier = StdPadding.fillMaxWidth(),
+                    ) {
+                        Column {
+                            RenderRelayIcon(
+                                relayBriefInfo.displayUrl,
+                                relayInfo.icon ?: relayBriefInfo.favIcon,
+                                automaticallyShowProfilePicture,
+                                MaterialTheme.colorScheme.largeRelayIconModifier,
+                            )
+                        }
+
+                        Spacer(modifier = DoubleHorzSpacer)
+
+                        Column(horizontalAlignment = Alignment.CenterHorizontally) {
+                            Row { Title(relayInfo.name?.trim() ?: "") }
+
+                            Row { SubtitleContent(relayInfo.description?.trim() ?: "") }
+                        }
+                    }
+                }
+                item {
+                    Section(stringResource(R.string.owner))
+
+                    relayInfo.pubkey?.let {
+                        DisplayOwnerInformation(it, accountViewModel) {
+                            onClose()
+                            nav(it)
+                        }
+                    }
+                }
+                item {
+                    Section(stringResource(R.string.software))
+
+                    DisplaySoftwareInformation(relayInfo)
+
+                    Section(stringResource(R.string.version))
+
+                    SectionContent(relayInfo.version ?: "")
+                }
+                item {
+                    Section(stringResource(R.string.contact))
+
+                    Box(modifier = Modifier.padding(start = 10.dp)) {
+                        relayInfo.contact?.let {
+                            if (it.startsWith("https:")) {
+                                ClickableUrl(urlText = it, url = it)
+                            } else if (it.startsWith("mailto:") || it.contains('@')) {
+                                ClickableEmail(it)
+                            } else {
+                                SectionContent(it)
+                            }
+                        }
+                    }
+                }
+                item {
+                    Section(stringResource(R.string.supports))
+
+                    DisplaySupportedNips(relayInfo)
+                }
+                item {
+                    relayInfo.fees?.admission?.let {
+                        if (it.isNotEmpty()) {
+                            Section(stringResource(R.string.admission_fees))
+
+                            it.forEach { item -> SectionContent("${item.amount?.div(1000) ?: 0} sats") }
+                        }
+                    }
+
+                    relayInfo.payments_url?.let {
+                        Section(stringResource(R.string.payments_url))
+
+                        Box(modifier = Modifier.padding(start = 10.dp)) {
+                            ClickableUrl(
+                                urlText = it,
+                                url = it,
+                            )
+                        }
+                    }
+                }
+                item {
+                    relayInfo.limitation?.let {
+                        Section(stringResource(R.string.limitations))
+                        val authRequiredText =
+                            if (it.auth_required ?: false) stringResource(R.string.yes) else stringResource(R.string.no)
+
+                        val paymentRequiredText =
+                            if (it.payment_required ?: false) stringResource(R.string.yes) else stringResource(R.string.no)
+
+                        val restrictedWritesText =
+                            if (it.restricted_writes ?: false) stringResource(R.string.yes) else stringResource(R.string.no)
+
+                        Column {
+                            SectionContent(
+                                "${stringResource(R.string.message_length)}: ${it.max_message_length ?: 0}",
+                            )
+                            SectionContent(
+                                "${stringResource(R.string.subscriptions)}: ${it.max_subscriptions ?: 0}",
+                            )
+                            SectionContent("${stringResource(R.string.filters)}: ${it.max_filters ?: 0}")
+                            SectionContent(
+                                "${stringResource(R.string.subscription_id_length)}: ${it.max_subid_length ?: 0}",
+                            )
+                            SectionContent("${stringResource(R.string.minimum_prefix)}: ${it.min_prefix ?: 0}")
+                            SectionContent(
+                                "${stringResource(R.string.maximum_event_tags)}: ${it.max_event_tags ?: 0}",
+                            )
+                            SectionContent(
+                                "${stringResource(R.string.content_length)}: ${it.max_content_length ?: 0}",
+                            )
+                            SectionContent(
+                                "${stringResource(R.string.max_limit)}: ${it.max_limit ?: 0}",
+                            )
+                            SectionContent("${stringResource(R.string.minimum_pow)}: ${it.min_pow_difficulty ?: 0}")
+                            SectionContent("${stringResource(R.string.auth)}: $authRequiredText")
+                            SectionContent("${stringResource(R.string.payment)}: $paymentRequiredText")
+                            SectionContent("${stringResource(R.string.restricted_writes)}: $restrictedWritesText")
+                        }
+                    }
+                }
+                item {
+                    relayInfo.relay_countries?.let {
+                        Section(stringResource(R.string.countries))
+
+                        FlowRow { it.forEach { item -> SectionContent(item) } }
+                    }
+                }
+                item {
+                    relayInfo.language_tags?.let {
+                        Section(stringResource(R.string.languages))
+
+                        FlowRow { it.forEach { item -> SectionContent(item) } }
+                    }
+                }
+                item {
+                    relayInfo.tags?.let {
+                        Section(stringResource(R.string.tags))
+
+                        FlowRow { it.forEach { item -> SectionContent(item) } }
+                    }
+                }
+                item {
+                    relayInfo.posting_policy?.let {
+                        Section(stringResource(R.string.posting_policy))
+
+                        Box(Modifier.padding(10.dp)) {
+                            ClickableUrl(
+                                it,
+                                it,
+                            )
+                        }
+                    }
+                }
+
+                item {
+                    Section(stringResource(R.string.relay_error_messages))
+                }
+
+                items(messages) { msg ->
+                    Row {
+                        TranslatableRichTextViewer(
+                            content =
+                                remember {
+                                    "${timeAgo(msg.time, context)}, ${msg.type.name}: ${msg.message}"
+                                },
+                            canPreview = false,
+                            quotesLeft = 0,
+                            modifier = Modifier.fillMaxWidth(),
+                            tags = EmptyTagList,
+                            backgroundColor = color,
+                            id = msg.hashCode().toString(),
+                            accountViewModel = accountViewModel,
+                            nav = nav,
+                        )
+                    }
+
+                    Spacer(modifier = StdVertSpacer)
+                }
+            }
+        }
+    }
+}
+
+@Composable
+@OptIn(ExperimentalLayoutApi::class)
+private fun DisplaySupportedNips(relayInfo: Nip11RelayInformation) {
+    FlowRow {
+        relayInfo.supported_nips?.forEach { item ->
+            val text = item.toString().padStart(2, '0')
+            Box(Modifier.padding(10.dp)) {
+                ClickableUrl(
+                    urlText = text,
+                    url = "https://github.com/nostr-protocol/nips/blob/master/$text.md",
+                )
+            }
+        }
+
+        relayInfo.supported_nip_extensions?.forEach { item ->
+            val text = item.padStart(2, '0')
+            Box(Modifier.padding(10.dp)) {
+                ClickableUrl(
+                    urlText = text,
+                    url = "https://github.com/nostr-protocol/nips/blob/master/$text.md",
+                )
+            }
+        }
+    }
+}
+
+@Composable
+private fun DisplaySoftwareInformation(relayInfo: Nip11RelayInformation) {
+    val url = (relayInfo.software ?: "").replace("git+", "")
+    Box(modifier = Modifier.padding(start = 10.dp)) {
+        ClickableUrl(
+            urlText = url,
+            url = url,
+        )
+    }
+}
+
+@Composable
+private fun DisplayOwnerInformation(
+    userHex: String,
+    accountViewModel: AccountViewModel,
+    nav: (String) -> Unit,
+) {
+    LoadUser(baseUserHex = userHex, accountViewModel) {
+        Crossfade(it) {
+            if (it != null) {
+                UserCompose(
+                    baseUser = it,
+                    accountViewModel = accountViewModel,
+                    nav = nav,
+                )
+            }
+        }
+    }
+}
+
+@Composable
+fun Title(text: String) {
+    Text(
+        text = text,
+        fontWeight = FontWeight.Bold,
+        fontSize = 24.sp,
+    )
+}
+
+@Composable
+fun SubtitleContent(text: String) {
+    Text(
+        text = text,
+    )
+}
+
+@Composable
+fun Section(text: String) {
+    Spacer(modifier = DoubleVertSpacer)
+    Text(
+        text = text,
+        fontWeight = FontWeight.Bold,
+        fontSize = 20.sp,
+    )
+    Spacer(modifier = DoubleVertSpacer)
+}
+
+@Composable
+fun SectionContent(text: String) {
+    Text(
+        modifier = Modifier.padding(start = 10.dp),
+        text = text,
+    )
+}

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

@@ -0,0 +1,88 @@
+/**
+ * Copyright (c) 2024 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.ui.actions.relays
+
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Cancel
+import androidx.compose.material.icons.filled.Paid
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.dp
+import com.vitorpamplona.amethyst.R
+import com.vitorpamplona.amethyst.ui.theme.WarningColor
+import com.vitorpamplona.amethyst.ui.theme.allGoodColor
+
+@Composable
+fun RelayNameAndRemoveButton(
+    item: BasicRelaySetupInfo,
+    onClick: () -> Unit,
+    onDelete: (BasicRelaySetupInfo) -> Unit,
+    modifier: Modifier,
+) {
+    Row(verticalAlignment = Alignment.CenterVertically, modifier = modifier) {
+        Row(Modifier.weight(1f), verticalAlignment = Alignment.CenterVertically) {
+            Text(
+                text = item.briefInfo.displayUrl,
+                modifier = Modifier.clickable(onClick = onClick),
+                maxLines = 1,
+                overflow = TextOverflow.Ellipsis,
+            )
+
+            if (item.paidRelay) {
+                Icon(
+                    imageVector = Icons.Default.Paid,
+                    null,
+                    modifier =
+                        Modifier
+                            .padding(start = 5.dp, top = 1.dp)
+                            .size(14.dp),
+                    tint = MaterialTheme.colorScheme.allGoodColor,
+                )
+            }
+        }
+
+        IconButton(
+            modifier = Modifier.size(30.dp),
+            onClick = { onDelete(item) },
+        ) {
+            Icon(
+                imageVector = Icons.Default.Cancel,
+                contentDescription = stringResource(id = R.string.remove),
+                modifier =
+                    Modifier
+                        .padding(start = 10.dp)
+                        .size(15.dp),
+                tint = WarningColor,
+            )
+        }
+    }
+}

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

@@ -0,0 +1,180 @@
+/**
+ * Copyright (c) 2024 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.ui.actions.relays
+
+import android.widget.Toast
+import androidx.compose.foundation.ExperimentalFoundationApi
+import androidx.compose.foundation.combinedClickable
+import androidx.compose.foundation.layout.size
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.DeleteSweep
+import androidx.compose.material.icons.filled.Download
+import androidx.compose.material.icons.filled.SyncProblem
+import androidx.compose.material.icons.filled.Upload
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import com.vitorpamplona.amethyst.R
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
+import com.vitorpamplona.amethyst.ui.theme.allGoodColor
+import com.vitorpamplona.amethyst.ui.theme.placeholderText
+import com.vitorpamplona.amethyst.ui.theme.warningColor
+import kotlinx.coroutines.launch
+
+@Composable
+@OptIn(ExperimentalFoundationApi::class)
+fun RelayStatusRow(
+    item: BasicRelaySetupInfo,
+    modifier: Modifier,
+    accountViewModel: AccountViewModel,
+) {
+    val scope = rememberCoroutineScope()
+    val context = LocalContext.current
+
+    Icon(
+        imageVector = Icons.Default.Download,
+        contentDescription = stringResource(R.string.read_from_relay),
+        modifier =
+            Modifier
+                .size(15.dp)
+                .combinedClickable(
+                    onClick = {},
+                    onLongClick = {
+                        accountViewModel.toast(
+                            R.string.read_from_relay,
+                            R.string.read_from_relay_description,
+                        )
+                    },
+                ),
+        tint = MaterialTheme.colorScheme.allGoodColor,
+    )
+
+    Text(
+        text = countToHumanReadableBytes(item.relayStat.receivedBytes),
+        maxLines = 1,
+        fontSize = 12.sp,
+        modifier = modifier,
+        color = MaterialTheme.colorScheme.placeholderText,
+    )
+
+    Icon(
+        imageVector = Icons.Default.Upload,
+        stringResource(R.string.write_to_relay),
+        modifier =
+            Modifier
+                .size(15.dp)
+                .combinedClickable(
+                    onClick = { },
+                    onLongClick = {
+                        accountViewModel.toast(
+                            R.string.write_to_relay,
+                            R.string.write_to_relay_description,
+                        )
+                    },
+                ),
+        tint = MaterialTheme.colorScheme.allGoodColor,
+    )
+
+    Text(
+        text = countToHumanReadableBytes(item.relayStat.sentBytes),
+        maxLines = 1,
+        fontSize = 12.sp,
+        modifier = modifier,
+        color = MaterialTheme.colorScheme.placeholderText,
+    )
+
+    Icon(
+        imageVector = Icons.Default.SyncProblem,
+        stringResource(R.string.errors),
+        modifier =
+            Modifier
+                .size(15.dp)
+                .combinedClickable(
+                    onClick = {},
+                    onLongClick = {
+                        accountViewModel.toast(
+                            R.string.errors,
+                            R.string.errors_description,
+                        )
+                    },
+                ),
+        tint =
+            if (item.relayStat.errorCounter > 0) {
+                MaterialTheme.colorScheme.warningColor
+            } else {
+                MaterialTheme.colorScheme.allGoodColor
+            },
+    )
+
+    Text(
+        text = countToHumanReadable(item.relayStat.errorCounter, "errors"),
+        maxLines = 1,
+        fontSize = 12.sp,
+        modifier = modifier,
+        color = MaterialTheme.colorScheme.placeholderText,
+    )
+
+    Icon(
+        imageVector = Icons.Default.DeleteSweep,
+        stringResource(R.string.spam),
+        modifier =
+            Modifier
+                .size(15.dp)
+                .combinedClickable(
+                    onClick = {},
+                    onLongClick = {
+                        accountViewModel.toast(
+                            R.string.spam,
+                            R.string.spam_description,
+                        )
+                        scope.launch {
+                            Toast.makeText(
+                                context,
+                                context.getString(R.string.spam),
+                                Toast.LENGTH_SHORT,
+                            )
+                                .show()
+                        }
+                    },
+                ),
+        tint =
+            if (item.relayStat.spamCounter > 0) {
+                MaterialTheme.colorScheme.warningColor
+            } else {
+                MaterialTheme.colorScheme.allGoodColor
+            },
+    )
+
+    Text(
+        text = countToHumanReadable(item.relayStat.spamCounter, "spam"),
+        maxLines = 1,
+        fontSize = 12.sp,
+        modifier = modifier,
+        color = MaterialTheme.colorScheme.placeholderText,
+    )
+}

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

@@ -0,0 +1,87 @@
+/**
+ * Copyright (c) 2024 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.ui.actions.relays
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Row
+import androidx.compose.material3.Button
+import androidx.compose.material3.ButtonDefaults
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.OutlinedTextField
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.res.stringResource
+import com.vitorpamplona.amethyst.R
+import com.vitorpamplona.amethyst.service.relays.RelayStat
+import com.vitorpamplona.amethyst.ui.theme.ButtonBorder
+import com.vitorpamplona.amethyst.ui.theme.Size10dp
+import com.vitorpamplona.amethyst.ui.theme.placeholderText
+import com.vitorpamplona.quartz.encoders.RelayUrlFormatter
+
+@Composable
+fun RelayUrlEditField(onNewRelay: (BasicRelaySetupInfo) -> Unit) {
+    var url by remember { mutableStateOf("") }
+
+    Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(Size10dp)) {
+        OutlinedTextField(
+            label = { Text(text = stringResource(R.string.add_a_relay)) },
+            modifier = Modifier.weight(1f),
+            value = url,
+            onValueChange = { url = it },
+            placeholder = {
+                Text(
+                    text = "server.com",
+                    color = MaterialTheme.colorScheme.placeholderText,
+                    maxLines = 1,
+                )
+            },
+            singleLine = true,
+        )
+
+        Button(
+            onClick = {
+                if (url.isNotBlank() && url != "/") {
+                    onNewRelay(BasicRelaySetupInfo(RelayUrlFormatter.normalize(url), RelayStat()))
+                    url = ""
+                }
+            },
+            shape = ButtonBorder,
+            colors =
+                ButtonDefaults.buttonColors(
+                    containerColor =
+                        if (url.isNotBlank()) {
+                            MaterialTheme.colorScheme.primary
+                        } else {
+                            MaterialTheme.colorScheme.placeholderText
+                        },
+                ),
+        ) {
+            Text(text = stringResource(id = R.string.add), color = Color.White)
+        }
+    }
+}

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

@@ -0,0 +1,77 @@
+/**
+ * Copyright (c) 2024 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.ui.actions.relays
+
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.LazyListScope
+import androidx.compose.foundation.lazy.itemsIndexed
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
+import com.vitorpamplona.amethyst.ui.theme.FeedPadding
+import com.vitorpamplona.amethyst.ui.theme.StdVertSpacer
+
+@Composable
+fun SearchRelayList(
+    postViewModel: SearchRelayListViewModel,
+    accountViewModel: AccountViewModel,
+    onClose: () -> Unit,
+    nav: (String) -> Unit,
+) {
+    val feedState by postViewModel.relays.collectAsStateWithLifecycle()
+
+    Row(verticalAlignment = Alignment.CenterVertically) {
+        LazyColumn(
+            contentPadding = FeedPadding,
+        ) {
+            renderSearchItems(feedState, postViewModel, accountViewModel, onClose, nav)
+        }
+    }
+}
+
+fun LazyListScope.renderSearchItems(
+    feedState: List<BasicRelaySetupInfo>,
+    postViewModel: SearchRelayListViewModel,
+    accountViewModel: AccountViewModel,
+    onClose: () -> Unit,
+    nav: (String) -> Unit,
+) {
+    itemsIndexed(feedState, key = { _, item -> "Search" + item.url }) { index, item ->
+        BasicRelaySetupInfoDialog(
+            item,
+            onDelete = { postViewModel.deleteRelay(item) },
+            accountViewModel = accountViewModel,
+        ) {
+            onClose()
+            nav(it)
+        }
+    }
+
+    item {
+        Spacer(modifier = StdVertSpacer)
+        RelayUrlEditField { postViewModel.addRelay(it) }
+    }
+}

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

@@ -0,0 +1,31 @@
+/**
+ * Copyright (c) 2024 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.ui.actions.relays
+
+class SearchRelayListViewModel : BasicRelaySetupInfoModel() {
+    override fun getRelayList(): List<String>? {
+        return account.getSearchRelayList()?.relays()
+    }
+
+    override fun saveRelayList(urlList: List<String>) {
+        account.saveSearchRelayList(urlList)
+    }
+}

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

@@ -27,6 +27,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.platform.LocalUriHandler
 import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.style.TextOverflow
 
 @Composable
 fun ClickableUrl(
@@ -39,6 +40,8 @@ fun ClickableUrl(
 
     ClickableText(
         text = text,
+        maxLines = 1,
+        overflow = TextOverflow.Ellipsis,
         onClick = {
             runCatching {
                 val doubleCheckedUrl = if (url.contains("://")) url else "https://$url"

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

@@ -79,7 +79,7 @@ fun ClickableWithdrawal(withdrawalString: String) {
 
     ClickableText(
         text = withdraw,
-        onClick = { payViaIntent(withdrawalString, context) { showErrorMessageDialog = it } },
+        onClick = { payViaIntent(withdrawalString, context, { }) { showErrorMessageDialog = it } },
         style = LocalTextStyle.current.copy(color = MaterialTheme.colorScheme.primary),
     )
 }

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

@@ -26,7 +26,6 @@ import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.Button
 import androidx.compose.material3.ButtonDefaults
 import androidx.compose.material3.MaterialTheme
@@ -42,13 +41,13 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.unit.dp
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.commons.richtext.ExpandableTextCutOffCalculator
 import com.vitorpamplona.amethyst.ui.note.getGradient
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.theme.ButtonBorder
 import com.vitorpamplona.amethyst.ui.theme.ButtonPadding
+import com.vitorpamplona.amethyst.ui.theme.StdTopPadding
 import com.vitorpamplona.amethyst.ui.theme.secondaryButtonBackground
 import com.vitorpamplona.quartz.events.ImmutableListOfLists
 
@@ -65,6 +64,7 @@ fun ExpandableRichTextViewer(
     tags: ImmutableListOfLists<String>,
     backgroundColor: MutableState<Color>,
     id: String,
+    callbackUri: String? = null,
     accountViewModel: AccountViewModel,
     nav: (String) -> Unit,
 ) {
@@ -100,6 +100,7 @@ fun ExpandableRichTextViewer(
             modifier.align(Alignment.TopStart),
             tags,
             backgroundColor,
+            callbackUri,
             accountViewModel,
             nav,
         )
@@ -125,7 +126,7 @@ fun ExpandableRichTextViewer(
 @Composable
 fun ShowMoreButton(onClick: () -> Unit) {
     Button(
-        modifier = Modifier.padding(top = 10.dp),
+        modifier = StdTopPadding,
         onClick = onClick,
         shape = ButtonBorder,
         colors =

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

@@ -169,7 +169,7 @@ fun InvoicePreview(
                     Modifier
                         .fillMaxWidth()
                         .padding(vertical = 10.dp),
-                onClick = { payViaIntent(lnInvoice, context) { showErrorMessageDialog = it } },
+                onClick = { payViaIntent(lnInvoice, context, { }) { showErrorMessageDialog = it } },
                 shape = QuoteBorder,
                 colors =
                     ButtonDefaults.buttonColors(

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

@@ -37,6 +37,7 @@ import com.vitorpamplona.amethyst.ui.theme.HalfVertPadding
 fun LoadUrlPreview(
     url: String,
     urlText: String,
+    callbackUri: String? = null,
     accountViewModel: AccountViewModel,
 ) {
     val automaticallyShowUrlPreview = remember { accountViewModel.settings.showUrlPreview.value }
@@ -61,7 +62,7 @@ fun LoadUrlPreview(
         ) { state ->
             when (state) {
                 is UrlPreviewState.Loaded -> {
-                    RenderLoaded(state, url, accountViewModel)
+                    RenderLoaded(state, url, callbackUri, accountViewModel)
                 }
                 else -> {
                     ClickableUrl(urlText, url)
@@ -75,21 +76,24 @@ fun LoadUrlPreview(
 fun RenderLoaded(
     state: UrlPreviewState.Loaded,
     url: String,
+    callbackUri: String? = null,
     accountViewModel: AccountViewModel,
 ) {
     if (state.previewInfo.mimeType.type == "image") {
         Box(modifier = HalfVertPadding) {
             ZoomableContentView(
-                content = MediaUrlImage(url),
+                content = MediaUrlImage(url, uri = callbackUri),
                 roundedCorner = true,
+                isFiniteHeight = false,
                 accountViewModel = accountViewModel,
             )
         }
     } else if (state.previewInfo.mimeType.type == "video") {
         Box(modifier = HalfVertPadding) {
             ZoomableContentView(
-                content = MediaUrlVideo(url),
+                content = MediaUrlVideo(url, uri = callbackUri),
                 roundedCorner = true,
+                isFiniteHeight = false,
                 accountViewModel = accountViewModel,
             )
         }

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

@@ -64,7 +64,7 @@ class MediaCompressor {
                 appSpecificStorageConfiguration = AppSpecificStorageConfiguration(),
                 configureWith =
                     Configuration(
-                        quality = VideoQuality.LOW,
+                        quality = VideoQuality.MEDIUM,
                         // => required name
                         videoNames = listOf(UUID.randomUUID().toString()),
                     ),

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

@@ -21,6 +21,7 @@
 package com.vitorpamplona.amethyst.ui.components
 
 import androidx.compose.animation.Crossfade
+import androidx.compose.foundation.border
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
@@ -120,14 +121,38 @@ fun RichTextViewer(
     modifier: Modifier,
     tags: ImmutableListOfLists<String>,
     backgroundColor: MutableState<Color>,
+    callbackUri: String? = null,
     accountViewModel: AccountViewModel,
     nav: (String) -> Unit,
 ) {
     Column(modifier = modifier) {
         if (remember(content) { isMarkdown(content) }) {
-            RenderContentAsMarkdown(content, tags, canPreview, quotesLeft, backgroundColor, accountViewModel, nav)
+            RenderContentAsMarkdown(content, tags, canPreview, quotesLeft, backgroundColor, callbackUri, accountViewModel, nav)
         } else {
-            RenderRegular(content, tags, canPreview, quotesLeft, backgroundColor, accountViewModel, nav)
+            RenderRegular(content, tags, canPreview, quotesLeft, backgroundColor, callbackUri, accountViewModel, nav)
+        }
+    }
+}
+
+@Preview
+@Composable
+fun RenderStrangeNamePreview() {
+    val nav: (String) -> Unit = {}
+
+    Column(modifier = Modifier.padding(10.dp)) {
+        RenderRegular(
+            "If you want to stream or download the music from  nostr:npub1sctag667a7np6p6ety2up94pnwwxhd2ep8n8afr2gtr47cwd4ewsvdmmjm can you here",
+            EmptyTagList,
+        ) { word, state ->
+            when (word) {
+                is BechSegment -> {
+                    Text(
+                        "FreeFrom Official \uD80C\uDD66",
+                        modifier = Modifier.border(1.dp, Color.Red),
+                    )
+                }
+                is RegularTextSegment -> Text(word.segmentText)
+            }
         }
     }
 }
@@ -243,7 +268,7 @@ fun RenderRegularPreview3() {
     ) { word, state ->
         when (word) {
             // is ImageSegment -> ZoomableContentView(word.segmentText, state, accountViewModel)
-            is LinkSegment -> LoadUrlPreview(word.segmentText, word.segmentText, accountViewModel)
+            is LinkSegment -> LoadUrlPreview(word.segmentText, word.segmentText, null, accountViewModel)
             is EmojiSegment -> RenderCustomEmoji(word.segmentText, state)
             is InvoiceSegment -> MayBeInvoicePreview(word.segmentText)
             is WithdrawSegment -> MayBeWithdrawal(word.segmentText)
@@ -267,16 +292,18 @@ private fun RenderRegular(
     canPreview: Boolean,
     quotesLeft: Int,
     backgroundColor: MutableState<Color>,
+    callbackUri: String? = null,
     accountViewModel: AccountViewModel,
     nav: (String) -> Unit,
 ) {
-    RenderRegular(content, tags) { word, state ->
+    RenderRegular(content, tags, callbackUri) { word, state ->
         if (canPreview) {
             RenderWordWithPreview(
                 word,
                 state,
                 backgroundColor,
                 quotesLeft,
+                callbackUri,
                 accountViewModel,
                 nav,
             )
@@ -297,9 +324,10 @@ private fun RenderRegular(
 fun RenderRegular(
     content: String,
     tags: ImmutableListOfLists<String>,
+    callbackUri: String? = null,
     wordRenderer: @Composable (Segment, RichTextViewerState) -> Unit,
 ) {
-    val state by remember(content, tags) { mutableStateOf(CachedRichTextParser.parseText(content, tags)) }
+    val state by remember(content, tags) { mutableStateOf(CachedRichTextParser.parseText(content, tags, callbackUri)) }
 
     val spaceWidth = measureSpaceWidth(LocalTextStyle.current)
 
@@ -388,12 +416,13 @@ private fun RenderWordWithPreview(
     state: RichTextViewerState,
     backgroundColor: MutableState<Color>,
     quotesLeft: Int,
+    callbackUri: String? = null,
     accountViewModel: AccountViewModel,
     nav: (String) -> Unit,
 ) {
     when (word) {
         is ImageSegment -> ZoomableContentView(word.segmentText, state, accountViewModel)
-        is LinkSegment -> LoadUrlPreview(word.segmentText, word.segmentText, accountViewModel)
+        is LinkSegment -> LoadUrlPreview(word.segmentText, word.segmentText, callbackUri, accountViewModel)
         is EmojiSegment -> RenderCustomEmoji(word.segmentText, state)
         is InvoiceSegment -> MayBeInvoicePreview(word.segmentText)
         is WithdrawSegment -> MayBeWithdrawal(word.segmentText)
@@ -417,7 +446,7 @@ private fun ZoomableContentView(
 ) {
     state.imagesForPager[word]?.let {
         Box(modifier = HalfVertPadding) {
-            ZoomableContentView(it, state.imageList, roundedCorner = true, accountViewModel)
+            ZoomableContentView(it, state.imageList, roundedCorner = true, isFiniteHeight = false, accountViewModel)
         }
     }
 }

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

@@ -80,8 +80,6 @@ class Split<T>() {
         } else {
             splitItem.percentage = percentage
 
-            println("Update ${items[index].key} to $percentage")
-
             val othersMustShare = 1.0f - splitItem.percentage
 
             val othersHave =
@@ -89,8 +87,6 @@ class Split<T>() {
 
             if (abs(othersHave - othersMustShare) < 0.01) return // nothing to do
 
-            println("Others Must Share $othersMustShare but have $othersHave")
-
             bottomUpAdjustment(othersMustShare, othersHave, index)
         }
     }
@@ -109,14 +105,10 @@ class Split<T>() {
                     val oldValue = items[i].percentage
                     items[i].percentage -= needToRemove
                     needToRemove = 0f
-                    println(
-                        "- Updating ${items[i].key} from $oldValue to ${items[i].percentage - needToRemove}. $needToRemove left",
-                    )
                 } else {
                     val oldValue = items[i].percentage
                     needToRemove -= items[i].percentage
                     items[i].percentage = 0f
-                    println("- Updating ${items[i].key} from $oldValue to ${0}. $needToRemove left")
                 }
 
                 if (needToRemove < 0.01) {

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

@@ -20,10 +20,12 @@
  */
 package com.vitorpamplona.amethyst.ui.components
 
+import android.Manifest
 import android.content.Context
 import android.graphics.Rect
 import android.graphics.drawable.Drawable
 import android.net.Uri
+import android.os.Build
 import android.util.Log
 import android.view.View
 import android.view.ViewGroup
@@ -36,7 +38,6 @@ import androidx.compose.animation.fadeIn
 import androidx.compose.animation.fadeOut
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.BoxWithConstraints
 import androidx.compose.foundation.layout.aspectRatio
 import androidx.compose.foundation.layout.defaultMinSize
 import androidx.compose.foundation.layout.fillMaxSize
@@ -44,17 +45,22 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Download
+import androidx.compose.material.icons.filled.Share
+import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.Immutable
 import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.MutableFloatState
 import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.Stable
 import androidx.compose.runtime.State
-import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableFloatStateOf
 import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
@@ -72,13 +78,10 @@ import androidx.compose.ui.layout.LayoutCoordinates
 import androidx.compose.ui.layout.boundsInWindow
 import androidx.compose.ui.layout.onGloballyPositioned
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.platform.LocalLifecycleOwner
 import androidx.compose.ui.platform.LocalView
-import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.isFinite
-import androidx.compose.ui.unit.isSpecified
 import androidx.compose.ui.viewinterop.AndroidView
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleEventObserver
@@ -89,10 +92,15 @@ import androidx.media3.common.util.UnstableApi
 import androidx.media3.session.MediaController
 import androidx.media3.ui.AspectRatioFrameLayout
 import androidx.media3.ui.PlayerView
+import com.google.accompanist.permissions.ExperimentalPermissionsApi
+import com.google.accompanist.permissions.isGranted
+import com.google.accompanist.permissions.rememberPermissionState
 import com.linc.audiowaveform.infiniteLinearGradient
+import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.commons.compose.GenericBaseCache
 import com.vitorpamplona.amethyst.commons.compose.produceCachedState
 import com.vitorpamplona.amethyst.service.playback.PlaybackClientController
+import com.vitorpamplona.amethyst.ui.actions.ImageSaver
 import com.vitorpamplona.amethyst.ui.note.DownloadForOfflineIcon
 import com.vitorpamplona.amethyst.ui.note.LyricsIcon
 import com.vitorpamplona.amethyst.ui.note.LyricsOffIcon
@@ -100,9 +108,12 @@ import com.vitorpamplona.amethyst.ui.note.MuteIcon
 import com.vitorpamplona.amethyst.ui.note.MutedIcon
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.theme.PinBottomIconSize
-import com.vitorpamplona.amethyst.ui.theme.Size0dp
+import com.vitorpamplona.amethyst.ui.theme.Size110dp
+import com.vitorpamplona.amethyst.ui.theme.Size165dp
+import com.vitorpamplona.amethyst.ui.theme.Size20Modifier
 import com.vitorpamplona.amethyst.ui.theme.Size22Modifier
 import com.vitorpamplona.amethyst.ui.theme.Size50Modifier
+import com.vitorpamplona.amethyst.ui.theme.Size55dp
 import com.vitorpamplona.amethyst.ui.theme.Size75dp
 import com.vitorpamplona.amethyst.ui.theme.VolumeBottomIconSize
 import com.vitorpamplona.amethyst.ui.theme.imageModifier
@@ -115,6 +126,7 @@ import kotlinx.coroutines.flow.conflate
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.launch
 import java.util.UUID
+import java.util.concurrent.atomic.AtomicBoolean
 import kotlin.math.abs
 
 public val DEFAULT_MUTED_SETTING = mutableStateOf(true)
@@ -122,10 +134,12 @@ public val DEFAULT_MUTED_SETTING = mutableStateOf(true)
 @Composable
 fun LoadThumbAndThenVideoView(
     videoUri: String,
+    mimeType: String?,
     title: String? = null,
     thumbUri: String,
     authorName: String? = null,
     roundedCorner: Boolean,
+    isFiniteHeight: Boolean,
     nostrUriCallback: String? = null,
     accountViewModel: AccountViewModel,
     onDialog: ((Boolean) -> Unit)? = null,
@@ -138,11 +152,12 @@ fun LoadThumbAndThenVideoView(
             context,
             thumbUri,
             onReady = {
-                if (it != null) {
-                    loadingFinished = Pair(true, it)
-                } else {
-                    loadingFinished = Pair(true, null)
-                }
+                loadingFinished =
+                    if (it != null) {
+                        Pair(true, it)
+                    } else {
+                        Pair(true, null)
+                    }
             },
             onError = { loadingFinished = Pair(true, null) },
         )
@@ -152,9 +167,11 @@ fun LoadThumbAndThenVideoView(
         if (loadingFinished.second != null) {
             VideoView(
                 videoUri = videoUri,
+                mimeType = mimeType,
                 title = title,
                 thumb = VideoThumb(loadingFinished.second),
                 roundedCorner = roundedCorner,
+                isFiniteHeight = isFiniteHeight,
                 artworkUri = thumbUri,
                 authorName = authorName,
                 nostrUriCallback = nostrUriCallback,
@@ -164,9 +181,11 @@ fun LoadThumbAndThenVideoView(
         } else {
             VideoView(
                 videoUri = videoUri,
+                mimeType = mimeType,
                 title = title,
                 thumb = null,
                 roundedCorner = roundedCorner,
+                isFiniteHeight = isFiniteHeight,
                 artworkUri = thumbUri,
                 authorName = authorName,
                 nostrUriCallback = nostrUriCallback,
@@ -180,10 +199,11 @@ fun LoadThumbAndThenVideoView(
 @Composable
 fun VideoView(
     videoUri: String,
+    mimeType: String?,
     title: String? = null,
     thumb: VideoThumb? = null,
     roundedCorner: Boolean,
-    topPaddingForControllers: Dp = Dp.Unspecified,
+    isFiniteHeight: Boolean,
     waveform: ImmutableList<Int>? = null,
     artworkUri: String? = null,
     authorName: String? = null,
@@ -207,7 +227,7 @@ fun VideoView(
     if (blurhash == null) {
         val ratio = aspectRatio(dimensions)
         val modifier =
-            if (ratio != null && roundedCorner && automaticallyStartPlayback.value) {
+            if (ratio != null && automaticallyStartPlayback.value) {
                 Modifier.aspectRatio(ratio)
             } else {
                 Modifier
@@ -219,40 +239,50 @@ fun VideoView(
             } else {
                 VideoViewInner(
                     videoUri = videoUri,
+                    mimeType = mimeType,
                     defaultToStart = defaultToStart,
                     title = title,
                     thumb = thumb,
                     roundedCorner = roundedCorner,
-                    topPaddingForControllers = topPaddingForControllers,
+                    isFiniteHeight = isFiniteHeight,
                     waveform = waveform,
                     artworkUri = artworkUri,
                     authorName = authorName,
-                    dimensions = dimensions,
-                    blurhash = blurhash,
                     nostrUriCallback = nostrUriCallback,
                     automaticallyStartPlayback = automaticallyStartPlayback,
                     onControllerVisibilityChanged = onControllerVisibilityChanged,
                     onDialog = onDialog,
+                    accountViewModel = accountViewModel,
                 )
             }
         }
     } else {
         val ratio = aspectRatio(dimensions)
+
         val modifier =
-            if (ratio != null && roundedCorner) {
+            if (ratio != null) {
                 Modifier.aspectRatio(ratio)
             } else {
                 Modifier
             }
 
         Box(modifier, contentAlignment = Alignment.Center) {
+            val image =
+                if (roundedCorner) {
+                    MaterialTheme.colorScheme.imageModifier
+                } else {
+                    Modifier.fillMaxWidth()
+                }
+
+            // Always displays Blurharh to avoid size flickering
+            DisplayBlurHash(
+                blurhash,
+                null,
+                if (isFiniteHeight) ContentScale.FillWidth else ContentScale.FillWidth,
+                if (ratio != null) image.aspectRatio(ratio) else modifier,
+            )
+
             if (!automaticallyStartPlayback.value) {
-                DisplayBlurHash(
-                    blurhash,
-                    null,
-                    ContentScale.Crop,
-                    MaterialTheme.colorScheme.imageModifier,
-                )
                 IconButton(
                     modifier = Modifier.size(Size75dp),
                     onClick = { automaticallyStartPlayback.value = true },
@@ -262,20 +292,20 @@ fun VideoView(
             } else {
                 VideoViewInner(
                     videoUri = videoUri,
+                    mimeType = mimeType,
                     defaultToStart = defaultToStart,
                     title = title,
                     thumb = thumb,
                     roundedCorner = roundedCorner,
-                    topPaddingForControllers = topPaddingForControllers,
+                    isFiniteHeight = isFiniteHeight,
                     waveform = waveform,
                     artworkUri = artworkUri,
                     authorName = authorName,
-                    dimensions = dimensions,
-                    blurhash = blurhash,
                     nostrUriCallback = nostrUriCallback,
                     automaticallyStartPlayback = automaticallyStartPlayback,
                     onControllerVisibilityChanged = onControllerVisibilityChanged,
                     onDialog = onDialog,
+                    accountViewModel = accountViewModel,
                 )
             }
         }
@@ -286,20 +316,20 @@ fun VideoView(
 @OptIn(androidx.media3.common.util.UnstableApi::class)
 fun VideoViewInner(
     videoUri: String,
+    mimeType: String?,
     defaultToStart: Boolean = false,
     title: String? = null,
     thumb: VideoThumb? = null,
     roundedCorner: Boolean,
-    topPaddingForControllers: Dp = Dp.Unspecified,
+    isFiniteHeight: Boolean,
     waveform: ImmutableList<Int>? = null,
     artworkUri: String? = null,
     authorName: String? = null,
-    dimensions: String? = null,
-    blurhash: String? = null,
     nostrUriCallback: String? = null,
     automaticallyStartPlayback: State<Boolean>,
     onControllerVisibilityChanged: ((Boolean) -> Unit)? = null,
     onDialog: ((Boolean) -> Unit)? = null,
+    accountViewModel: AccountViewModel,
 ) {
     VideoPlayerActiveMutex(videoUri) { modifier, activeOnScreen ->
         GetMediaItem(videoUri, title, artworkUri, authorName) { mediaItem ->
@@ -310,12 +340,13 @@ fun VideoViewInner(
                 nostrUriCallback = nostrUriCallback,
             ) { controller, keepPlaying ->
                 RenderVideoPlayer(
+                    videoUri = videoUri,
+                    mimeType = mimeType,
                     controller = controller,
                     thumbData = thumb,
                     roundedCorner = roundedCorner,
-                    dimensions = dimensions,
-                    blurhash = blurhash,
-                    topPaddingForControllers = topPaddingForControllers,
+                    isFiniteHeight = isFiniteHeight,
+                    nostrUriCallback = nostrUriCallback,
                     waveform = waveform,
                     keepPlaying = keepPlaying,
                     automaticallyStartPlayback = automaticallyStartPlayback,
@@ -323,6 +354,7 @@ fun VideoViewInner(
                     modifier = modifier,
                     onControllerVisibilityChanged = onControllerVisibilityChanged,
                     onDialog = onDialog,
+                    accountViewModel = accountViewModel,
                 )
             }
         }
@@ -340,18 +372,18 @@ data class MediaItemData(
 )
 
 class MediaItemCache() : GenericBaseCache<MediaItemData, MediaItem>(20) {
-    override suspend fun compute(data: MediaItemData): MediaItem? {
+    override suspend fun compute(key: MediaItemData): MediaItem {
         return MediaItem.Builder()
-            .setMediaId(data.videoUri)
-            .setUri(data.videoUri)
+            .setMediaId(key.videoUri)
+            .setUri(key.videoUri)
             .setMediaMetadata(
                 MediaMetadata.Builder()
-                    .setArtist(data.authorName?.ifBlank { null })
-                    .setTitle(data.title?.ifBlank { null } ?: data.videoUri)
+                    .setArtist(key.authorName?.ifBlank { null })
+                    .setTitle(key.title?.ifBlank { null } ?: key.videoUri)
                     .setArtworkUri(
                         try {
-                            if (data.artworkUri != null) {
-                                Uri.parse(data.artworkUri)
+                            if (key.artworkUri != null) {
+                                Uri.parse(key.artworkUri)
                             } else {
                                 null
                             }
@@ -394,6 +426,8 @@ fun GetVideoController(
 ) {
     val context = LocalContext.current
 
+    val onlyOnePreparing = AtomicBoolean()
+
     val controller =
         remember(videoUri) {
             mutableStateOf(
@@ -421,31 +455,36 @@ fun GetVideoController(
         // If it is not null, the user might have come back from a playing video, like clicking on
         // the notification of the video player.
         if (controller.value == null) {
-            scope.launch(Dispatchers.IO) {
-                Log.d("PlaybackService", "Preparing Video $videoUri ")
-                PlaybackClientController.prepareController(
-                    uid,
-                    videoUri,
-                    nostrUriCallback,
-                    context,
-                ) {
-                    scope.launch(Dispatchers.Main) {
-                        // REQUIRED TO BE RUN IN THE MAIN THREAD
-                        if (!it.isPlaying) {
-                            if (keepPlayingMutex?.isPlaying == true) {
-                                // There is a video playing, start this one on mute.
-                                it.volume = 0f
-                            } else {
-                                // There is no other video playing. Use the default mute state to
-                                // decide if sound is on or not.
-                                it.volume = if (defaultToStart) 0f else 1f
+            // If there is a connection, don't wait.
+            if (!onlyOnePreparing.getAndSet(true)) {
+                scope.launch(Dispatchers.IO) {
+                    Log.d("PlaybackService", "Preparing Video $videoUri ")
+                    PlaybackClientController.prepareController(
+                        uid,
+                        videoUri,
+                        nostrUriCallback,
+                        context,
+                    ) {
+                        scope.launch(Dispatchers.Main) {
+                            // REQUIRED TO BE RUN IN THE MAIN THREAD
+                            if (!it.isPlaying) {
+                                if (keepPlayingMutex?.isPlaying == true) {
+                                    // There is a video playing, start this one on mute.
+                                    it.volume = 0f
+                                } else {
+                                    // There is no other video playing. Use the default mute state to
+                                    // decide if sound is on or not.
+                                    it.volume = if (defaultToStart) 0f else 1f
+                                }
                             }
+
+                            it.setMediaItem(mediaItem.value)
+                            it.prepare()
+
+                            controller.value = it
+
+                            onlyOnePreparing.getAndSet(false)
                         }
-
-                        it.setMediaItem(mediaItem.value)
-                        it.prepare()
-
-                        controller.value = it
                     }
                 }
             }
@@ -454,6 +493,8 @@ fun GetVideoController(
             controller.value?.let {
                 scope.launch(Dispatchers.Main) {
                     if (it.playbackState == Player.STATE_IDLE || it.playbackState == Player.STATE_ENDED) {
+                        Log.d("PlaybackService", "Preparing Existing Video $videoUri ")
+
                         if (it.isPlaying) {
                             // There is a video playing, start this one on mute.
                             it.volume = 0f
@@ -474,14 +515,20 @@ fun GetVideoController(
         }
 
         onDispose {
-            GlobalScope.launch(Dispatchers.Main) {
-                if (!keepPlaying.value) {
-                    // Stops and releases the media.
-                    controller.value?.let {
+            if (!keepPlaying.value) {
+                // Makes sure the variable is cleared before the task is launched
+                // to avoid the ON_RELEASE running before ON_PAUSE's coroutine
+                val toRelease = controller.value
+                controller.value = null
+
+                toRelease?.let {
+                    it.pause()
+
+                    GlobalScope.launch(Dispatchers.Main) {
+                        // Stops and releases the media.
                         it.stop()
                         it.release()
                         Log.d("PlaybackService", "Releasing Video $videoUri ")
-                        controller.value = null
                     }
                 }
             }
@@ -497,46 +544,56 @@ fun GetVideoController(
                     // if the controller is null, restarts the controller with a new one
                     // if the controller is not null, just continue playing what the controller was playing
                     if (controller.value == null) {
-                        scope.launch(Dispatchers.IO) {
-                            Log.d("PlaybackService", "Preparing Video from Resume $videoUri ")
-                            PlaybackClientController.prepareController(
-                                uid,
-                                videoUri,
-                                nostrUriCallback,
-                                context,
-                            ) {
-                                scope.launch(Dispatchers.Main) {
-                                    // REQUIRED TO BE RUN IN THE MAIN THREAD
-                                    // checks again to make sure no other thread has created a controller.
-                                    if (!it.isPlaying) {
-                                        if (keepPlayingMutex?.isPlaying == true) {
-                                            // There is a video playing, start this one on mute.
-                                            it.volume = 0f
-                                        } else {
-                                            // There is no other video playing. Use the default mute state to
-                                            // decide if sound is on or not.
-                                            it.volume = if (defaultToStart) 0f else 1f
+                        if (!onlyOnePreparing.getAndSet(true)) {
+                            scope.launch(Dispatchers.IO) {
+                                Log.d("PlaybackService", "Preparing Video from Resume $videoUri ")
+                                PlaybackClientController.prepareController(
+                                    uid,
+                                    videoUri,
+                                    nostrUriCallback,
+                                    context,
+                                ) {
+                                    scope.launch(Dispatchers.Main) {
+                                        // REQUIRED TO BE RUN IN THE MAIN THREAD
+                                        // checks again to make sure no other thread has created a controller.
+                                        if (!it.isPlaying) {
+                                            if (keepPlayingMutex?.isPlaying == true) {
+                                                // There is a video playing, start this one on mute.
+                                                it.volume = 0f
+                                            } else {
+                                                // There is no other video playing. Use the default mute state to
+                                                // decide if sound is on or not.
+                                                it.volume = if (defaultToStart) 0f else 1f
+                                            }
                                         }
+
+                                        it.setMediaItem(mediaItem.value)
+                                        it.prepare()
+
+                                        controller.value = it
+                                        onlyOnePreparing.getAndSet(false)
                                     }
-
-                                    it.setMediaItem(mediaItem.value)
-                                    it.prepare()
-
-                                    controller.value = it
                                 }
                             }
                         }
                     }
                 }
                 if (event == Lifecycle.Event.ON_PAUSE) {
-                    GlobalScope.launch(Dispatchers.Main) {
-                        if (!keepPlaying.value) {
-                            // Stops and releases the media.
-                            controller.value?.let {
+                    if (!keepPlaying.value) {
+                        // Stops and releases the media.
+                        // Makes sure the variable is cleared before the task is launched
+                        // to avoid the ON_RELEASE running before ON_PAUSE's coroutine
+                        val toRelease = controller.value
+                        controller.value = null
+
+                        toRelease?.let {
+                            it.pause()
+
+                            scope.launch(Dispatchers.Main) {
                                 Log.d("PlaybackService", "Releasing Video from Pause $videoUri ")
                                 it.stop()
                                 it.release()
-                                controller.value = null
+                                Log.d("PlaybackService", "Released Video from Pause $videoUri ")
                             }
                         }
                     }
@@ -624,12 +681,13 @@ data class VideoThumb(
 @Composable
 @OptIn(UnstableApi::class)
 private fun RenderVideoPlayer(
+    videoUri: String,
+    mimeType: String?,
     controller: MediaController,
     thumbData: VideoThumb?,
     roundedCorner: Boolean,
-    dimensions: String? = null,
-    blurhash: String? = null,
-    topPaddingForControllers: Dp = Dp.Unspecified,
+    isFiniteHeight: Boolean,
+    nostrUriCallback: String?,
     waveform: ImmutableList<Int>? = null,
     keepPlaying: MutableState<Boolean>,
     automaticallyStartPlayback: State<Boolean>,
@@ -637,25 +695,17 @@ private fun RenderVideoPlayer(
     modifier: Modifier,
     onControllerVisibilityChanged: ((Boolean) -> Unit)? = null,
     onDialog: ((Boolean) -> Unit)?,
+    accountViewModel: AccountViewModel,
 ) {
     ControlWhenPlayerIsActive(controller, keepPlaying, automaticallyStartPlayback, activeOnScreen)
 
     val controllerVisible = remember(controller) { mutableStateOf(false) }
 
-    val videoPlaybackHeight = remember { mutableStateOf<Dp>(Dp.Unspecified) }
-
-    val localDensity = LocalDensity.current
-
-    BoxWithConstraints(
-        modifier =
-            Modifier.onGloballyPositioned { coordinates ->
-                videoPlaybackHeight.value = with(localDensity) { coordinates.size.height.toDp() }
-            },
-    ) {
+    Box {
         val borders = MaterialTheme.colorScheme.imageModifier
 
         val myModifier =
-            remember {
+            remember(controller) {
                 if (roundedCorner) {
                     modifier.then(
                         borders.defaultMinSize(minHeight = 75.dp).align(Alignment.Center),
@@ -665,17 +715,6 @@ private fun RenderVideoPlayer(
                 }
             }
 
-        val ratio = remember { aspectRatio(dimensions) }
-
-        if (ratio != null) {
-            DisplayBlurHash(
-                blurhash,
-                null,
-                ContentScale.Crop,
-                myModifier.aspectRatio(ratio),
-            )
-        }
-
         AndroidView(
             modifier = myModifier,
             factory = { context: Context ->
@@ -692,7 +731,7 @@ private fun RenderVideoPlayer(
                     thumbData?.thumb?.let { defaultArtwork = it }
                     hideController()
                     resizeMode =
-                        if (maxHeight.isFinite) {
+                        if (isFiniteHeight) {
                             AspectRatioFrameLayout.RESIZE_MODE_FIT
                         } else {
                             AspectRatioFrameLayout.RESIZE_MODE_FIXED_WIDTH
@@ -717,26 +756,10 @@ private fun RenderVideoPlayer(
 
         val startingMuteState = remember(controller) { controller.volume < 0.001 }
 
-        val topPadding =
-            remember {
-                derivedStateOf {
-                    if (topPaddingForControllers.isSpecified && videoPlaybackHeight.value.value > 0) {
-                        val space = (abs(this.maxHeight.value - videoPlaybackHeight.value.value) / 2).dp
-                        if (space > topPaddingForControllers) {
-                            Size0dp
-                        } else {
-                            topPaddingForControllers - space
-                        }
-                    } else {
-                        Size0dp
-                    }
-                }
-            }
-
         MuteButton(
             controllerVisible,
             startingMuteState,
-            topPadding,
+            Modifier.align(Alignment.TopEnd),
         ) { mute: Boolean ->
             // makes the new setting the default for new creations.
             DEFAULT_MUTED_SETTING.value = mute
@@ -754,8 +777,7 @@ private fun RenderVideoPlayer(
         KeepPlayingButton(
             keepPlaying,
             controllerVisible,
-            topPadding,
-            Modifier.align(Alignment.TopEnd),
+            Modifier.align(Alignment.TopEnd).padding(end = Size55dp),
         ) { newKeepPlaying: Boolean ->
             // If something else is playing and the user marks this video to keep playing, stops the other
             // one.
@@ -773,6 +795,14 @@ private fun RenderVideoPlayer(
 
             keepPlaying.value = newKeepPlaying
         }
+
+        AnimatedSaveButton(controllerVisible, Modifier.align(Alignment.TopEnd).padding(end = Size110dp)) { context ->
+            saveImage(videoUri, mimeType, context, accountViewModel)
+        }
+
+        AnimatedShareButton(controllerVisible, Modifier.align(Alignment.TopEnd).padding(end = Size165dp)) { popupExpanded, toggle ->
+            ShareImageAction(popupExpanded, videoUri, nostrUriCallback, toggle)
+        }
     }
 }
 
@@ -791,7 +821,7 @@ fun Waveform(
     controller: MediaController,
     modifier: Modifier,
 ) {
-    val waveformProgress = remember { mutableStateOf(0F) }
+    val waveformProgress = remember { mutableFloatStateOf(0F) }
 
     DrawWaveform(waveform, waveformProgress, modifier)
 
@@ -805,7 +835,7 @@ fun Waveform(
                     // doesn't consider the mutex because the screen can turn off if the video
                     // being played in the mutex is not visible.
                     if (isPlaying) {
-                        restartFlow.value += 1
+                        restartFlow.intValue += 1
                     }
                 }
             }
@@ -814,28 +844,28 @@ fun Waveform(
         onDispose { controller.removeListener(listener) }
     }
 
-    LaunchedEffect(key1 = restartFlow.value) {
-        pollCurrentDuration(controller).collect { value -> waveformProgress.value = value }
+    LaunchedEffect(key1 = restartFlow.intValue) {
+        pollCurrentDuration(controller).collect { value -> waveformProgress.floatValue = value }
     }
 }
 
 @Composable
 fun DrawWaveform(
     waveform: ImmutableList<Int>,
-    waveformProgress: MutableState<Float>,
+    waveformProgress: MutableFloatState,
     modifier: Modifier,
 ) {
     AudioWaveformReadOnly(
         modifier = modifier.padding(start = 10.dp, end = 10.dp),
         amplitudes = waveform,
-        progress = waveformProgress.value,
+        progress = waveformProgress.floatValue,
         progressBrush =
             Brush.infiniteLinearGradient(
                 colors = listOf(Color(0xff2598cf), Color(0xff652d80)),
                 animation = tween(durationMillis = 6000, easing = LinearEasing),
                 width = 128F,
             ),
-        onProgressChange = { waveformProgress.value = it },
+        onProgressChange = { waveformProgress.floatValue = it },
     )
 }
 
@@ -940,7 +970,7 @@ fun LayoutCoordinates.getDistanceToVertCenterIfVisible(view: View): Float? {
 private fun MuteButton(
     controllerVisible: MutableState<Boolean>,
     startingMuteState: Boolean,
-    topPadding: State<Dp>,
+    modifier: Modifier,
     toggle: (Boolean) -> Unit,
 ) {
     val holdOn =
@@ -961,7 +991,7 @@ private fun MuteButton(
 
     AnimatedVisibility(
         visible = holdOn.value || controllerVisible.value,
-        modifier = Modifier.padding(top = topPadding.value),
+        modifier = modifier,
         enter = remember { fadeIn() },
         exit = remember { fadeOut() },
     ) {
@@ -994,15 +1024,14 @@ private fun MuteButton(
 private fun KeepPlayingButton(
     keepPlayingStart: MutableState<Boolean>,
     controllerVisible: MutableState<Boolean>,
-    topPadding: State<Dp>,
-    alignment: Modifier,
+    modifier: Modifier,
     toggle: (Boolean) -> Unit,
 ) {
     val keepPlaying = remember(keepPlayingStart.value) { mutableStateOf(keepPlayingStart.value) }
 
     AnimatedVisibility(
         visible = controllerVisible.value,
-        modifier = alignment.padding(top = topPadding.value),
+        modifier = modifier,
         enter = remember { fadeIn() },
         exit = remember { fadeOut() },
     ) {
@@ -1030,3 +1059,125 @@ private fun KeepPlayingButton(
         }
     }
 }
+
+@Composable
+fun AnimatedSaveButton(
+    controllerVisible: State<Boolean>,
+    modifier: Modifier,
+    onSaveClick: (localContext: Context) -> Unit,
+) {
+    AnimatedVisibility(
+        visible = controllerVisible.value,
+        modifier = modifier,
+        enter = remember { fadeIn() },
+        exit = remember { fadeOut() },
+    ) {
+        SaveButton(onSaveClick)
+    }
+}
+
+@Composable
+fun AnimatedShareButton(
+    controllerVisible: State<Boolean>,
+    modifier: Modifier,
+    innerAction: @Composable (MutableState<Boolean>, () -> Unit) -> Unit,
+) {
+    AnimatedVisibility(
+        visible = controllerVisible.value,
+        modifier = modifier,
+        enter = remember { fadeIn() },
+        exit = remember { fadeOut() },
+    ) {
+        ShareButton(innerAction)
+    }
+}
+
+@Composable
+fun ShareButton(innerAction: @Composable (MutableState<Boolean>, () -> Unit) -> Unit) {
+    Box(modifier = PinBottomIconSize) {
+        Box(
+            Modifier.clip(CircleShape)
+                .fillMaxSize(0.6f)
+                .align(Alignment.Center)
+                .background(MaterialTheme.colorScheme.background),
+        )
+
+        val popupExpanded = remember { mutableStateOf(false) }
+
+        IconButton(
+            onClick = {
+                popupExpanded.value = true
+            },
+            modifier = Size50Modifier,
+        ) {
+            Icon(
+                imageVector = Icons.Default.Share,
+                modifier = Size20Modifier,
+                contentDescription = stringResource(R.string.share_or_save),
+            )
+
+            innerAction(popupExpanded) { popupExpanded.value = false }
+        }
+    }
+}
+
+@kotlin.OptIn(ExperimentalPermissionsApi::class)
+@Composable
+fun SaveButton(onSaveClick: (localContext: Context) -> Unit) {
+    Box(modifier = PinBottomIconSize) {
+        Box(
+            Modifier.clip(CircleShape)
+                .fillMaxSize(0.6f)
+                .align(Alignment.Center)
+                .background(MaterialTheme.colorScheme.background),
+        )
+
+        val localContext = LocalContext.current
+
+        val writeStoragePermissionState =
+            rememberPermissionState(Manifest.permission.WRITE_EXTERNAL_STORAGE) { isGranted ->
+                if (isGranted) {
+                    onSaveClick(localContext)
+                }
+            }
+
+        IconButton(
+            onClick = {
+                if (
+                    Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q ||
+                    writeStoragePermissionState.status.isGranted
+                ) {
+                    onSaveClick(localContext)
+                } else {
+                    writeStoragePermissionState.launchPermissionRequest()
+                }
+            },
+            modifier = Size50Modifier,
+        ) {
+            Icon(
+                imageVector = Icons.Default.Download,
+                modifier = Size20Modifier,
+                contentDescription = stringResource(R.string.save_to_gallery),
+            )
+        }
+    }
+}
+
+private fun saveImage(
+    videoUri: String?,
+    mimeType: String?,
+    localContext: Context,
+    accountViewModel: AccountViewModel,
+) {
+    ImageSaver.saveImage(
+        videoUri = videoUri,
+        mimeType = mimeType,
+        localContext = localContext,
+        onSuccess = {
+            accountViewModel.toast(R.string.image_saved_to_the_gallery, R.string.image_saved_to_the_gallery)
+        },
+        onError = {
+            accountViewModel.toast(R.string.failed_to_save_the_image, null, it)
+        },
+    )
+}

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

@@ -0,0 +1,461 @@
+/**
+ * Copyright (c) 2024 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.ui.components
+
+import android.Manifest
+import android.content.Context
+import android.os.Build
+import android.view.View
+import android.view.WindowInsets
+import android.view.WindowManager
+import android.widget.FrameLayout
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
+import androidx.compose.foundation.ExperimentalFoundationApi
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Arrangement.spacedBy
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.statusBarsPadding
+import androidx.compose.foundation.layout.systemBarsPadding
+import androidx.compose.foundation.pager.PagerState
+import androidx.compose.foundation.pager.rememberPagerState
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.filled.ArrowBack
+import androidx.compose.material.icons.filled.Download
+import androidx.compose.material.icons.filled.Share
+import androidx.compose.material3.ButtonDefaults
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.OutlinedButton
+import androidx.compose.material3.Surface
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.DisposableEffect
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.MutableState
+import androidx.compose.runtime.SideEffect
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.platform.LocalConfiguration
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalView
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.window.Dialog
+import androidx.compose.ui.window.DialogProperties
+import androidx.core.net.toUri
+import androidx.core.view.ViewCompat
+import coil.compose.AsyncImage
+import com.google.accompanist.permissions.ExperimentalPermissionsApi
+import com.google.accompanist.permissions.isGranted
+import com.google.accompanist.permissions.rememberPermissionState
+import com.vitorpamplona.amethyst.R
+import com.vitorpamplona.amethyst.commons.richtext.BaseMediaContent
+import com.vitorpamplona.amethyst.commons.richtext.MediaLocalImage
+import com.vitorpamplona.amethyst.commons.richtext.MediaLocalVideo
+import com.vitorpamplona.amethyst.commons.richtext.MediaPreloadedContent
+import com.vitorpamplona.amethyst.commons.richtext.MediaUrlContent
+import com.vitorpamplona.amethyst.commons.richtext.MediaUrlImage
+import com.vitorpamplona.amethyst.commons.richtext.MediaUrlVideo
+import com.vitorpamplona.amethyst.ui.actions.ImageSaver
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
+import com.vitorpamplona.amethyst.ui.theme.Size10dp
+import com.vitorpamplona.amethyst.ui.theme.Size15dp
+import com.vitorpamplona.amethyst.ui.theme.Size20Modifier
+import com.vitorpamplona.amethyst.ui.theme.Size5dp
+import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.toImmutableList
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import net.engawapg.lib.zoomable.rememberZoomState
+import net.engawapg.lib.zoomable.zoomable
+
+@Composable
+fun ZoomableImageDialog(
+    imageUrl: BaseMediaContent,
+    allImages: ImmutableList<BaseMediaContent> = listOf(imageUrl).toImmutableList(),
+    onDismiss: () -> Unit,
+    accountViewModel: AccountViewModel,
+) {
+    val orientation = LocalConfiguration.current.orientation
+
+    Dialog(
+        onDismissRequest = onDismiss,
+        properties =
+            DialogProperties(
+                usePlatformDefaultWidth = true,
+                decorFitsSystemWindows = false,
+            ),
+    ) {
+        val view = LocalView.current
+        val insets = ViewCompat.getRootWindowInsets(view)
+
+        val orientation = LocalConfiguration.current.orientation
+        println("This Log only exists to force orientation listener $orientation")
+
+        val activityWindow = getActivityWindow()
+        val dialogWindow = getDialogWindow()
+        val parentView = LocalView.current.parent as View
+        SideEffect {
+            if (activityWindow != null && dialogWindow != null) {
+                val attributes = WindowManager.LayoutParams()
+                attributes.copyFrom(activityWindow.attributes)
+                attributes.type = dialogWindow.attributes.type
+                dialogWindow.attributes = attributes
+                parentView.layoutParams =
+                    FrameLayout.LayoutParams(
+                        activityWindow.decorView.width,
+                        activityWindow.decorView.height,
+                    )
+                view.layoutParams =
+                    FrameLayout.LayoutParams(
+                        activityWindow.decorView.width,
+                        activityWindow.decorView.height,
+                    )
+            }
+        }
+
+        DisposableEffect(key1 = Unit) {
+            if (Build.VERSION.SDK_INT >= 30) {
+                view.windowInsetsController?.hide(
+                    WindowInsets.Type.systemBars(),
+                )
+            }
+
+            onDispose {
+                if (Build.VERSION.SDK_INT >= 30) {
+                    view.windowInsetsController?.show(
+                        WindowInsets.Type.systemBars(),
+                    )
+                }
+            }
+        }
+
+        Surface(modifier = Modifier.fillMaxSize()) {
+            Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.TopCenter) {
+                DialogContent(allImages, imageUrl, onDismiss, accountViewModel)
+            }
+        }
+    }
+}
+
+@Composable
+@OptIn(ExperimentalFoundationApi::class, ExperimentalPermissionsApi::class)
+private fun DialogContent(
+    allImages: ImmutableList<BaseMediaContent>,
+    imageUrl: BaseMediaContent,
+    onDismiss: () -> Unit,
+    accountViewModel: AccountViewModel,
+) {
+    val pagerState: PagerState = rememberPagerState { allImages.size }
+    val controllerVisible = remember { mutableStateOf(true) }
+
+    LaunchedEffect(key1 = pagerState, key2 = imageUrl) {
+        launch {
+            val page = allImages.indexOf(imageUrl)
+            if (page > -1) {
+                pagerState.scrollToPage(page)
+            }
+        }
+        launch(Dispatchers.Default) {
+            delay(2000)
+            withContext(Dispatchers.Main) {
+                controllerVisible.value = false
+            }
+        }
+    }
+
+    if (allImages.size > 1) {
+        SlidingCarousel(
+            pagerState = pagerState,
+        ) { index ->
+            allImages.getOrNull(index)?.let {
+                Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
+                    RenderImageOrVideo(
+                        content = it,
+                        roundedCorner = false,
+                        isFiniteHeight = true,
+                        controllerVisible = controllerVisible,
+                        onControllerVisibilityChanged = { controllerVisible.value = it },
+                        onToggleControllerVisibility = {
+                            controllerVisible.value = !controllerVisible.value
+                        },
+                        accountViewModel = accountViewModel,
+                    )
+                }
+            }
+        }
+    } else {
+        Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
+            RenderImageOrVideo(
+                content = imageUrl,
+                roundedCorner = false,
+                isFiniteHeight = true,
+                controllerVisible = controllerVisible,
+                onControllerVisibilityChanged = { controllerVisible.value = it },
+                onToggleControllerVisibility = { controllerVisible.value = !controllerVisible.value },
+                accountViewModel = accountViewModel,
+            )
+        }
+    }
+
+    AnimatedVisibility(
+        visible = controllerVisible.value,
+        enter = remember { fadeIn() },
+        exit = remember { fadeOut() },
+    ) {
+        Row(
+            modifier = Modifier.padding(horizontal = Size15dp, vertical = Size10dp).statusBarsPadding().systemBarsPadding().fillMaxWidth(),
+            horizontalArrangement = spacedBy(Size10dp),
+            verticalAlignment = Alignment.CenterVertically,
+        ) {
+            OutlinedButton(
+                onClick = onDismiss,
+                contentPadding = PaddingValues(horizontal = Size5dp),
+                colors = ButtonDefaults.outlinedButtonColors().copy(containerColor = MaterialTheme.colorScheme.background),
+            ) {
+                Icon(
+                    imageVector = Icons.AutoMirrored.Filled.ArrowBack,
+                    contentDescription = stringResource(R.string.back),
+                )
+            }
+
+            Spacer(modifier = Modifier.weight(1f))
+
+            allImages.getOrNull(pagerState.currentPage)?.let { myContent ->
+                val popupExpanded = remember { mutableStateOf(false) }
+
+                OutlinedButton(
+                    onClick = { popupExpanded.value = true },
+                    contentPadding = PaddingValues(horizontal = Size5dp),
+                    colors = ButtonDefaults.outlinedButtonColors().copy(containerColor = MaterialTheme.colorScheme.background),
+                ) {
+                    Icon(
+                        imageVector = Icons.Default.Share,
+                        modifier = Size20Modifier,
+                        contentDescription = stringResource(R.string.quick_action_share),
+                    )
+
+                    ShareImageAction(popupExpanded = popupExpanded, myContent, onDismiss = { popupExpanded.value = false })
+                }
+
+                val localContext = LocalContext.current
+
+                val writeStoragePermissionState =
+                    rememberPermissionState(Manifest.permission.WRITE_EXTERNAL_STORAGE) { isGranted ->
+                        if (isGranted) {
+                            saveImage(myContent, localContext, accountViewModel)
+                        }
+                    }
+
+                OutlinedButton(
+                    onClick = {
+                        if (
+                            Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q ||
+                            writeStoragePermissionState.status.isGranted
+                        ) {
+                            saveImage(myContent, localContext, accountViewModel)
+                        } else {
+                            writeStoragePermissionState.launchPermissionRequest()
+                        }
+                    },
+                    contentPadding = PaddingValues(horizontal = Size5dp),
+                    colors = ButtonDefaults.outlinedButtonColors().copy(containerColor = MaterialTheme.colorScheme.background),
+                ) {
+                    Icon(
+                        imageVector = Icons.Default.Download,
+                        modifier = Size20Modifier,
+                        contentDescription = stringResource(R.string.save_to_gallery),
+                    )
+                }
+            }
+        }
+    }
+}
+
+private fun saveImage(
+    content: BaseMediaContent,
+    localContext: Context,
+    accountViewModel: AccountViewModel,
+) {
+    if (content is MediaUrlContent) {
+        ImageSaver.saveImage(
+            content.url,
+            localContext,
+            onSuccess = {
+                accountViewModel.toast(R.string.image_saved_to_the_gallery, R.string.image_saved_to_the_gallery)
+            },
+            onError = {
+                accountViewModel.toast(R.string.failed_to_save_the_image, null, it)
+            },
+        )
+    } else if (content is MediaPreloadedContent) {
+        content.localFile?.let {
+            ImageSaver.saveImage(
+                it,
+                content.mimeType,
+                localContext,
+                onSuccess = {
+                    accountViewModel.toast(R.string.image_saved_to_the_gallery, R.string.image_saved_to_the_gallery)
+                },
+                onError = {
+                    accountViewModel.toast(R.string.failed_to_save_the_image, null, it)
+                },
+            )
+        }
+    }
+}
+
+@Composable
+@OptIn(ExperimentalFoundationApi::class)
+fun InlineCarrousel(
+    allImages: ImmutableList<String>,
+    imageUrl: String,
+) {
+    val pagerState: PagerState = rememberPagerState { allImages.size }
+
+    LaunchedEffect(key1 = pagerState, key2 = imageUrl) {
+        launch {
+            val page = allImages.indexOf(imageUrl)
+            if (page > -1) {
+                pagerState.scrollToPage(page)
+            }
+        }
+    }
+
+    if (allImages.size > 1) {
+        SlidingCarousel(
+            pagerState = pagerState,
+        ) { index ->
+            AsyncImage(
+                model = allImages[index],
+                contentDescription = null,
+                contentScale = ContentScale.FillWidth,
+                modifier = Modifier.fillMaxWidth(),
+            )
+        }
+    } else {
+        AsyncImage(
+            model = imageUrl,
+            contentDescription = null,
+            contentScale = ContentScale.FillWidth,
+            modifier = Modifier.fillMaxWidth(),
+        )
+    }
+}
+
+@Composable
+private fun RenderImageOrVideo(
+    content: BaseMediaContent,
+    roundedCorner: Boolean,
+    isFiniteHeight: Boolean,
+    controllerVisible: MutableState<Boolean>,
+    onControllerVisibilityChanged: ((Boolean) -> Unit)? = null,
+    onToggleControllerVisibility: (() -> Unit)? = null,
+    accountViewModel: AccountViewModel,
+) {
+    val automaticallyStartPlayback = remember { mutableStateOf<Boolean>(true) }
+
+    Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.Center, modifier = Modifier.fillMaxWidth()) {
+        if (content is MediaUrlImage) {
+            val mainModifier =
+                Modifier
+                    .fillMaxWidth()
+                    .zoomable(
+                        rememberZoomState(),
+                        onTap = {
+                            if (onToggleControllerVisibility != null) {
+                                onToggleControllerVisibility()
+                            }
+                        },
+                    )
+
+            UrlImageView(
+                content = content,
+                mainImageModifier = mainModifier,
+                isFiniteHeight = isFiniteHeight,
+                controllerVisible = controllerVisible,
+                accountViewModel = accountViewModel,
+                alwayShowImage = true,
+            )
+        } else if (content is MediaUrlVideo) {
+            VideoViewInner(
+                videoUri = content.url,
+                mimeType = content.mimeType,
+                title = content.description,
+                artworkUri = content.artworkUri,
+                authorName = content.authorName,
+                roundedCorner = roundedCorner,
+                isFiniteHeight = isFiniteHeight,
+                automaticallyStartPlayback = automaticallyStartPlayback,
+                onControllerVisibilityChanged = onControllerVisibilityChanged,
+                accountViewModel = accountViewModel,
+            )
+        } else if (content is MediaLocalImage) {
+            val mainModifier =
+                Modifier
+                    .fillMaxWidth()
+                    .zoomable(
+                        rememberZoomState(),
+                        onTap = {
+                            if (onToggleControllerVisibility != null) {
+                                onToggleControllerVisibility()
+                            }
+                        },
+                    )
+
+            LocalImageView(
+                content = content,
+                mainImageModifier = mainModifier,
+                isFiniteHeight = isFiniteHeight,
+                controllerVisible = controllerVisible,
+                accountViewModel = accountViewModel,
+                alwayShowImage = true,
+            )
+        } else if (content is MediaLocalVideo) {
+            content.localFile?.let {
+                VideoViewInner(
+                    videoUri = it.toUri().toString(),
+                    mimeType = content.mimeType,
+                    title = content.description,
+                    artworkUri = content.artworkUri,
+                    authorName = content.authorName,
+                    roundedCorner = roundedCorner,
+                    isFiniteHeight = isFiniteHeight,
+                    automaticallyStartPlayback = automaticallyStartPlayback,
+                    onControllerVisibilityChanged = onControllerVisibilityChanged,
+                    accountViewModel = accountViewModel,
+                )
+            }
+        }
+    }
+}

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

@@ -57,6 +57,7 @@ class MarkdownMediaRenderer(
     val canPreview: Boolean,
     val quotesLeft: Int,
     val backgroundColor: MutableState<Color>,
+    val callbackUri: String? = null,
     val accountViewModel: AccountViewModel,
     val nav: (String) -> Unit,
 ) : MediaRenderer {
@@ -94,6 +95,7 @@ class MarkdownMediaRenderer(
                 ZoomableContentView(
                     content = content,
                     roundedCorner = true,
+                    isFiniteHeight = false,
                     accountViewModel = accountViewModel,
                 )
             }
@@ -107,7 +109,7 @@ class MarkdownMediaRenderer(
         uri: String,
         richTextStringBuilder: RichTextString.Builder,
     ) {
-        val content = parser.parseMediaUrl(uri, eventTags = tags ?: EmptyTagList, startOfText)
+        val content = parser.parseMediaUrl(uri, eventTags = tags ?: EmptyTagList, startOfText, callbackUri)
 
         if (canPreview) {
             if (content != null) {
@@ -115,6 +117,7 @@ class MarkdownMediaRenderer(
                     ZoomableContentView(
                         content = content,
                         roundedCorner = true,
+                        isFiniteHeight = false,
                         accountViewModel = accountViewModel,
                     )
                 }
@@ -123,7 +126,7 @@ class MarkdownMediaRenderer(
                     renderAsCompleteLink(title ?: uri, uri, richTextStringBuilder)
                 } else {
                     renderInlineFullWidth(richTextStringBuilder) {
-                        LoadUrlPreview(uri, title ?: uri, accountViewModel)
+                        LoadUrlPreview(uri, title ?: uri, callbackUri, accountViewModel)
                     }
                 }
             }

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

@@ -44,6 +44,7 @@ fun RenderContentAsMarkdown(
     canPreview: Boolean,
     quotesLeft: Int,
     backgroundColor: MutableState<Color>,
+    callbackUri: String? = null,
     accountViewModel: AccountViewModel,
     nav: (String) -> Unit,
 ) {
@@ -70,13 +71,14 @@ fun RenderContentAsMarkdown(
         val renderer =
             remember(content) {
                 MarkdownMediaRenderer(
-                    content.take(100),
-                    tags,
-                    canPreview,
-                    quotesLeft,
-                    backgroundColor,
-                    accountViewModel,
-                    nav,
+                    startOfText = content.take(100),
+                    tags = tags,
+                    canPreview = canPreview,
+                    quotesLeft = quotesLeft,
+                    backgroundColor = backgroundColor,
+                    callbackUri = callbackUri,
+                    accountViewModel = accountViewModel,
+                    nav = nav,
                 )
             }
 

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

@@ -23,7 +23,7 @@ package com.vitorpamplona.amethyst.ui.dal
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.Note
-import com.vitorpamplona.amethyst.ui.actions.updated
+import com.vitorpamplona.amethyst.ui.actions.relays.updated
 import com.vitorpamplona.quartz.events.ChannelMessageEvent
 import com.vitorpamplona.quartz.events.ChatroomKey
 import com.vitorpamplona.quartz.events.ChatroomKeyable

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

@@ -22,7 +22,7 @@ package com.vitorpamplona.amethyst.ui.dal
 
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.Note
-import com.vitorpamplona.amethyst.ui.actions.updated
+import com.vitorpamplona.amethyst.ui.actions.relays.updated
 import com.vitorpamplona.quartz.events.ChatroomKey
 import com.vitorpamplona.quartz.events.ChatroomKeyable
 import com.vitorpamplona.quartz.events.PrivateDmEvent
@@ -46,12 +46,12 @@ class ChatroomListNewFeedFilter(val account: Account) : AdditiveFeedFilter<Note>
 
         val privateMessages =
             newChatrooms.mapNotNull { it ->
-                it.value.roomMessages.sortedWith(compareBy({ it.createdAt() }, { it.idHex })).lastOrNull {
+                it.value.roomMessages.sortedWith(DefaultFeedOrder).firstOrNull {
                     it.event != null
                 }
             }
 
-        return privateMessages.sortedWith(compareBy({ it.createdAt() }, { it.idHex })).reversed()
+        return privateMessages.sortedWith(DefaultFeedOrder)
     }
 
     override fun updateListWith(

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

@@ -21,5 +21,23 @@
 package com.vitorpamplona.amethyst.ui.dal
 
 import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.quartz.events.Event
 
-val DefaultFeedOrder = compareBy<Note>({ it.createdAt() }, { it.idHex }).reversed()
+val DefaultFeedOrder: Comparator<Note> =
+    compareBy<Note>(
+        {
+            val noteEvent = it.event
+            if (noteEvent == null) {
+                null
+            } else {
+                if (noteEvent is Event) {
+                    noteEvent.createdAt
+                } else {
+                    null
+                }
+            }
+        },
+        {
+            it.idHex
+        },
+    ).reversed()