Reverts to the non-Google kotlin style.

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

@@ -28,7 +28,6 @@ import com.vitorpamplona.amethyst.service.Nip96Retriever
 import com.vitorpamplona.amethyst.service.Nip96Uploader
 import com.vitorpamplona.amethyst.ui.actions.ImageDownloader
 import com.vitorpamplona.quartz.crypto.KeyPair
-import java.util.Base64
 import junit.framework.TestCase.assertEquals
 import junit.framework.TestCase.assertTrue
 import junit.framework.TestCase.fail
@@ -36,107 +35,114 @@ import kotlinx.coroutines.runBlocking
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
+import java.util.Base64
 
 @RunWith(AndroidJUnit4::class)
 class ImageUploadTesting {
-  val contentType = "image/gif"
-  val image =
-    "R0lGODlhPQBEAPeoAJosM//AwO/AwHVYZ/z595kzAP/s7P+goOXMv8+fhw/v739/f+8PD98fH/8mJl+fn/9ZWb8/PzWlwv///6wWGbImAPgTEMImIN9gUFCEm/gDALULDN8PAD6atYdCTX9gUNKlj8wZAKUsAOzZz+UMAOsJAP/Z2ccMDA8PD/95eX5NWvsJCOVNQPtfX/8zM8+QePLl38MGBr8JCP+zs9myn/8GBqwpAP/GxgwJCPny78lzYLgjAJ8vAP9fX/+MjMUcAN8zM/9wcM8ZGcATEL+QePdZWf/29uc/P9cmJu9MTDImIN+/r7+/vz8/P8VNQGNugV8AAF9fX8swMNgTAFlDOICAgPNSUnNWSMQ5MBAQEJE3QPIGAM9AQMqGcG9vb6MhJsEdGM8vLx8fH98AANIWAMuQeL8fABkTEPPQ0OM5OSYdGFl5jo+Pj/+pqcsTE78wMFNGQLYmID4dGPvd3UBAQJmTkP+8vH9QUK+vr8ZWSHpzcJMmILdwcLOGcHRQUHxwcK9PT9DQ0O/v70w5MLypoG8wKOuwsP/g4P/Q0IcwKEswKMl8aJ9fX2xjdOtGRs/Pz+Dg4GImIP8gIH0sKEAwKKmTiKZ8aB/f39Wsl+LFt8dgUE9PT5x5aHBwcP+AgP+WltdgYMyZfyywz78AAAAAAAD///8AAP9mZv///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAKgALAAAAAA9AEQAAAj/AFEJHEiwoMGDCBMqXMiwocAbBww4nEhxoYkUpzJGrMixogkfGUNqlNixJEIDB0SqHGmyJSojM1bKZOmyop0gM3Oe2liTISKMOoPy7GnwY9CjIYcSRYm0aVKSLmE6nfq05QycVLPuhDrxBlCtYJUqNAq2bNWEBj6ZXRuyxZyDRtqwnXvkhACDV+euTeJm1Ki7A73qNWtFiF+/gA95Gly2CJLDhwEHMOUAAuOpLYDEgBxZ4GRTlC1fDnpkM+fOqD6DDj1aZpITp0dtGCDhr+fVuCu3zlg49ijaokTZTo27uG7Gjn2P+hI8+PDPERoUB318bWbfAJ5sUNFcuGRTYUqV/3ogfXp1rWlMc6awJjiAAd2fm4ogXjz56aypOoIde4OE5u/F9x199dlXnnGiHZWEYbGpsAEA3QXYnHwEFliKAgswgJ8LPeiUXGwedCAKABACCN+EA1pYIIYaFlcDhytd51sGAJbo3onOpajiihlO92KHGaUXGwWjUBChjSPiWJuOO/LYIm4v1tXfE6J4gCSJEZ7YgRYUNrkji9P55sF/ogxw5ZkSqIDaZBV6aSGYq/lGZplndkckZ98xoICbTcIJGQAZcNmdmUc210hs35nCyJ58fgmIKX5RQGOZowxaZwYA+JaoKQwswGijBV4C6SiTUmpphMspJx9unX4KaimjDv9aaXOEBteBqmuuxgEHoLX6Kqx+yXqqBANsgCtit4FWQAEkrNbpq7HSOmtwag5w57GrmlJBASEU18ADjUYb3ADTinIttsgSB1oJFfA63bduimuqKB1keqwUhoCSK374wbujvOSu4QG6UvxBRydcpKsav++Ca6G8A6Pr1x2kVMyHwsVxUALDq/krnrhPSOzXG1lUTIoffqGR7Goi2MAxbv6O2kEG56I7CSlRsEFKFVyovDJoIRTg7sugNRDGqCJzJgcKE0ywc0ELm6KBCCJo8DIPFeCWNGcyqNFE06ToAfV0HBRgxsvLThHn1oddQMrXj5DyAQgjEHSAJMWZwS3HPxT/QMbabI/iBCliMLEJKX2EEkomBAUCxRi42VDADxyTYDVogV+wSChqmKxEKCDAYFDFj4OmwbY7bDGdBhtrnTQYOigeChUmc1K3QTnAUfEgGFgAWt88hKA6aCRIXhxnQ1yg3BCayK44EWdkUQcBByEQChFXfCB776aQsG0BIlQgQgE8qO26X1h8cEUep8ngRBnOy74E9QgRgEAC8SvOfQkh7FDBDmS43PmGoIiKUUEGkMEC/PJHgxw0xH74yx/3XnaYRJgMB8obxQW6kL9QYEJ0FIFgByfIL7/IQAlvQwEpnAC7DtLNJCKUoO/w45c44GwCXiAFB/OXAATQryUxdN4LfFiwgjCNYg+kYMIEFkCKDs6PKAIJouyGWMS1FSKJOMRB/BoIxYJIUXFUxNwoIkEKPAgCBZSQHQ1A2EWDfDEUVLyADj5AChSIQW6gu10bE/JG2VnCZGfo4R4d0sdQoBAHhPjhIB94v/wRoRKQWGRHgrhGSQJxCS+0pCZbEhAAOw=="
+    val contentType = "image/gif"
+    val image =
+        "R0lGODlhPQBEAPeoAJosM//AwO/AwHVYZ/z595kzAP/s7P+goOXMv8+fhw/v739/f+8PD98fH/8mJl+fn/9ZWb8/PzWlwv///6wWGbImAPgTEMImIN9gUFCEm/gDALULDN8PAD6atYdCTX9gUNKlj8wZAKUsAOzZz+UMAOsJAP/Z2ccMDA8PD/95eX5NWvsJCOVNQPtfX/8zM8+QePLl38MGBr8JCP+zs9myn/8GBqwpAP/GxgwJCPny78lzYLgjAJ8vAP9fX/+MjMUcAN8zM/9wcM8ZGcATEL+QePdZWf/29uc/P9cmJu9MTDImIN+/r7+/vz8/P8VNQGNugV8AAF9fX8swMNgTAFlDOICAgPNSUnNWSMQ5MBAQEJE3QPIGAM9AQMqGcG9vb6MhJsEdGM8vLx8fH98AANIWAMuQeL8fABkTEPPQ0OM5OSYdGFl5jo+Pj/+pqcsTE78wMFNGQLYmID4dGPvd3UBAQJmTkP+8vH9QUK+vr8ZWSHpzcJMmILdwcLOGcHRQUHxwcK9PT9DQ0O/v70w5MLypoG8wKOuwsP/g4P/Q0IcwKEswKMl8aJ9fX2xjdOtGRs/Pz+Dg4GImIP8gIH0sKEAwKKmTiKZ8aB/f39Wsl+LFt8dgUE9PT5x5aHBwcP+AgP+WltdgYMyZfyywz78AAAAAAAD///8AAP9mZv///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAKgALAAAAAA9AEQAAAj/AFEJHEiwoMGDCBMqXMiwocAbBww4nEhxoYkUpzJGrMixogkfGUNqlNixJEIDB0SqHGmyJSojM1bKZOmyop0gM3Oe2liTISKMOoPy7GnwY9CjIYcSRYm0aVKSLmE6nfq05QycVLPuhDrxBlCtYJUqNAq2bNWEBj6ZXRuyxZyDRtqwnXvkhACDV+euTeJm1Ki7A73qNWtFiF+/gA95Gly2CJLDhwEHMOUAAuOpLYDEgBxZ4GRTlC1fDnpkM+fOqD6DDj1aZpITp0dtGCDhr+fVuCu3zlg49ijaokTZTo27uG7Gjn2P+hI8+PDPERoUB318bWbfAJ5sUNFcuGRTYUqV/3ogfXp1rWlMc6awJjiAAd2fm4ogXjz56aypOoIde4OE5u/F9x199dlXnnGiHZWEYbGpsAEA3QXYnHwEFliKAgswgJ8LPeiUXGwedCAKABACCN+EA1pYIIYaFlcDhytd51sGAJbo3onOpajiihlO92KHGaUXGwWjUBChjSPiWJuOO/LYIm4v1tXfE6J4gCSJEZ7YgRYUNrkji9P55sF/ogxw5ZkSqIDaZBV6aSGYq/lGZplndkckZ98xoICbTcIJGQAZcNmdmUc210hs35nCyJ58fgmIKX5RQGOZowxaZwYA+JaoKQwswGijBV4C6SiTUmpphMspJx9unX4KaimjDv9aaXOEBteBqmuuxgEHoLX6Kqx+yXqqBANsgCtit4FWQAEkrNbpq7HSOmtwag5w57GrmlJBASEU18ADjUYb3ADTinIttsgSB1oJFfA63bduimuqKB1keqwUhoCSK374wbujvOSu4QG6UvxBRydcpKsav++Ca6G8A6Pr1x2kVMyHwsVxUALDq/krnrhPSOzXG1lUTIoffqGR7Goi2MAxbv6O2kEG56I7CSlRsEFKFVyovDJoIRTg7sugNRDGqCJzJgcKE0ywc0ELm6KBCCJo8DIPFeCWNGcyqNFE06ToAfV0HBRgxsvLThHn1oddQMrXj5DyAQgjEHSAJMWZwS3HPxT/QMbabI/iBCliMLEJKX2EEkomBAUCxRi42VDADxyTYDVogV+wSChqmKxEKCDAYFDFj4OmwbY7bDGdBhtrnTQYOigeChUmc1K3QTnAUfEgGFgAWt88hKA6aCRIXhxnQ1yg3BCayK44EWdkUQcBByEQChFXfCB776aQsG0BIlQgQgE8qO26X1h8cEUep8ngRBnOy74E9QgRgEAC8SvOfQkh7FDBDmS43PmGoIiKUUEGkMEC/PJHgxw0xH74yx/3XnaYRJgMB8obxQW6kL9QYEJ0FIFgByfIL7/IQAlvQwEpnAC7DtLNJCKUoO/w45c44GwCXiAFB/OXAATQryUxdN4LfFiwgjCNYg+kYMIEFkCKDs6PKAIJouyGWMS1FSKJOMRB/BoIxYJIUXFUxNwoIkEKPAgCBZSQHQ1A2EWDfDEUVLyADj5AChSIQW6gu10bE/JG2VnCZGfo4R4d0sdQoBAHhPjhIB94v/wRoRKQWGRHgrhGSQJxCS+0pCZbEhAAOw=="
 
-  val contentTypePng = "image/png"
-  val imagePng =
-    "iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAApgAAAKYB3X3/OAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAANCSURBVEiJtZZPbBtFFMZ/M7ubXdtdb1xSFyeilBapySVU8h8OoFaooFSqiihIVIpQBKci6KEg9Q6H9kovIHoCIVQJJCKE1ENFjnAgcaSGC6rEnxBwA04Tx43t2FnvDAfjkNibxgHxnWb2e/u992bee7tCa00YFsffekFY+nUzFtjW0LrvjRXrCDIAaPLlW0nHL0SsZtVoaF98mLrx3pdhOqLtYPHChahZcYYO7KvPFxvRl5XPp1sN3adWiD1ZAqD6XYK1b/dvE5IWryTt2udLFedwc1+9kLp+vbbpoDh+6TklxBeAi9TL0taeWpdmZzQDry0AcO+jQ12RyohqqoYoo8RDwJrU+qXkjWtfi8Xxt58BdQuwQs9qC/afLwCw8tnQbqYAPsgxE1S6F3EAIXux2oQFKm0ihMsOF71dHYx+f3NND68ghCu1YIoePPQN1pGRABkJ6Bus96CutRZMydTl+TvuiRW1m3n0eDl0vRPcEysqdXn+jsQPsrHMquGeXEaY4Yk4wxWcY5V/9scqOMOVUFthatyTy8QyqwZ+kDURKoMWxNKr2EeqVKcTNOajqKoBgOE28U4tdQl5p5bwCw7BWquaZSzAPlwjlithJtp3pTImSqQRrb2Z8PHGigD4RZuNX6JYj6wj7O4TFLbCO/Mn/m8R+h6rYSUb3ekokRY6f/YukArN979jcW+V/S8g0eT/N3VN3kTqWbQ428m9/8k0P/1aIhF36PccEl6EhOcAUCrXKZXXWS3XKd2vc/TRBG9O5ELC17MmWubD2nKhUKZa26Ba2+D3P+4/MNCFwg59oWVeYhkzgN/JDR8deKBoD7Y+ljEjGZ0sosXVTvbc6RHirr2reNy1OXd6pJsQ+gqjk8VWFYmHrwBzW/n+uMPFiRwHB2I7ih8ciHFxIkd/3Omk5tCDV1t+2nNu5sxxpDFNx+huNhVT3/zMDz8usXC3ddaHBj1GHj/As08fwTS7Kt1HBTmyN29vdwAw+/wbwLVOJ3uAD1wi/dUH7Qei66PfyuRj4Ik9is+hglfbkbfR3cnZm7chlUWLdwmprtCohX4HUtlOcQjLYCu+fzGJH2QRKvP3UNz8bWk1qMxjGTOMThZ3kvgLI5AzFfo379UAAAAASUVORK5CYII="
+    val contentTypePng = "image/png"
+    val imagePng =
+        "iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAApgAAAKYB3X3/OAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAANCSURBVEiJtZZPbBtFFMZ/M7ubXdtdb1xSFyeilBapySVU8h8OoFaooFSqiihIVIpQBKci6KEg9Q6H9kovIHoCIVQJJCKE1ENFjnAgcaSGC6rEnxBwA04Tx43t2FnvDAfjkNibxgHxnWb2e/u992bee7tCa00YFsffekFY+nUzFtjW0LrvjRXrCDIAaPLlW0nHL0SsZtVoaF98mLrx3pdhOqLtYPHChahZcYYO7KvPFxvRl5XPp1sN3adWiD1ZAqD6XYK1b/dvE5IWryTt2udLFedwc1+9kLp+vbbpoDh+6TklxBeAi9TL0taeWpdmZzQDry0AcO+jQ12RyohqqoYoo8RDwJrU+qXkjWtfi8Xxt58BdQuwQs9qC/afLwCw8tnQbqYAPsgxE1S6F3EAIXux2oQFKm0ihMsOF71dHYx+f3NND68ghCu1YIoePPQN1pGRABkJ6Bus96CutRZMydTl+TvuiRW1m3n0eDl0vRPcEysqdXn+jsQPsrHMquGeXEaY4Yk4wxWcY5V/9scqOMOVUFthatyTy8QyqwZ+kDURKoMWxNKr2EeqVKcTNOajqKoBgOE28U4tdQl5p5bwCw7BWquaZSzAPlwjlithJtp3pTImSqQRrb2Z8PHGigD4RZuNX6JYj6wj7O4TFLbCO/Mn/m8R+h6rYSUb3ekokRY6f/YukArN979jcW+V/S8g0eT/N3VN3kTqWbQ428m9/8k0P/1aIhF36PccEl6EhOcAUCrXKZXXWS3XKd2vc/TRBG9O5ELC17MmWubD2nKhUKZa26Ba2+D3P+4/MNCFwg59oWVeYhkzgN/JDR8deKBoD7Y+ljEjGZ0sosXVTvbc6RHirr2reNy1OXd6pJsQ+gqjk8VWFYmHrwBzW/n+uMPFiRwHB2I7ih8ciHFxIkd/3Omk5tCDV1t+2nNu5sxxpDFNx+huNhVT3/zMDz8usXC3ddaHBj1GHj/As08fwTS7Kt1HBTmyN29vdwAw+/wbwLVOJ3uAD1wi/dUH7Qei66PfyuRj4Ik9is+hglfbkbfR3cnZm7chlUWLdwmprtCohX4HUtlOcQjLYCu+fzGJH2QRKvP3UNz8bWk1qMxjGTOMThZ3kvgLI5AzFfo379UAAAAASUVORK5CYII="
 
-  private suspend fun testBase(server: Nip96MediaServers.ServerName) {
-    val serverInfo =
-      Nip96Retriever()
-        .loadInfo(
-          server.baseUrl,
+    private suspend fun testBase(server: Nip96MediaServers.ServerName) {
+        val serverInfo =
+            Nip96Retriever()
+                .loadInfo(
+                    server.baseUrl,
+                )
+
+        val bytes = Base64.getDecoder().decode(imagePng)
+        val inputStream = bytes.inputStream()
+
+        val account = Account(KeyPair())
+
+        val result =
+            Nip96Uploader(account)
+                .uploadImage(
+                    inputStream,
+                    bytes.size.toLong(),
+                    contentTypePng,
+                    alt = null,
+                    sensitiveContent = null,
+                    serverInfo,
+                    onProgress = {},
+                )
+
+        val url = result.tags!!.first { it[0] == "url" }.get(1)
+        val size = result.tags!!.firstOrNull { it[0] == "size" }?.get(1)?.ifBlank { null }
+        val dim = result.tags!!.firstOrNull { it[0] == "dim" }?.get(1)?.ifBlank { null }
+        val hash = result.tags!!.firstOrNull { it[0] == "x" }?.get(1)?.ifBlank { null }
+        val contentType = result.tags!!.first { it[0] == "m" }.get(1)
+        val ox = result.tags!!.first { it[0] == "ox" }.get(1)
+
+        Assert.assertTrue(url.startsWith("http"))
+
+        val imageData: ByteArray =
+            ImageDownloader().waitAndGetImage(url)
+                ?: run {
+                    fail("Should not be null")
+                    return
+                }
+
+        FileHeader.prepare(
+            imageData,
+            contentTypePng,
+            null,
+            onReady = {
+                if (dim != null) {
+                    assertEquals(dim, it.dim)
+                }
+                if (size != null) {
+                    assertEquals(size, it.size.toString())
+                }
+                if (hash != null) {
+                    assertEquals(hash, it.hash)
+                }
+            },
+            onError = { fail("It should not fail") },
         )
 
-    val bytes = Base64.getDecoder().decode(imagePng)
-    val inputStream = bytes.inputStream()
+        // delay(1000)
 
-    val account = Account(KeyPair())
+        // assertTrue(Nip96Uploader(account).delete(ox, contentType, serverInfo))
+    }
 
-    val result =
-      Nip96Uploader(account)
-        .uploadImage(
-          inputStream,
-          bytes.size.toLong(),
-          contentTypePng,
-          alt = null,
-          sensitiveContent = null,
-          serverInfo,
-          onProgress = {},
-        )
-
-    val url = result.tags!!.first { it[0] == "url" }.get(1)
-    val size = result.tags!!.firstOrNull { it[0] == "size" }?.get(1)?.ifBlank { null }
-    val dim = result.tags!!.firstOrNull { it[0] == "dim" }?.get(1)?.ifBlank { null }
-    val hash = result.tags!!.firstOrNull { it[0] == "x" }?.get(1)?.ifBlank { null }
-    val contentType = result.tags!!.first { it[0] == "m" }.get(1)
-    val ox = result.tags!!.first { it[0] == "ox" }.get(1)
-
-    Assert.assertTrue(url.startsWith("http"))
-
-    val imageData: ByteArray =
-      ImageDownloader().waitAndGetImage(url)
-        ?: run {
-          fail("Should not be null")
-          return
+    @Test()
+    fun testNostrCheck() =
+        runBlocking {
+            testBase(Nip96MediaServers.ServerName("nostrcheck.me", "https://nostrcheck.me"))
         }
 
-    FileHeader.prepare(
-      imageData,
-      contentTypePng,
-      null,
-      onReady = {
-        if (dim != null) {
-          assertEquals(dim, it.dim)
+    @Test()
+    fun testNostrage() =
+        runBlocking {
+            testBase(Nip96MediaServers.ServerName("nostrage", "https://nostrage.com"))
         }
-        if (size != null) {
-          assertEquals(size, it.size.toString())
+
+    @Test()
+    fun testSove() =
+        runBlocking {
+            testBase(Nip96MediaServers.ServerName("sove", "https://sove.rent"))
         }
-        if (hash != null) {
-          assertEquals(hash, it.hash)
+
+    @Test()
+    fun testNostrBuild() =
+        runBlocking {
+            testBase(Nip96MediaServers.ServerName("nostr.build", "https://nostr.build"))
         }
-      },
-      onError = { fail("It should not fail") },
-    )
 
-    // delay(1000)
+    @Test()
+    fun testSovbit() =
+        runBlocking {
+            testBase(Nip96MediaServers.ServerName("sovbit", "https://files.sovbit.host"))
+        }
 
-    // assertTrue(Nip96Uploader(account).delete(ox, contentType, serverInfo))
-  }
-
-  @Test()
-  fun testNostrCheck() = runBlocking {
-    testBase(Nip96MediaServers.ServerName("nostrcheck.me", "https://nostrcheck.me"))
-  }
-
-  @Test()
-  fun testNostrage() = runBlocking {
-    testBase(Nip96MediaServers.ServerName("nostrage", "https://nostrage.com"))
-  }
-
-  @Test()
-  fun testSove() = runBlocking {
-    testBase(Nip96MediaServers.ServerName("sove", "https://sove.rent"))
-  }
-
-  @Test()
-  fun testNostrBuild() = runBlocking {
-    testBase(Nip96MediaServers.ServerName("nostr.build", "https://nostr.build"))
-  }
-
-  @Test()
-  fun testSovbit() = runBlocking {
-    testBase(Nip96MediaServers.ServerName("sovbit", "https://files.sovbit.host"))
-  }
-
-  @Test()
-  fun testVoidCat() = runBlocking {
-    testBase(Nip96MediaServers.ServerName("void.cat", "https://void.cat"))
-  }
+    @Test()
+    fun testVoidCat() =
+        runBlocking {
+            testBase(Nip96MediaServers.ServerName("void.cat", "https://void.cat"))
+        }
 }

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

@@ -40,92 +40,92 @@ import org.junit.runner.RunWith
  */
 @RunWith(AndroidJUnit4::class)
 class UrlUserTagTransformationTest {
-  @Test
-  fun useAppContext() {
-    // Context of the app under test.
-    val appContext = InstrumentationRegistry.getInstrumentation().targetContext
-    assertEquals("com.vitorpamplona.amethyst", appContext.packageName.removeSuffix(".debug"))
-  }
+    @Test
+    fun useAppContext() {
+        // Context of the app under test.
+        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
+        assertEquals("com.vitorpamplona.amethyst", appContext.packageName.removeSuffix(".debug"))
+    }
 
-  @Test
-  fun transformationText() {
-    val user =
-      LocalCache.getOrCreateUser(
-        decodePublicKey("npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z")
-          .toHexKey(),
-      )
-    user.info = UserMetadata()
-    user.info?.displayName = "Vitor Pamplona"
+    @Test
+    fun transformationText() {
+        val user =
+            LocalCache.getOrCreateUser(
+                decodePublicKey("npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z")
+                    .toHexKey(),
+            )
+        user.info = UserMetadata()
+        user.info?.displayName = "Vitor Pamplona"
 
-    val transformedText =
-      buildAnnotatedStringWithUrlHighlighting(
-        AnnotatedString("New Hey @npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z"),
-        Color.Red,
-      )
+        val transformedText =
+            buildAnnotatedStringWithUrlHighlighting(
+                AnnotatedString("New Hey @npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z"),
+                Color.Red,
+            )
 
-    assertEquals("New Hey @Vitor Pamplona", transformedText.text.text)
+        assertEquals("New Hey @Vitor Pamplona", transformedText.text.text)
 
-    assertEquals(0, transformedText.offsetMapping.originalToTransformed(0)) // Before N
-    assertEquals(4, transformedText.offsetMapping.originalToTransformed(4)) // Before H
-    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(9, transformedText.offsetMapping.originalToTransformed(13)) // Before 1
+        assertEquals(0, transformedText.offsetMapping.originalToTransformed(0)) // Before N
+        assertEquals(4, transformedText.offsetMapping.originalToTransformed(4)) // Before H
+        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(9, transformedText.offsetMapping.originalToTransformed(13)) // Before 1
 
-    assertEquals(23, transformedText.offsetMapping.originalToTransformed(71))
-    assertEquals(23, transformedText.offsetMapping.originalToTransformed(72))
+        assertEquals(23, transformedText.offsetMapping.originalToTransformed(71))
+        assertEquals(23, transformedText.offsetMapping.originalToTransformed(72))
 
-    assertEquals(0, transformedText.offsetMapping.transformedToOriginal(0))
-    assertEquals(4, transformedText.offsetMapping.transformedToOriginal(4))
-    assertEquals(8, transformedText.offsetMapping.transformedToOriginal(8))
-    assertEquals(12, transformedText.offsetMapping.transformedToOriginal(9))
+        assertEquals(0, transformedText.offsetMapping.transformedToOriginal(0))
+        assertEquals(4, transformedText.offsetMapping.transformedToOriginal(4))
+        assertEquals(8, transformedText.offsetMapping.transformedToOriginal(8))
+        assertEquals(12, transformedText.offsetMapping.transformedToOriginal(9))
 
-    assertEquals(72, transformedText.offsetMapping.transformedToOriginal(23))
-    assertEquals(73, transformedText.offsetMapping.transformedToOriginal(24))
-  }
+        assertEquals(72, transformedText.offsetMapping.transformedToOriginal(23))
+        assertEquals(73, transformedText.offsetMapping.transformedToOriginal(24))
+    }
 
-  @Test
-  fun transformationTextTwoKeys() {
-    val user =
-      LocalCache.getOrCreateUser(
-        decodePublicKey("npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z")
-          .toHexKey(),
-      )
-    user.info = UserMetadata()
-    user.info?.displayName = "Vitor Pamplona"
+    @Test
+    fun transformationTextTwoKeys() {
+        val user =
+            LocalCache.getOrCreateUser(
+                decodePublicKey("npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z")
+                    .toHexKey(),
+            )
+        user.info = UserMetadata()
+        user.info?.displayName = "Vitor Pamplona"
 
-    val transformedText =
-      buildAnnotatedStringWithUrlHighlighting(
-        AnnotatedString(
-          "New Hey @npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z and @npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z",
-        ),
-        Color.Red,
-      )
+        val transformedText =
+            buildAnnotatedStringWithUrlHighlighting(
+                AnnotatedString(
+                    "New Hey @npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z and @npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z",
+                ),
+                Color.Red,
+            )
 
-    assertEquals("New Hey @Vitor Pamplona and @Vitor Pamplona", transformedText.text.text)
+        assertEquals("New Hey @Vitor Pamplona and @Vitor Pamplona", transformedText.text.text)
 
-    assertEquals(9, transformedText.offsetMapping.originalToTransformed(11))
-    assertEquals(9, transformedText.offsetMapping.originalToTransformed(12))
-    assertEquals(9, transformedText.offsetMapping.originalToTransformed(13))
+        assertEquals(9, transformedText.offsetMapping.originalToTransformed(11))
+        assertEquals(9, 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(23, transformedText.offsetMapping.originalToTransformed(72)) // Before <space>
-    assertEquals(24, transformedText.offsetMapping.originalToTransformed(73)) // Before a
-    assertEquals(25, transformedText.offsetMapping.originalToTransformed(74)) // Before n
-    assertEquals(26, transformedText.offsetMapping.originalToTransformed(75)) // Before d
-    assertEquals(27, transformedText.offsetMapping.originalToTransformed(76)) // Before <space>
-    assertEquals(28, transformedText.offsetMapping.originalToTransformed(77)) // Before @
-    assertEquals(28, transformedText.offsetMapping.originalToTransformed(78)) // Before n
+        assertEquals(23, transformedText.offsetMapping.originalToTransformed(70)) // Before 5
+        assertEquals(23, 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
+        assertEquals(26, transformedText.offsetMapping.originalToTransformed(75)) // Before d
+        assertEquals(27, transformedText.offsetMapping.originalToTransformed(76)) // Before <space>
+        assertEquals(28, transformedText.offsetMapping.originalToTransformed(77)) // Before @
+        assertEquals(28, transformedText.offsetMapping.originalToTransformed(78)) // Before n
 
-    assertEquals(68, 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
-    assertEquals(75, transformedText.offsetMapping.transformedToOriginal(26)) // Before d
-    assertEquals(76, transformedText.offsetMapping.transformedToOriginal(27)) // Before <space>
-    assertEquals(77, transformedText.offsetMapping.transformedToOriginal(28)) // Before @
-  }
+        assertEquals(68, 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
+        assertEquals(75, transformedText.offsetMapping.transformedToOriginal(26)) // Before d
+        assertEquals(76, transformedText.offsetMapping.transformedToOriginal(27)) // Before <space>
+        assertEquals(77, transformedText.offsetMapping.transformedToOriginal(28)) // Before @
+    }
 }

app/src/androidTestPlay/java/com/vitorpamplona/amethyst/TranslationsTest.kt

@@ -30,136 +30,136 @@ import org.junit.runner.RunWith
 
 @RunWith(AndroidJUnit4::class)
 class TranslationsTest {
-  fun translateTo(
-    text: String,
-    translateTo: String,
-  ): String? {
-    val task = LanguageTranslatorService.autoTranslate(text, emptySet(), translateTo)
-    return Tasks.await(task).result
-  }
+    fun translateTo(
+        text: String,
+        translateTo: String,
+    ): String? {
+        val task = LanguageTranslatorService.autoTranslate(text, emptySet(), translateTo)
+        return Tasks.await(task).result
+    }
 
-  fun assertTranslate(
-    expected: String,
-    input: String,
-    translateTo: String,
-  ) {
-    assertEquals(null, expected, translateTo(input, translateTo))
-  }
+    fun assertTranslate(
+        expected: String,
+        input: String,
+        translateTo: String,
+    ) {
+        assertEquals(null, expected, translateTo(input, translateTo))
+    }
 
-  fun assertTranslateContains(
-    expected: String,
-    input: String,
-    translateTo: String,
-  ) {
-    val translated = translateTo(input, translateTo)!!
-    assertTrue("'$translated' does not contain '$expected'", translated.contains(expected))
-  }
+    fun assertTranslateContains(
+        expected: String,
+        input: String,
+        translateTo: String,
+    ) {
+        val translated = translateTo(input, translateTo)!!
+        assertTrue("'$translated' does not contain '$expected'", translated.contains(expected))
+    }
 
-  @Test
-  fun testTranslation() {
-    assertTranslate("Olá mundo", "Hello World", "pt")
-  }
+    @Test
+    fun testTranslation() {
+        assertTranslate("Olá mundo", "Hello World", "pt")
+    }
 
-  @Test
-  fun testTranslationName() {
-    assertTranslate("Olá Vitor, como você está?", "Hello Vitor, how are you doing?", "pt")
-  }
+    @Test
+    fun testTranslationName() {
+        assertTranslate("Olá Vitor, como você está?", "Hello Vitor, how are you doing?", "pt")
+    }
 
-  @Test
-  fun testTranslationTag() {
-    assertTranslate("Você já viu isso, #[0]", "Have you seen this, #[0]", "pt")
-  }
+    @Test
+    fun testTranslationTag() {
+        assertTranslate("Você já viu isso, #[0]", "Have you seen this, #[0]", "pt")
+    }
 
-  @Test
-  fun testTranslationUrl() {
-    assertTranslateContains("https://t.me/mygroup", "Have you seen this https://t.me/mygroup", "pt")
-    assertTranslateContains("http://bananas.com", "Have you seen this http://bananas.com", "pt")
-    assertTranslateContains(
-      "http://bananas.com/myimage.jpg",
-      "Have you seen this http://bananas.com/myimage.jpg",
-      "pt",
-    )
-    assertTranslateContains(
-      "http://bananas.com?search=true&image=myimage.jpg",
-      "Have you seen this http://bananas.com?search=true&image=myimage.jpg",
-      "pt",
-    )
-    assertTranslate("https://i.imgur.com/EZ3QPsw.jpg", "https://i.imgur.com/EZ3QPsw.jpg", "pt")
-    assertTranslate("https://HaveYouSeenThis.com", "https://HaveYouSeenThis.com", "pt")
-    assertTranslate("https://haveyouseenthis.com", "https://haveyouseenthis.com", "pt")
-    assertTranslate(
-      "https://i.imgur.com/asdEZ3QPsw.jpg",
-      "https://i.imgur.com/asdEZ3QPsw.jpg",
-      "pt",
-    )
-    assertTranslateContains(
-      "https://i.imgur.com/asdEZ3QPswadfj2389rioasdjf9834riofaj9834aKLL.jpg",
-      "Hi there! \n How are you doing? \n https://i.imgur.com/asdEZ3QPswadfj2389rioasdjf9834riofaj9834aKLL.jpg",
-      "pt",
-    )
-  }
+    @Test
+    fun testTranslationUrl() {
+        assertTranslateContains("https://t.me/mygroup", "Have you seen this https://t.me/mygroup", "pt")
+        assertTranslateContains("http://bananas.com", "Have you seen this http://bananas.com", "pt")
+        assertTranslateContains(
+            "http://bananas.com/myimage.jpg",
+            "Have you seen this http://bananas.com/myimage.jpg",
+            "pt",
+        )
+        assertTranslateContains(
+            "http://bananas.com?search=true&image=myimage.jpg",
+            "Have you seen this http://bananas.com?search=true&image=myimage.jpg",
+            "pt",
+        )
+        assertTranslate("https://i.imgur.com/EZ3QPsw.jpg", "https://i.imgur.com/EZ3QPsw.jpg", "pt")
+        assertTranslate("https://HaveYouSeenThis.com", "https://HaveYouSeenThis.com", "pt")
+        assertTranslate("https://haveyouseenthis.com", "https://haveyouseenthis.com", "pt")
+        assertTranslate(
+            "https://i.imgur.com/asdEZ3QPsw.jpg",
+            "https://i.imgur.com/asdEZ3QPsw.jpg",
+            "pt",
+        )
+        assertTranslateContains(
+            "https://i.imgur.com/asdEZ3QPswadfj2389rioasdjf9834riofaj9834aKLL.jpg",
+            "Hi there! \n How are you doing? \n https://i.imgur.com/asdEZ3QPswadfj2389rioasdjf9834riofaj9834aKLL.jpg",
+            "pt",
+        )
+    }
 
-  @Test
-  fun testChineseWithUrlDetector() {
-    assertTranslate(
-      "I entered your home page is very carton, perhaps your attention or other data is too much, and the homepage of others is not so carton. From aMethyst client",
-      "我进入你的主页很卡顿，也许是你的关注人数或者其他数据太多了，其他人主页没有这么卡顿。来自amethyst客户端",
-      "en",
-    )
-  }
+    @Test
+    fun testChineseWithUrlDetector() {
+        assertTranslate(
+            "I entered your home page is very carton, perhaps your attention or other data is too much, and the homepage of others is not so carton. From aMethyst client",
+            "我进入你的主页很卡顿，也许是你的关注人数或者其他数据太多了，其他人主页没有这么卡顿。来自amethyst客户端",
+            "en",
+        )
+    }
 
-  @Test
-  fun testTranslationEmail() {
-    assertTranslateContains(
-      "vitor@amethyst.social",
-      "Have you seen this vitor@amethyst.social",
-      "pt",
-    )
-  }
+    @Test
+    fun testTranslationEmail() {
+        assertTranslateContains(
+            "vitor@amethyst.social",
+            "Have you seen this vitor@amethyst.social",
+            "pt",
+        )
+    }
 
-  @Test
-  fun testTranslationLnInvoice() {
-    assertTranslateContains(
-      "lnbc12u1p3lvjeupp5a5ecgp45k6pa8tu7rnkgzfuwdy3l5ylv3k5tdzrg4cr8rj2f364sdq5g9kxy7fqd9h8vmmfvdjscqzpgxqyz5vqsp5zuzyetf33aphetf0e80w7tztw6dfsjs4lmvya4cyk8umfsx00qts9qyyssqke9hphcr36zvcav8wr502g0mhfhxpy8m9tt36zttg8vldm2qxw039ulccr8nwy3hjg2sw5vk65e99lwuhrhw0nuya2u57qszltvx7egp74jydn",
-      "Have you seen this: lnbc12u1p3lvjeupp5a5ecgp45k6pa8tu7rnkgzfuwdy3l5ylv3k5tdzrg4cr8rj2f364sdq5g9kxy7fqd9h8vmmfvdjscqzpgxqyz5vqsp5zuzyetf33aphetf0e80w7tztw6dfsjs4lmvya4cyk8umfsx00qts9qyyssqke9hphcr36zvcav8wr502g0mhfhxpy8m9tt36zttg8vldm2qxw039ulccr8nwy3hjg2sw5vk65e99lwuhrhw0nuya2u57qszltvx7egp74jydn I think I have to pay",
-      "pt",
-    )
+    @Test
+    fun testTranslationLnInvoice() {
+        assertTranslateContains(
+            "lnbc12u1p3lvjeupp5a5ecgp45k6pa8tu7rnkgzfuwdy3l5ylv3k5tdzrg4cr8rj2f364sdq5g9kxy7fqd9h8vmmfvdjscqzpgxqyz5vqsp5zuzyetf33aphetf0e80w7tztw6dfsjs4lmvya4cyk8umfsx00qts9qyyssqke9hphcr36zvcav8wr502g0mhfhxpy8m9tt36zttg8vldm2qxw039ulccr8nwy3hjg2sw5vk65e99lwuhrhw0nuya2u57qszltvx7egp74jydn",
+            "Have you seen this: lnbc12u1p3lvjeupp5a5ecgp45k6pa8tu7rnkgzfuwdy3l5ylv3k5tdzrg4cr8rj2f364sdq5g9kxy7fqd9h8vmmfvdjscqzpgxqyz5vqsp5zuzyetf33aphetf0e80w7tztw6dfsjs4lmvya4cyk8umfsx00qts9qyyssqke9hphcr36zvcav8wr502g0mhfhxpy8m9tt36zttg8vldm2qxw039ulccr8nwy3hjg2sw5vk65e99lwuhrhw0nuya2u57qszltvx7egp74jydn I think I have to pay",
+            "pt",
+        )
 
-    assertTranslateContains(
-      "lnbc10u1p3l0wg0pp5y5y3vxt3429m28uuq56uqhwxadftn67yaarq06h3y9nqapz72n6sdqqxqyjw5q9q7sqqqqqqqqqqqqqqqqqqqqqqqqq9qsqsp5y2tazp42xde3c0tdsz30zqcekrt0lzrneszdtagy2qn7vs0d3p5qrzjqwryaup9lh50kkranzgcdnn2fgvx390wgj5jd07rwr3vxeje0glcll7jdvcln4lhw5qqqqlgqqqqqeqqjqdau9jzseecmvmh03h88xyf5f980xx45fmn0cej654v5jr79ye36pww90jwdda38damlmgt54v8rn6q9kywtw057rh4v3wwrmn8fajagqnssr7v",
-      "Test lnbc10u1p3l0wg0pp5y5y3vxt3429m28uuq56uqhwxadftn67yaarq06h3y9nqapz72n6sdqqxqyjw5q9q7sqqqqqqqqqqqqqqqqqqqqqqqqq9qsqsp5y2tazp42xde3c0tdsz30zqcekrt0lzrneszdtagy2qn7vs0d3p5qrzjqwryaup9lh50kkranzgcdnn2fgvx390wgj5jd07rwr3vxeje0glcll7jdvcln4lhw5qqqqlgqqqqqeqqjqdau9jzseecmvmh03h88xyf5f980xx45fmn0cej654v5jr79ye36pww90jwdda38damlmgt54v8rn6q9kywtw057rh4v3wwrmn8fajagqnssr7v",
-      "pt",
-    )
-  }
+        assertTranslateContains(
+            "lnbc10u1p3l0wg0pp5y5y3vxt3429m28uuq56uqhwxadftn67yaarq06h3y9nqapz72n6sdqqxqyjw5q9q7sqqqqqqqqqqqqqqqqqqqqqqqqq9qsqsp5y2tazp42xde3c0tdsz30zqcekrt0lzrneszdtagy2qn7vs0d3p5qrzjqwryaup9lh50kkranzgcdnn2fgvx390wgj5jd07rwr3vxeje0glcll7jdvcln4lhw5qqqqlgqqqqqeqqjqdau9jzseecmvmh03h88xyf5f980xx45fmn0cej654v5jr79ye36pww90jwdda38damlmgt54v8rn6q9kywtw057rh4v3wwrmn8fajagqnssr7v",
+            "Test lnbc10u1p3l0wg0pp5y5y3vxt3429m28uuq56uqhwxadftn67yaarq06h3y9nqapz72n6sdqqxqyjw5q9q7sqqqqqqqqqqqqqqqqqqqqqqqqq9qsqsp5y2tazp42xde3c0tdsz30zqcekrt0lzrneszdtagy2qn7vs0d3p5qrzjqwryaup9lh50kkranzgcdnn2fgvx390wgj5jd07rwr3vxeje0glcll7jdvcln4lhw5qqqqlgqqqqqeqqjqdau9jzseecmvmh03h88xyf5f980xx45fmn0cej654v5jr79ye36pww90jwdda38damlmgt54v8rn6q9kywtw057rh4v3wwrmn8fajagqnssr7v",
+            "pt",
+        )
+    }
 
-  @Test
-  fun testNostrEvents() {
-    assertTranslateContains(
-      "nostr:nevent1qqs0tsw8hjacs4fppgdg7f5yhgwwfkyua4xcs3re9wwkpkk2qeu6mhql22rcy",
-      "sure, nostr:nevent1qqs0tsw8hjacs4fppgdg7f5yhgwwfkyua4xcs3re9wwkpkk2qeu6mhql22rcy",
-      "en",
-    )
-  }
+    @Test
+    fun testNostrEvents() {
+        assertTranslateContains(
+            "nostr:nevent1qqs0tsw8hjacs4fppgdg7f5yhgwwfkyua4xcs3re9wwkpkk2qeu6mhql22rcy",
+            "sure, nostr:nevent1qqs0tsw8hjacs4fppgdg7f5yhgwwfkyua4xcs3re9wwkpkk2qeu6mhql22rcy",
+            "en",
+        )
+    }
 
-  @Test
-  fun testJapaneseTranslationsOfUrl() {
-    assertTranslateContains(
-      "https://youtu.be/wMYFmCDy_Eg",
-      "うちの会社の小さい先輩の話 第1話「うちの会社の先輩は小さくて可愛い」\n" +
-        "\n" +
-        "https://youtu.be/wMYFmCDy_Eg\n" +
-        "\n" +
-        "先輩がうざい後輩の話と似たような話かと思ったけど、もっとオタクの妄想あるある的なものを詰め込んだやつだ。ワードとかシチュエーションとか、ヒロインのサイズ感とか。知らんけど",
-      "en",
-    )
-  }
+    @Test
+    fun testJapaneseTranslationsOfUrl() {
+        assertTranslateContains(
+            "https://youtu.be/wMYFmCDy_Eg",
+            "うちの会社の小さい先輩の話 第1話「うちの会社の先輩は小さくて可愛い」\n" +
+                "\n" +
+                "https://youtu.be/wMYFmCDy_Eg\n" +
+                "\n" +
+                "先輩がうざい後輩の話と似たような話かと思ったけど、もっとオタクの妄想あるある的なものを詰め込んだやつだ。ワードとかシチュエーションとか、ヒロインのサイズ感とか。知らんけど",
+            "en",
+        )
+    }
 
-  @Test
-  fun testEmoji() {
-    assertTranslateContains(
-      "https://cdn.nostr.build/i/df3783dcdf7dd289ba02ba538dc039c8fe1d4db055e580b81604ed88c6af4ee0.jpg",
-      "\uD83E\uDD23 https://cdn.nostr.build/i/df3783dcdf7dd289ba02ba538dc039c8fe1d4db055e580b81604ed88c6af4ee0.jpg ",
-      "pt",
-    )
-  }
+    @Test
+    fun testEmoji() {
+        assertTranslateContains(
+            "https://cdn.nostr.build/i/df3783dcdf7dd289ba02ba538dc039c8fe1d4db055e580b81604ed88c6af4ee0.jpg",
+            "\uD83E\uDD23 https://cdn.nostr.build/i/df3783dcdf7dd289ba02ba538dc039c8fe1d4db055e580b81604ed88c6af4ee0.jpg ",
+            "pt",
+        )
+    }
 }

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

@@ -21,5 +21,5 @@
 package com.vitorpamplona.amethyst.service.lang
 
 object LanguageTranslatorService {
-  fun clear() {}
+    fun clear() {}
 }

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

@@ -28,80 +28,80 @@ import com.vitorpamplona.amethyst.Amethyst
 import org.unifiedpush.android.connector.UnifiedPush
 
 interface PushDistributorActions {
-  fun getSavedDistributor(): String
+    fun getSavedDistributor(): String
 
-  fun getInstalledDistributors(): List<String>
+    fun getInstalledDistributors(): List<String>
 
-  fun saveDistributor(distributor: String)
+    fun saveDistributor(distributor: String)
 
-  fun removeSavedDistributor()
+    fun removeSavedDistributor()
 }
 
 object PushDistributorHandler : PushDistributorActions {
-  private val appContext = Amethyst.instance.applicationContext
-  private val unifiedPush: UnifiedPush = UnifiedPush
+    private val appContext = Amethyst.instance.applicationContext
+    private val unifiedPush: UnifiedPush = UnifiedPush
 
-  private var endpointInternal = ""
-  val endpoint = endpointInternal
+    private var endpointInternal = ""
+    val endpoint = endpointInternal
 
-  fun getSavedEndpoint() = endpoint
+    fun getSavedEndpoint() = endpoint
 
-  fun setEndpoint(newEndpoint: String) {
-    endpointInternal = newEndpoint
-    Log.d("PushHandler", "New endpoint saved : $endpointInternal")
-  }
+    fun setEndpoint(newEndpoint: String) {
+        endpointInternal = newEndpoint
+        Log.d("PushHandler", "New endpoint saved : $endpointInternal")
+    }
 
-  fun removeEndpoint() {
-    endpointInternal = ""
-  }
+    fun removeEndpoint() {
+        endpointInternal = ""
+    }
 
-  override fun getSavedDistributor(): String {
-    return unifiedPush.getDistributor(appContext)
-  }
+    override fun getSavedDistributor(): String {
+        return unifiedPush.getDistributor(appContext)
+    }
 
-  fun savedDistributorExists(): Boolean = getSavedDistributor().isNotEmpty()
+    fun savedDistributorExists(): Boolean = getSavedDistributor().isNotEmpty()
 
-  override fun getInstalledDistributors(): List<String> {
-    return unifiedPush.getDistributors(appContext)
-  }
+    override fun getInstalledDistributors(): List<String> {
+        return unifiedPush.getDistributors(appContext)
+    }
 
-  fun formattedDistributorNames(): List<String> {
-    val distributorsArray = getInstalledDistributors().toTypedArray()
-    val distributorsNameArray =
-      distributorsArray
-        .map {
-          try {
-            val ai =
-              if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-                appContext.packageManager.getApplicationInfo(
-                  it,
-                  PackageManager.ApplicationInfoFlags.of(
-                    PackageManager.GET_META_DATA.toLong(),
-                  ),
-                )
-              } else {
-                appContext.packageManager.getApplicationInfo(it, 0)
-              }
-            appContext.packageManager.getApplicationLabel(ai)
-          } catch (e: PackageManager.NameNotFoundException) {
-            it
-          }
-            as String
-        }
-        .toTypedArray()
-    return distributorsNameArray.toList()
-  }
+    fun formattedDistributorNames(): List<String> {
+        val distributorsArray = getInstalledDistributors().toTypedArray()
+        val distributorsNameArray =
+            distributorsArray
+                .map {
+                    try {
+                        val ai =
+                            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+                                appContext.packageManager.getApplicationInfo(
+                                    it,
+                                    PackageManager.ApplicationInfoFlags.of(
+                                        PackageManager.GET_META_DATA.toLong(),
+                                    ),
+                                )
+                            } else {
+                                appContext.packageManager.getApplicationInfo(it, 0)
+                            }
+                        appContext.packageManager.getApplicationLabel(ai)
+                    } catch (e: PackageManager.NameNotFoundException) {
+                        it
+                    }
+                        as String
+                }
+                .toTypedArray()
+        return distributorsNameArray.toList()
+    }
 
-  override fun saveDistributor(distributor: String) {
-    unifiedPush.saveDistributor(appContext, distributor)
-    unifiedPush.registerApp(appContext)
-  }
+    override fun saveDistributor(distributor: String) {
+        unifiedPush.saveDistributor(appContext, distributor)
+        unifiedPush.registerApp(appContext)
+    }
 
-  override fun removeSavedDistributor() {
-    unifiedPush.safeRemoveDistributor(appContext)
-  }
+    override fun removeSavedDistributor() {
+        unifiedPush.safeRemoveDistributor(appContext)
+    }
 
-  fun forceRemoveDistributor(context: Context) {
-    unifiedPush.forceRemoveDistributor(context)
-  }
+    fun forceRemoveDistributor(context: Context) {
+        unifiedPush.forceRemoveDistributor(context)
+    }
 }

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

@@ -40,92 +40,92 @@ import kotlinx.coroutines.launch
 import org.unifiedpush.android.connector.MessagingReceiver
 
 class PushMessageReceiver : MessagingReceiver() {
-  companion object {
-    private val TAG = "Amethyst-OSSPushReceiver"
-  }
-
-  private val appContext = Amethyst.instance.applicationContext
-  private val scope = CoroutineScope(Dispatchers.IO + SupervisorJob())
-  private val eventCache = LruCache<String, String>(100)
-  private val pushHandler = PushDistributorHandler
-
-  override fun onMessage(
-    context: Context,
-    message: ByteArray,
-    instance: String,
-  ) {
-    val messageStr = String(message)
-    Log.d(TAG, "New message ${message.decodeToString()} for Instance: $instance")
-    scope.launch {
-      try {
-        parseMessage(messageStr)?.let { receiveIfNew(it) }
-      } catch (e: Exception) {
-        Log.d(TAG, "Message could not be parsed: ${e.message}")
-      }
+    companion object {
+        private val TAG = "Amethyst-OSSPushReceiver"
     }
-  }
 
-  private suspend fun parseMessage(message: String): GiftWrapEvent? {
-    (Event.fromJson(message) as? GiftWrapEvent)?.let {
-      return it
+    private val appContext = Amethyst.instance.applicationContext
+    private val scope = CoroutineScope(Dispatchers.IO + SupervisorJob())
+    private val eventCache = LruCache<String, String>(100)
+    private val pushHandler = PushDistributorHandler
+
+    override fun onMessage(
+        context: Context,
+        message: ByteArray,
+        instance: String,
+    ) {
+        val messageStr = String(message)
+        Log.d(TAG, "New message ${message.decodeToString()} for Instance: $instance")
+        scope.launch {
+            try {
+                parseMessage(messageStr)?.let { receiveIfNew(it) }
+            } catch (e: Exception) {
+                Log.d(TAG, "Message could not be parsed: ${e.message}")
+            }
+        }
     }
-    return null
-  }
 
-  private suspend fun receiveIfNew(event: GiftWrapEvent) {
-    if (eventCache.get(event.id) == null) {
-      eventCache.put(event.id, event.id)
-      EventNotificationConsumer(appContext).consume(event)
+    private suspend fun parseMessage(message: String): GiftWrapEvent? {
+        (Event.fromJson(message) as? GiftWrapEvent)?.let {
+            return it
+        }
+        return null
     }
-  }
 
-  override fun onNewEndpoint(
-    context: Context,
-    endpoint: String,
-    instance: String,
-  ) {
-    Log.d(TAG, "New endpoint provided:- $endpoint for Instance: $instance")
-    val sanitizedEndpoint = endpoint.dropLast(5)
-    pushHandler.setEndpoint(sanitizedEndpoint)
-    scope.launch(Dispatchers.IO) {
-      RegisterAccounts(LocalPreferences.allSavedAccounts()).go(sanitizedEndpoint)
-      notificationManager().getOrCreateZapChannel(appContext)
-      notificationManager().getOrCreateDMChannel(appContext)
+    private suspend fun receiveIfNew(event: GiftWrapEvent) {
+        if (eventCache.get(event.id) == null) {
+            eventCache.put(event.id, event.id)
+            EventNotificationConsumer(appContext).consume(event)
+        }
     }
-  }
 
-  override fun onReceive(
-    context: Context,
-    intent: Intent,
-  ) {
-    val intentData = intent.dataString
-    val intentAction = intent.action.toString()
-    Log.d(TAG, "Intent Data:- $intentData Intent Action: $intentAction")
-    super.onReceive(context, intent)
-  }
+    override fun onNewEndpoint(
+        context: Context,
+        endpoint: String,
+        instance: String,
+    ) {
+        Log.d(TAG, "New endpoint provided:- $endpoint for Instance: $instance")
+        val sanitizedEndpoint = endpoint.dropLast(5)
+        pushHandler.setEndpoint(sanitizedEndpoint)
+        scope.launch(Dispatchers.IO) {
+            RegisterAccounts(LocalPreferences.allSavedAccounts()).go(sanitizedEndpoint)
+            notificationManager().getOrCreateZapChannel(appContext)
+            notificationManager().getOrCreateDMChannel(appContext)
+        }
+    }
 
-  override fun onRegistrationFailed(
-    context: Context,
-    instance: String,
-  ) {
-    Log.d(TAG, "Registration failed for Instance: $instance")
-    scope.cancel()
-    pushHandler.forceRemoveDistributor(context)
-  }
+    override fun onReceive(
+        context: Context,
+        intent: Intent,
+    ) {
+        val intentData = intent.dataString
+        val intentAction = intent.action.toString()
+        Log.d(TAG, "Intent Data:- $intentData Intent Action: $intentAction")
+        super.onReceive(context, intent)
+    }
 
-  override fun onUnregistered(
-    context: Context,
-    instance: String,
-  ) {
-    val removedEndpoint = pushHandler.endpoint
-    Log.d(TAG, "Endpoint: $removedEndpoint removed for Instance: $instance")
-    Log.d(TAG, "App is unregistered. ")
-    pushHandler.forceRemoveDistributor(context)
-    pushHandler.removeEndpoint()
-  }
+    override fun onRegistrationFailed(
+        context: Context,
+        instance: String,
+    ) {
+        Log.d(TAG, "Registration failed for Instance: $instance")
+        scope.cancel()
+        pushHandler.forceRemoveDistributor(context)
+    }
 
-  fun notificationManager(): NotificationManager {
-    return ContextCompat.getSystemService(appContext, NotificationManager::class.java)
-      as NotificationManager
-  }
+    override fun onUnregistered(
+        context: Context,
+        instance: String,
+    ) {
+        val removedEndpoint = pushHandler.endpoint
+        Log.d(TAG, "Endpoint: $removedEndpoint removed for Instance: $instance")
+        Log.d(TAG, "App is unregistered. ")
+        pushHandler.forceRemoveDistributor(context)
+        pushHandler.removeEndpoint()
+    }
+
+    fun notificationManager(): NotificationManager {
+        return ContextCompat.getSystemService(appContext, NotificationManager::class.java)
+            as NotificationManager
+    }
 }

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

@@ -24,19 +24,19 @@ import android.util.Log
 import com.vitorpamplona.amethyst.AccountInfo
 
 object PushNotificationUtils {
-  var hasInit: Boolean = false
-  private val pushHandler = PushDistributorHandler
+    var hasInit: Boolean = false
+    private val pushHandler = PushDistributorHandler
 
-  suspend fun init(accounts: List<AccountInfo>) {
-    if (hasInit || pushHandler.savedDistributorExists()) {
-      return
+    suspend fun init(accounts: List<AccountInfo>) {
+        if (hasInit || pushHandler.savedDistributorExists()) {
+            return
+        }
+        try {
+            if (pushHandler.savedDistributorExists()) {
+                RegisterAccounts(accounts).go(pushHandler.getSavedEndpoint())
+            }
+        } catch (e: Exception) {
+            Log.d("Amethyst-OSSPushUtils", "Failed to get endpoint.")
+        }
     }
-    try {
-      if (pushHandler.savedDistributorExists()) {
-        RegisterAccounts(accounts).go(pushHandler.getSavedEndpoint())
-      }
-    } catch (e: Exception) {
-      Log.d("Amethyst-OSSPushUtils", "Failed to get endpoint.")
-    }
-  }
 }

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

@@ -64,143 +64,142 @@ import kotlinx.collections.immutable.toImmutableList
 @OptIn(ExperimentalPermissionsApi::class)
 @Composable
 fun SelectNotificationProvider(sharedPreferencesViewModel: SharedPreferencesViewModel) {
-  val notificationPermissionState =
-    CheckifItNeedsToRequestNotificationPermission(sharedPreferencesViewModel)
+    val notificationPermissionState =
+        CheckifItNeedsToRequestNotificationPermission(sharedPreferencesViewModel)
 
-  if (notificationPermissionState.status.isGranted) {
-    if (!sharedPreferencesViewModel.sharedPrefs.dontShowPushNotificationSelector) {
-      val context = LocalContext.current
-      var distributorPresent by remember {
-        mutableStateOf(PushDistributorHandler.savedDistributorExists())
-      }
-      if (!distributorPresent) {
-        LoadDistributors { currentDistributor, list, readableListWithExplainer ->
-          if (readableListWithExplainer.size > 1) {
-            SpinnerSelectionDialog(
-              title = stringResource(id = R.string.select_push_server),
-              options = readableListWithExplainer,
-              onSelect = { index ->
-                if (list[index] == "None") {
-                  PushDistributorHandler.forceRemoveDistributor(context)
-                  sharedPreferencesViewModel.dontAskForNotificationPermissions()
-                  sharedPreferencesViewModel.dontShowPushNotificationSelector()
-                } else {
-                  val fullDistributorName = list[index]
-                  PushDistributorHandler.saveDistributor(fullDistributorName)
-                }
-                distributorPresent = true
-                Log.d("Amethyst", "NotificationScreen: Distributor registered.")
-              },
-              onDismiss = {
-                distributorPresent = true
-                Log.d("Amethyst", "NotificationScreen: Distributor dialog dismissed.")
-              },
-            )
-          } else {
-            AlertDialog(
-              onDismissRequest = { distributorPresent = true },
-              title = { Text(stringResource(R.string.push_server_install_app)) },
-              text = {
-                Material3RichText(
-                  style = RichTextStyle().resolveDefaults(),
-                ) {
-                  Markdown(
-                    content = stringResource(R.string.push_server_install_app_description),
-                  )
-                }
-              },
-              confirmButton = {
-                Row(
-                  modifier = Modifier.padding(all = 8.dp).fillMaxWidth(),
-                  horizontalArrangement = Arrangement.SpaceBetween,
-                ) {
-                  TextButton(
-                    onClick = {
-                      distributorPresent = true
-                      sharedPreferencesViewModel.dontShowPushNotificationSelector()
-                    },
-                  ) {
-                    Text(stringResource(R.string.quick_action_dont_show_again_button))
-                  }
-                  Button(
-                    onClick = { distributorPresent = true },
-                    contentPadding = PaddingValues(horizontal = 16.dp),
-                  ) {
-                    Row(
-                      verticalAlignment = Alignment.CenterVertically,
-                    ) {
-                      Icon(
-                        imageVector = Icons.Default.Check,
-                        contentDescription = null,
-                      )
-                      Spacer(Modifier.width(8.dp))
-                      Text(stringResource(R.string.error_dialog_button_ok))
+    if (notificationPermissionState.status.isGranted) {
+        if (!sharedPreferencesViewModel.sharedPrefs.dontShowPushNotificationSelector) {
+            val context = LocalContext.current
+            var distributorPresent by remember {
+                mutableStateOf(PushDistributorHandler.savedDistributorExists())
+            }
+            if (!distributorPresent) {
+                LoadDistributors { currentDistributor, list, readableListWithExplainer ->
+                    if (readableListWithExplainer.size > 1) {
+                        SpinnerSelectionDialog(
+                            title = stringResource(id = R.string.select_push_server),
+                            options = readableListWithExplainer,
+                            onSelect = { index ->
+                                if (list[index] == "None") {
+                                    PushDistributorHandler.forceRemoveDistributor(context)
+                                    sharedPreferencesViewModel.dontAskForNotificationPermissions()
+                                    sharedPreferencesViewModel.dontShowPushNotificationSelector()
+                                } else {
+                                    val fullDistributorName = list[index]
+                                    PushDistributorHandler.saveDistributor(fullDistributorName)
+                                }
+                                distributorPresent = true
+                                Log.d("Amethyst", "NotificationScreen: Distributor registered.")
+                            },
+                            onDismiss = {
+                                distributorPresent = true
+                                Log.d("Amethyst", "NotificationScreen: Distributor dialog dismissed.")
+                            },
+                        )
+                    } else {
+                        AlertDialog(
+                            onDismissRequest = { distributorPresent = true },
+                            title = { Text(stringResource(R.string.push_server_install_app)) },
+                            text = {
+                                Material3RichText(
+                                    style = RichTextStyle().resolveDefaults(),
+                                ) {
+                                    Markdown(
+                                        content = stringResource(R.string.push_server_install_app_description),
+                                    )
+                                }
+                            },
+                            confirmButton = {
+                                Row(
+                                    modifier = Modifier.padding(all = 8.dp).fillMaxWidth(),
+                                    horizontalArrangement = Arrangement.SpaceBetween,
+                                ) {
+                                    TextButton(
+                                        onClick = {
+                                            distributorPresent = true
+                                            sharedPreferencesViewModel.dontShowPushNotificationSelector()
+                                        },
+                                    ) {
+                                        Text(stringResource(R.string.quick_action_dont_show_again_button))
+                                    }
+                                    Button(
+                                        onClick = { distributorPresent = true },
+                                        contentPadding = PaddingValues(horizontal = 16.dp),
+                                    ) {
+                                        Row(
+                                            verticalAlignment = Alignment.CenterVertically,
+                                        ) {
+                                            Icon(
+                                                imageVector = Icons.Default.Check,
+                                                contentDescription = null,
+                                            )
+                                            Spacer(Modifier.width(8.dp))
+                                            Text(stringResource(R.string.error_dialog_button_ok))
+                                        }
+                                    }
+                                }
+                            },
+                        )
                     }
-                  }
                 }
-              },
-            )
-          }
+            } else {
+                val currentDistributor = PushDistributorHandler.getSavedDistributor()
+                PushDistributorHandler.saveDistributor(currentDistributor)
+            }
         }
-      } else {
-        val currentDistributor = PushDistributorHandler.getSavedDistributor()
-        PushDistributorHandler.saveDistributor(currentDistributor)
-      }
     }
-  }
 }
 
 @Composable
-fun LoadDistributors(
-  onInner: @Composable (String, ImmutableList<String>, ImmutableList<TitleExplainer>) -> Unit
-) {
-  val currentDistributor = PushDistributorHandler.getSavedDistributor().ifBlank { null } ?: "None"
+fun LoadDistributors(onInner: @Composable (String, ImmutableList<String>, ImmutableList<TitleExplainer>) -> Unit) {
+    val currentDistributor = PushDistributorHandler.getSavedDistributor().ifBlank { null } ?: "None"
 
-  val list = remember {
-    PushDistributorHandler.getInstalledDistributors().plus("None").toImmutableList()
-  }
+    val list =
+        remember {
+            PushDistributorHandler.getInstalledDistributors().plus("None").toImmutableList()
+        }
 
-  val readableListWithExplainer =
-    PushDistributorHandler.formattedDistributorNames()
-      .mapIndexed { index, name ->
-        TitleExplainer(
-          name,
-          stringResource(id = R.string.push_server_uses_app_explainer, list[index]),
-        )
-      }
-      .plus(
-        TitleExplainer(
-          stringResource(id = R.string.push_server_none),
-          stringResource(id = R.string.push_server_none_explainer),
-        ),
-      )
-      .toImmutableList()
+    val readableListWithExplainer =
+        PushDistributorHandler.formattedDistributorNames()
+            .mapIndexed { index, name ->
+                TitleExplainer(
+                    name,
+                    stringResource(id = R.string.push_server_uses_app_explainer, list[index]),
+                )
+            }
+            .plus(
+                TitleExplainer(
+                    stringResource(id = R.string.push_server_none),
+                    stringResource(id = R.string.push_server_none_explainer),
+                ),
+            )
+            .toImmutableList()
 
-  onInner(
-    currentDistributor,
-    list,
-    readableListWithExplainer,
-  )
+    onInner(
+        currentDistributor,
+        list,
+        readableListWithExplainer,
+    )
 }
 
 @Composable
 fun PushNotificationSettingsRow(sharedPreferencesViewModel: SharedPreferencesViewModel) {
-  val context = LocalContext.current
+    val context = LocalContext.current
 
-  LoadDistributors { currentDistributor, list, readableListWithExplainer ->
-    SettingsRow(
-      R.string.push_server_title,
-      R.string.push_server_explainer,
-      selectedItens = readableListWithExplainer,
-      selectedIndex = list.indexOf(currentDistributor),
-    ) { index ->
-      if (list[index] == "None") {
-        sharedPreferencesViewModel.dontAskForNotificationPermissions()
-        sharedPreferencesViewModel.dontShowPushNotificationSelector()
-        PushDistributorHandler.forceRemoveDistributor(context)
-      } else {
-        PushDistributorHandler.saveDistributor(list[index])
-      }
+    LoadDistributors { currentDistributor, list, readableListWithExplainer ->
+        SettingsRow(
+            R.string.push_server_title,
+            R.string.push_server_explainer,
+            selectedItens = readableListWithExplainer,
+            selectedIndex = list.indexOf(currentDistributor),
+        ) { index ->
+            if (list[index] == "None") {
+                sharedPreferencesViewModel.dontAskForNotificationPermissions()
+                sharedPreferencesViewModel.dontShowPushNotificationSelector()
+                PushDistributorHandler.forceRemoveDistributor(context)
+            } else {
+                PushDistributorHandler.saveDistributor(list[index])
+            }
+        }
     }
-  }
 }

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

@@ -29,15 +29,14 @@ import com.vitorpamplona.quartz.events.ImmutableListOfLists
 
 @Composable
 fun TranslatableRichTextViewer(
-  content: String,
-  canPreview: Boolean,
-  modifier: Modifier = Modifier,
-  tags: ImmutableListOfLists<String>,
-  backgroundColor: MutableState<Color>,
-  accountViewModel: AccountViewModel,
-  nav: (String) -> Unit,
-) =
-  ExpandableRichTextViewer(
+    content: String,
+    canPreview: Boolean,
+    modifier: Modifier = Modifier,
+    tags: ImmutableListOfLists<String>,
+    backgroundColor: MutableState<Color>,
+    accountViewModel: AccountViewModel,
+    nav: (String) -> Unit,
+) = ExpandableRichTextViewer(
     content,
     canPreview,
     modifier,
@@ -45,4 +44,4 @@ fun TranslatableRichTextViewer(
     backgroundColor,
     accountViewModel,
     nav,
-  )
+)

app/src/main/java/androidx/compose/material3/pullrefresh/PullRefresh.kt

@@ -42,19 +42,18 @@ import androidx.compose.ui.unit.Velocity
  * @sample androidx.compose.material.samples.PullRefreshSample
  */
 fun Modifier.pullRefresh(
-  state: PullRefreshState,
-  enabled: Boolean = true,
-) =
-  inspectable(
+    state: PullRefreshState,
+    enabled: Boolean = true,
+) = inspectable(
     inspectorInfo =
-      debugInspectorInfo {
-        name = "pullRefresh"
-        properties["state"] = state
-        properties["enabled"] = enabled
-      },
-  ) {
+        debugInspectorInfo {
+            name = "pullRefresh"
+            properties["state"] = state
+            properties["enabled"] = enabled
+        },
+) {
     Modifier.pullRefresh(state::onPull, state::onRelease, enabled)
-  }
+}
 
 /**
  * A nested scroll modifier that provides [onPull] and [onRelease] callbacks to aid building custom
@@ -78,49 +77,48 @@ fun Modifier.pullRefresh(
  * @sample androidx.compose.material.samples.CustomPullRefreshSample
  */
 fun Modifier.pullRefresh(
-  onPull: (pullDelta: Float) -> Float,
-  onRelease: suspend (flingVelocity: Float) -> Float,
-  enabled: Boolean = true,
-) =
-  inspectable(
+    onPull: (pullDelta: Float) -> Float,
+    onRelease: suspend (flingVelocity: Float) -> Float,
+    enabled: Boolean = true,
+) = inspectable(
     inspectorInfo =
-      debugInspectorInfo {
-        name = "pullRefresh"
-        properties["onPull"] = onPull
-        properties["onRelease"] = onRelease
-        properties["enabled"] = enabled
-      },
-  ) {
+        debugInspectorInfo {
+            name = "pullRefresh"
+            properties["onPull"] = onPull
+            properties["onRelease"] = onRelease
+            properties["enabled"] = enabled
+        },
+) {
     Modifier.nestedScroll(PullRefreshNestedScrollConnection(onPull, onRelease, enabled))
-  }
+}
 
 private class PullRefreshNestedScrollConnection(
-  private val onPull: (pullDelta: Float) -> Float,
-  private val onRelease: suspend (flingVelocity: Float) -> Float,
-  private val enabled: Boolean,
+    private val onPull: (pullDelta: Float) -> Float,
+    private val onRelease: suspend (flingVelocity: Float) -> Float,
+    private val enabled: Boolean,
 ) : NestedScrollConnection {
-  override fun onPreScroll(
-    available: Offset,
-    source: NestedScrollSource,
-  ): Offset =
-    when {
-      !enabled -> Offset.Zero
-      source == Drag && available.y < 0 -> Offset(0f, onPull(available.y)) // Swiping up
-      else -> Offset.Zero
-    }
+    override fun onPreScroll(
+        available: Offset,
+        source: NestedScrollSource,
+    ): Offset =
+        when {
+            !enabled -> Offset.Zero
+            source == Drag && available.y < 0 -> Offset(0f, onPull(available.y)) // Swiping up
+            else -> Offset.Zero
+        }
 
-  override fun onPostScroll(
-    consumed: Offset,
-    available: Offset,
-    source: NestedScrollSource,
-  ): Offset =
-    when {
-      !enabled -> Offset.Zero
-      source == Drag && available.y > 0 -> Offset(0f, onPull(available.y)) // Pulling down
-      else -> Offset.Zero
-    }
+    override fun onPostScroll(
+        consumed: Offset,
+        available: Offset,
+        source: NestedScrollSource,
+    ): Offset =
+        when {
+            !enabled -> Offset.Zero
+            source == Drag && available.y > 0 -> Offset(0f, onPull(available.y)) // Pulling down
+            else -> Offset.Zero
+        }
 
-  override suspend fun onPreFling(available: Velocity): Velocity {
-    return Velocity(0f, onRelease(available.y))
-  }
+    override suspend fun onPreFling(available: Velocity): Velocity {
+        return Velocity(0f, onRelease(available.y))
+    }
 }

app/src/main/java/androidx/compose/material3/pullrefresh/PullRefreshIndicator.kt

@@ -70,148 +70,148 @@ import kotlin.math.pow
  */
 @Composable
 fun PullRefreshIndicator(
-  refreshing: Boolean,
-  state: PullRefreshState,
-  modifier: Modifier = Modifier,
-  backgroundColor: Color = MaterialTheme.colorScheme.surface,
-  contentColor: Color = contentColorFor(backgroundColor),
-  scale: Boolean = false,
+    refreshing: Boolean,
+    state: PullRefreshState,
+    modifier: Modifier = Modifier,
+    backgroundColor: Color = MaterialTheme.colorScheme.surface,
+    contentColor: Color = contentColorFor(backgroundColor),
+    scale: Boolean = false,
 ) {
-  val showElevation by
-    remember(refreshing, state) { derivedStateOf { refreshing || state.position > 0.5f } }
+    val showElevation by
+        remember(refreshing, state) { derivedStateOf { refreshing || state.position > 0.5f } }
 
-  Surface(
-    modifier = modifier.size(IndicatorSize).pullRefreshIndicatorTransform(state, scale),
-    shape = SpinnerShape,
-    color = backgroundColor,
-    shadowElevation = if (showElevation) Elevation else 0.dp,
-  ) {
-    Crossfade(
-      targetState = refreshing,
-      animationSpec = tween(durationMillis = CROSSFADE_DURATION_MS),
-    ) { refreshing ->
-      Box(
-        modifier = Modifier.fillMaxSize(),
-        contentAlignment = Alignment.Center,
-      ) {
-        val spinnerSize = (ArcRadius + StrokeWidth).times(2)
+    Surface(
+        modifier = modifier.size(IndicatorSize).pullRefreshIndicatorTransform(state, scale),
+        shape = SpinnerShape,
+        color = backgroundColor,
+        shadowElevation = if (showElevation) Elevation else 0.dp,
+    ) {
+        Crossfade(
+            targetState = refreshing,
+            animationSpec = tween(durationMillis = CROSSFADE_DURATION_MS),
+        ) { refreshing ->
+            Box(
+                modifier = Modifier.fillMaxSize(),
+                contentAlignment = Alignment.Center,
+            ) {
+                val spinnerSize = (ArcRadius + StrokeWidth).times(2)
 
-        if (refreshing) {
-          CircularProgressIndicator(
-            color = contentColor,
-            strokeWidth = StrokeWidth,
-            modifier = Modifier.size(spinnerSize),
-          )
-        } else {
-          CircularArrowIndicator(state, contentColor, Modifier.size(spinnerSize))
+                if (refreshing) {
+                    CircularProgressIndicator(
+                        color = contentColor,
+                        strokeWidth = StrokeWidth,
+                        modifier = Modifier.size(spinnerSize),
+                    )
+                } else {
+                    CircularArrowIndicator(state, contentColor, Modifier.size(spinnerSize))
+                }
+            }
         }
-      }
     }
-  }
 }
 
 /** Modifier.size MUST be specified. */
 @Composable
 private fun CircularArrowIndicator(
-  state: PullRefreshState,
-  color: Color,
-  modifier: Modifier,
+    state: PullRefreshState,
+    color: Color,
+    modifier: Modifier,
 ) {
-  val path = remember { Path().apply { fillType = PathFillType.EvenOdd } }
+    val path = remember { Path().apply { fillType = PathFillType.EvenOdd } }
 
-  val targetAlpha by
-    remember(state) { derivedStateOf { if (state.progress >= 1f) MAX_ALPHA else MIN_ALPHA } }
+    val targetAlpha by
+        remember(state) { derivedStateOf { if (state.progress >= 1f) MAX_ALPHA else MIN_ALPHA } }
 
-  val alphaState = animateFloatAsState(targetValue = targetAlpha, animationSpec = AlphaTween)
+    val alphaState = animateFloatAsState(targetValue = targetAlpha, animationSpec = AlphaTween)
 
-  // Empty semantics for tests
-  Canvas(modifier.semantics {}) {
-    val values = ArrowValues(state.progress)
-    val alpha = alphaState.value
+    // Empty semantics for tests
+    Canvas(modifier.semantics {}) {
+        val values = ArrowValues(state.progress)
+        val alpha = alphaState.value
 
-    rotate(degrees = values.rotation) {
-      val arcRadius = ArcRadius.toPx() + StrokeWidth.toPx() / 2f
-      val arcBounds =
-        Rect(
-          size.center.x - arcRadius,
-          size.center.y - arcRadius,
-          size.center.x + arcRadius,
-          size.center.y + arcRadius,
-        )
-      drawArc(
-        color = color,
-        alpha = alpha,
-        startAngle = values.startAngle,
-        sweepAngle = values.endAngle - values.startAngle,
-        useCenter = false,
-        topLeft = arcBounds.topLeft,
-        size = arcBounds.size,
-        style =
-          Stroke(
-            width = StrokeWidth.toPx(),
-            cap = StrokeCap.Square,
-          ),
-      )
-      drawArrow(path, arcBounds, color, alpha, values)
+        rotate(degrees = values.rotation) {
+            val arcRadius = ArcRadius.toPx() + StrokeWidth.toPx() / 2f
+            val arcBounds =
+                Rect(
+                    size.center.x - arcRadius,
+                    size.center.y - arcRadius,
+                    size.center.x + arcRadius,
+                    size.center.y + arcRadius,
+                )
+            drawArc(
+                color = color,
+                alpha = alpha,
+                startAngle = values.startAngle,
+                sweepAngle = values.endAngle - values.startAngle,
+                useCenter = false,
+                topLeft = arcBounds.topLeft,
+                size = arcBounds.size,
+                style =
+                    Stroke(
+                        width = StrokeWidth.toPx(),
+                        cap = StrokeCap.Square,
+                    ),
+            )
+            drawArrow(path, arcBounds, color, alpha, values)
+        }
     }
-  }
 }
 
 @Immutable
 private class ArrowValues(
-  val rotation: Float,
-  val startAngle: Float,
-  val endAngle: Float,
-  val scale: Float,
+    val rotation: Float,
+    val startAngle: Float,
+    val endAngle: Float,
+    val scale: Float,
 )
 
 private fun ArrowValues(progress: Float): ArrowValues {
-  // Discard first 40% of progress. Scale remaining progress to full range between 0 and 100%.
-  val adjustedPercent = max(min(1f, progress) - 0.4f, 0f) * 5 / 3
-  // How far beyond the threshold pull has gone, as a percentage of the threshold.
-  val overshootPercent = abs(progress) - 1.0f
-  // Limit the overshoot to 200%. Linear between 0 and 200.
-  val linearTension = overshootPercent.coerceIn(0f, 2f)
-  // Non-linear tension. Increases with linearTension, but at a decreasing rate.
-  val tensionPercent = linearTension - linearTension.pow(2) / 4
+    // Discard first 40% of progress. Scale remaining progress to full range between 0 and 100%.
+    val adjustedPercent = max(min(1f, progress) - 0.4f, 0f) * 5 / 3
+    // How far beyond the threshold pull has gone, as a percentage of the threshold.
+    val overshootPercent = abs(progress) - 1.0f
+    // Limit the overshoot to 200%. Linear between 0 and 200.
+    val linearTension = overshootPercent.coerceIn(0f, 2f)
+    // Non-linear tension. Increases with linearTension, but at a decreasing rate.
+    val tensionPercent = linearTension - linearTension.pow(2) / 4
 
-  // Calculations based on SwipeRefreshLayout specification.
-  val endTrim = adjustedPercent * MAX_PROGRESS_ARC
-  val rotation = (-0.25f + 0.4f * adjustedPercent + tensionPercent) * 0.5f
-  val startAngle = rotation * 360
-  val endAngle = (rotation + endTrim) * 360
-  val scale = min(1f, adjustedPercent)
+    // Calculations based on SwipeRefreshLayout specification.
+    val endTrim = adjustedPercent * MAX_PROGRESS_ARC
+    val rotation = (-0.25f + 0.4f * adjustedPercent + tensionPercent) * 0.5f
+    val startAngle = rotation * 360
+    val endAngle = (rotation + endTrim) * 360
+    val scale = min(1f, adjustedPercent)
 
-  return ArrowValues(rotation, startAngle, endAngle, scale)
+    return ArrowValues(rotation, startAngle, endAngle, scale)
 }
 
 private fun DrawScope.drawArrow(
-  arrow: Path,
-  bounds: Rect,
-  color: Color,
-  alpha: Float,
-  values: ArrowValues,
+    arrow: Path,
+    bounds: Rect,
+    color: Color,
+    alpha: Float,
+    values: ArrowValues,
 ) {
-  arrow.reset()
-  arrow.moveTo(0f, 0f) // Move to left corner
-  arrow.lineTo(x = ArrowWidth.toPx() * values.scale, y = 0f) // Line to right corner
+    arrow.reset()
+    arrow.moveTo(0f, 0f) // Move to left corner
+    arrow.lineTo(x = ArrowWidth.toPx() * values.scale, y = 0f) // Line to right corner
 
-  // Line to tip of arrow
-  arrow.lineTo(
-    x = ArrowWidth.toPx() * values.scale / 2,
-    y = ArrowHeight.toPx() * values.scale,
-  )
+    // Line to tip of arrow
+    arrow.lineTo(
+        x = ArrowWidth.toPx() * values.scale / 2,
+        y = ArrowHeight.toPx() * values.scale,
+    )
 
-  val radius = min(bounds.width, bounds.height) / 2f
-  val inset = ArrowWidth.toPx() * values.scale / 2f
-  arrow.translate(
-    Offset(
-      x = radius + bounds.center.x - inset,
-      y = bounds.center.y + StrokeWidth.toPx() / 2f,
-    ),
-  )
-  arrow.close()
-  rotate(degrees = values.endAngle) { drawPath(path = arrow, color = color, alpha = alpha) }
+    val radius = min(bounds.width, bounds.height) / 2f
+    val inset = ArrowWidth.toPx() * values.scale / 2f
+    arrow.translate(
+        Offset(
+            x = radius + bounds.center.x - inset,
+            y = bounds.center.y + StrokeWidth.toPx() / 2f,
+        ),
+    )
+    arrow.close()
+    rotate(degrees = values.endAngle) { drawPath(path = arrow, color = color, alpha = alpha) }
 }
 
 private const val CROSSFADE_DURATION_MS = 100

app/src/main/java/androidx/compose/material3/pullrefresh/PullRefreshIndicatorTransform.kt

@@ -37,42 +37,41 @@ import androidx.compose.ui.platform.inspectable
  * @sample androidx.compose.material.samples.PullRefreshIndicatorTransformSample
  */
 fun Modifier.pullRefreshIndicatorTransform(
-  state: PullRefreshState,
-  scale: Boolean = false,
-) =
-  inspectable(
+    state: PullRefreshState,
+    scale: Boolean = false,
+) = inspectable(
     inspectorInfo =
-      debugInspectorInfo {
-        name = "pullRefreshIndicatorTransform"
-        properties["state"] = state
-        properties["scale"] = scale
-      },
-  ) {
+        debugInspectorInfo {
+            name = "pullRefreshIndicatorTransform"
+            properties["state"] = state
+            properties["scale"] = scale
+        },
+) {
     Modifier
-      // Essentially we only want to clip the at the top, so the indicator will not appear when
-      // the position is 0. It is preferable to clip the indicator as opposed to the layout that
-      // contains the indicator, as this would also end up clipping shadows drawn by items in a
-      // list for example - so we leave the clipping to the scrolling container. We use MAX_VALUE
-      // for the other dimensions to allow for more room for elevation / arbitrary indicators - we
-      // only ever really want to clip at the top edge.
-      .drawWithContent {
-        clipRect(
-          top = 0f,
-          left = -Float.MAX_VALUE,
-          right = Float.MAX_VALUE,
-          bottom = Float.MAX_VALUE,
-        ) {
-          this@drawWithContent.drawContent()
+        // Essentially we only want to clip the at the top, so the indicator will not appear when
+        // the position is 0. It is preferable to clip the indicator as opposed to the layout that
+        // contains the indicator, as this would also end up clipping shadows drawn by items in a
+        // list for example - so we leave the clipping to the scrolling container. We use MAX_VALUE
+        // for the other dimensions to allow for more room for elevation / arbitrary indicators - we
+        // only ever really want to clip at the top edge.
+        .drawWithContent {
+            clipRect(
+                top = 0f,
+                left = -Float.MAX_VALUE,
+                right = Float.MAX_VALUE,
+                bottom = Float.MAX_VALUE,
+            ) {
+                this@drawWithContent.drawContent()
+            }
         }
-      }
-      .graphicsLayer {
-        translationY = state.position - size.height
+        .graphicsLayer {
+            translationY = state.position - size.height
 
-        if (scale && !state.refreshing) {
-          val scaleFraction =
-            LinearOutSlowInEasing.transform(state.position / state.threshold).coerceIn(0f, 1f)
-          scaleX = scaleFraction
-          scaleY = scaleFraction
+            if (scale && !state.refreshing) {
+                val scaleFraction =
+                    LinearOutSlowInEasing.transform(state.position / state.threshold).coerceIn(0f, 1f)
+                scaleX = scaleFraction
+                scaleY = scaleFraction
+            }
         }
-      }
-  }
+}

app/src/main/java/androidx/compose/material3/pullrefresh/PullRefreshState.kt

@@ -35,10 +35,10 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
-import kotlin.math.abs
-import kotlin.math.pow
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
+import kotlin.math.abs
+import kotlin.math.pow
 
 /**
  * Creates a [PullRefreshState] that is remembered across compositions.
@@ -55,33 +55,33 @@ import kotlinx.coroutines.launch
  */
 @Composable
 fun rememberPullRefreshState(
-  refreshing: Boolean,
-  onRefresh: () -> Unit,
-  refreshThreshold: Dp = PullRefreshDefaults.RefreshThreshold,
-  refreshingOffset: Dp = PullRefreshDefaults.RefreshingOffset,
+    refreshing: Boolean,
+    onRefresh: () -> Unit,
+    refreshThreshold: Dp = PullRefreshDefaults.RefreshThreshold,
+    refreshingOffset: Dp = PullRefreshDefaults.RefreshingOffset,
 ): PullRefreshState {
-  require(refreshThreshold > 0.dp) { "The refresh trigger must be greater than zero!" }
+    require(refreshThreshold > 0.dp) { "The refresh trigger must be greater than zero!" }
 
-  val scope = rememberCoroutineScope()
-  val onRefreshState = rememberUpdatedState(onRefresh)
-  val thresholdPx: Float
-  val refreshingOffsetPx: Float
+    val scope = rememberCoroutineScope()
+    val onRefreshState = rememberUpdatedState(onRefresh)
+    val thresholdPx: Float
+    val refreshingOffsetPx: Float
 
-  with(LocalDensity.current) {
-    thresholdPx = refreshThreshold.toPx()
-    refreshingOffsetPx = refreshingOffset.toPx()
-  }
+    with(LocalDensity.current) {
+        thresholdPx = refreshThreshold.toPx()
+        refreshingOffsetPx = refreshingOffset.toPx()
+    }
 
-  val state =
-    remember(scope) { PullRefreshState(scope, onRefreshState, refreshingOffsetPx, thresholdPx) }
+    val state =
+        remember(scope) { PullRefreshState(scope, onRefreshState, refreshingOffsetPx, thresholdPx) }
 
-  SideEffect {
-    state.setRefreshing(refreshing)
-    state.setThreshold(thresholdPx)
-    state.setRefreshingOffset(refreshingOffsetPx)
-  }
+    SideEffect {
+        state.setRefreshing(refreshing)
+        state.setThreshold(thresholdPx)
+        state.setRefreshingOffset(refreshingOffsetPx)
+    }
 
-  return state
+    return state
 }
 
 /**
@@ -98,131 +98,131 @@ fun rememberPullRefreshState(
  * Should be created using [rememberPullRefreshState].
  */
 class PullRefreshState
-internal constructor(
-  private val animationScope: CoroutineScope,
-  private val onRefreshState: State<() -> Unit>,
-  refreshingOffset: Float,
-  threshold: Float,
-) {
-  /**
-   * A float representing how far the user has pulled as a percentage of the refreshThreshold.
-   *
-   * If the component has not been pulled at all, progress is zero. If the pull has reached halfway
-   * to the threshold, progress is 0.5f. A value greater than 1 indicates that pull has gone beyond
-   * the refreshThreshold - e.g. a value of 2f indicates that the user has pulled to two times the
-   * refreshThreshold.
-   */
-  val progress
-    get() = adjustedDistancePulled / threshold
+    internal constructor(
+        private val animationScope: CoroutineScope,
+        private val onRefreshState: State<() -> Unit>,
+        refreshingOffset: Float,
+        threshold: Float,
+    ) {
+        /**
+         * A float representing how far the user has pulled as a percentage of the refreshThreshold.
+         *
+         * If the component has not been pulled at all, progress is zero. If the pull has reached halfway
+         * to the threshold, progress is 0.5f. A value greater than 1 indicates that pull has gone beyond
+         * the refreshThreshold - e.g. a value of 2f indicates that the user has pulled to two times the
+         * refreshThreshold.
+         */
+        val progress
+            get() = adjustedDistancePulled / threshold
 
-  val refreshing
-    get() = _refreshing
+        val refreshing
+            get() = _refreshing
 
-  val position
-    get() = _position
+        val position
+            get() = _position
 
-  val threshold
-    get() = _threshold
+        val threshold
+            get() = _threshold
 
-  private val adjustedDistancePulled by derivedStateOf { distancePulled * DRAG_MULTIPLIER }
+        private val adjustedDistancePulled by derivedStateOf { distancePulled * DRAG_MULTIPLIER }
 
-  private var _refreshing by mutableStateOf(false)
-  private var _position by mutableStateOf(0f)
-  private var distancePulled by mutableStateOf(0f)
-  private var _threshold by mutableStateOf(threshold)
-  private var refreshingOffsetState by mutableStateOf(refreshingOffset)
+        private var _refreshing by mutableStateOf(false)
+        private var _position by mutableStateOf(0f)
+        private var distancePulled by mutableStateOf(0f)
+        private var _threshold by mutableStateOf(threshold)
+        private var refreshingOffsetState by mutableStateOf(refreshingOffset)
 
-  internal fun onPull(pullDelta: Float): Float {
-    if (_refreshing) return 0f // Already refreshing, do nothing.
+        internal fun onPull(pullDelta: Float): Float {
+            if (_refreshing) return 0f // Already refreshing, do nothing.
 
-    val newOffset = (distancePulled + pullDelta).coerceAtLeast(0f)
-    val dragConsumed = newOffset - distancePulled
-    distancePulled = newOffset
-    _position = calculateIndicatorPosition()
-    return dragConsumed
-  }
+            val newOffset = (distancePulled + pullDelta).coerceAtLeast(0f)
+            val dragConsumed = newOffset - distancePulled
+            distancePulled = newOffset
+            _position = calculateIndicatorPosition()
+            return dragConsumed
+        }
 
-  internal fun onRelease(velocity: Float): Float {
-    if (refreshing) return 0f // Already refreshing, do nothing
+        internal fun onRelease(velocity: Float): Float {
+            if (refreshing) return 0f // Already refreshing, do nothing
 
-    if (adjustedDistancePulled > threshold) {
-      onRefreshState.value()
+            if (adjustedDistancePulled > threshold) {
+                onRefreshState.value()
+            }
+            animateIndicatorTo(0f)
+            val consumed =
+                when {
+                    // We are flinging without having dragged the pull refresh (for example a fling inside
+                    // a list) - don't consume
+                    distancePulled == 0f -> 0f
+                    // If the velocity is negative, the fling is upwards, and we don't want to prevent the
+                    // the list from scrolling
+                    velocity < 0f -> 0f
+                    // We are showing the indicator, and the fling is downwards - consume everything
+                    else -> velocity
+                }
+            distancePulled = 0f
+            return consumed
+        }
+
+        internal fun setRefreshing(refreshing: Boolean) {
+            if (_refreshing != refreshing) {
+                _refreshing = refreshing
+                distancePulled = 0f
+                animateIndicatorTo(if (refreshing) refreshingOffsetState else 0f)
+            }
+        }
+
+        internal fun setThreshold(threshold: Float) {
+            _threshold = threshold
+        }
+
+        internal fun setRefreshingOffset(refreshingOffset: Float) {
+            if (refreshingOffsetState != refreshingOffset) {
+                refreshingOffsetState = refreshingOffset
+                if (refreshing) animateIndicatorTo(refreshingOffset)
+            }
+        }
+
+        // Make sure to cancel any existing animations when we launch a new one. We use this instead of
+        // Animatable as calling snapTo() on every drag delta has a one frame delay, and some extra
+        // overhead of running through the animation pipeline instead of directly mutating the state.
+        private val mutatorMutex = MutatorMutex()
+
+        private fun animateIndicatorTo(offset: Float) =
+            animationScope.launch {
+                mutatorMutex.mutate {
+                    animate(initialValue = _position, targetValue = offset) { value, _ -> _position = value }
+                }
+            }
+
+        private fun calculateIndicatorPosition(): Float =
+            when {
+                // If drag hasn't gone past the threshold, the position is the adjustedDistancePulled.
+                adjustedDistancePulled <= threshold -> adjustedDistancePulled
+                else -> {
+                    // How far beyond the threshold pull has gone, as a percentage of the threshold.
+                    val overshootPercent = abs(progress) - 1.0f
+                    // Limit the overshoot to 200%. Linear between 0 and 200.
+                    val linearTension = overshootPercent.coerceIn(0f, 2f)
+                    // Non-linear tension. Increases with linearTension, but at a decreasing rate.
+                    val tensionPercent = linearTension - linearTension.pow(2) / 4
+                    // The additional offset beyond the threshold.
+                    val extraOffset = threshold * tensionPercent
+                    threshold + extraOffset
+                }
+            }
     }
-    animateIndicatorTo(0f)
-    val consumed =
-      when {
-        // We are flinging without having dragged the pull refresh (for example a fling inside
-        // a list) - don't consume
-        distancePulled == 0f -> 0f
-        // If the velocity is negative, the fling is upwards, and we don't want to prevent the
-        // the list from scrolling
-        velocity < 0f -> 0f
-        // We are showing the indicator, and the fling is downwards - consume everything
-        else -> velocity
-      }
-    distancePulled = 0f
-    return consumed
-  }
-
-  internal fun setRefreshing(refreshing: Boolean) {
-    if (_refreshing != refreshing) {
-      _refreshing = refreshing
-      distancePulled = 0f
-      animateIndicatorTo(if (refreshing) refreshingOffsetState else 0f)
-    }
-  }
-
-  internal fun setThreshold(threshold: Float) {
-    _threshold = threshold
-  }
-
-  internal fun setRefreshingOffset(refreshingOffset: Float) {
-    if (refreshingOffsetState != refreshingOffset) {
-      refreshingOffsetState = refreshingOffset
-      if (refreshing) animateIndicatorTo(refreshingOffset)
-    }
-  }
-
-  // Make sure to cancel any existing animations when we launch a new one. We use this instead of
-  // Animatable as calling snapTo() on every drag delta has a one frame delay, and some extra
-  // overhead of running through the animation pipeline instead of directly mutating the state.
-  private val mutatorMutex = MutatorMutex()
-
-  private fun animateIndicatorTo(offset: Float) =
-    animationScope.launch {
-      mutatorMutex.mutate {
-        animate(initialValue = _position, targetValue = offset) { value, _ -> _position = value }
-      }
-    }
-
-  private fun calculateIndicatorPosition(): Float =
-    when {
-      // If drag hasn't gone past the threshold, the position is the adjustedDistancePulled.
-      adjustedDistancePulled <= threshold -> adjustedDistancePulled
-      else -> {
-        // How far beyond the threshold pull has gone, as a percentage of the threshold.
-        val overshootPercent = abs(progress) - 1.0f
-        // Limit the overshoot to 200%. Linear between 0 and 200.
-        val linearTension = overshootPercent.coerceIn(0f, 2f)
-        // Non-linear tension. Increases with linearTension, but at a decreasing rate.
-        val tensionPercent = linearTension - linearTension.pow(2) / 4
-        // The additional offset beyond the threshold.
-        val extraOffset = threshold * tensionPercent
-        threshold + extraOffset
-      }
-    }
-}
 
 /** Default parameter values for [rememberPullRefreshState]. */
 object PullRefreshDefaults {
-  /**
-   * If the indicator is below this threshold offset when it is released, a refresh will be
-   * triggered.
-   */
-  val RefreshThreshold = 80.dp
+    /**
+     * If the indicator is below this threshold offset when it is released, a refresh will be
+     * triggered.
+     */
+    val RefreshThreshold = 80.dp
 
-  /** The offset at which the indicator should be rendered whilst a refresh is occurring. */
-  val RefreshingOffset = 56.dp
+    /** The offset at which the indicator should be rendered whilst a refresh is occurring. */
+    val RefreshingOffset = 56.dp
 }
 
 /**

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

@@ -29,72 +29,72 @@ import android.util.Log
 import coil.ImageLoader
 import coil.disk.DiskCache
 import com.vitorpamplona.amethyst.service.playback.VideoCache
-import java.io.File
-import kotlin.time.measureTimedValue
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.launch
+import java.io.File
+import kotlin.time.measureTimedValue
 
 class Amethyst : Application() {
-  val applicationIOScope = CoroutineScope(Dispatchers.IO + SupervisorJob())
+    val applicationIOScope = CoroutineScope(Dispatchers.IO + SupervisorJob())
 
-  override fun onTerminate() {
-    super.onTerminate()
-    applicationIOScope.cancel()
-  }
-
-  val videoCache: VideoCache by lazy {
-    val newCache = VideoCache()
-    newCache.initFileCache(this)
-    newCache
-  }
-
-  private val imageCache: DiskCache by lazy {
-    DiskCache.Builder()
-      .directory(applicationContext.safeCacheDir.resolve("image_cache"))
-      .maxSizePercent(0.2)
-      .maximumMaxSizeBytes(500L * 1024 * 1024) // 250MB
-      .build()
-  }
-
-  override fun onCreate() {
-    super.onCreate()
-    instance = this
-
-    if (BuildConfig.DEBUG) {
-      StrictMode.setThreadPolicy(
-        ThreadPolicy.Builder().detectAll().penaltyLog().build(),
-      )
-      StrictMode.setVmPolicy(
-        VmPolicy.Builder().detectAll().penaltyLog().build(),
-      )
+    override fun onTerminate() {
+        super.onTerminate()
+        applicationIOScope.cancel()
     }
 
-    GlobalScope.launch(Dispatchers.IO) {
-      val (value, elapsed) =
-        measureTimedValue {
-          // initializes the video cache in a thread
-          videoCache
+    val videoCache: VideoCache by lazy {
+        val newCache = VideoCache()
+        newCache.initFileCache(this)
+        newCache
+    }
+
+    private val imageCache: DiskCache by lazy {
+        DiskCache.Builder()
+            .directory(applicationContext.safeCacheDir.resolve("image_cache"))
+            .maxSizePercent(0.2)
+            .maximumMaxSizeBytes(500L * 1024 * 1024) // 250MB
+            .build()
+    }
+
+    override fun onCreate() {
+        super.onCreate()
+        instance = this
+
+        if (BuildConfig.DEBUG) {
+            StrictMode.setThreadPolicy(
+                ThreadPolicy.Builder().detectAll().penaltyLog().build(),
+            )
+            StrictMode.setVmPolicy(
+                VmPolicy.Builder().detectAll().penaltyLog().build(),
+            )
+        }
+
+        GlobalScope.launch(Dispatchers.IO) {
+            val (value, elapsed) =
+                measureTimedValue {
+                    // initializes the video cache in a thread
+                    videoCache
+                }
+            Log.d("Rendering Metrics", "VideoCache initialized in $elapsed")
         }
-      Log.d("Rendering Metrics", "VideoCache initialized in $elapsed")
     }
-  }
 
-  fun imageLoaderBuilder(): ImageLoader.Builder {
-    return ImageLoader.Builder(applicationContext).diskCache { imageCache }
-  }
+    fun imageLoaderBuilder(): ImageLoader.Builder {
+        return ImageLoader.Builder(applicationContext).diskCache { imageCache }
+    }
 
-  companion object {
-    lateinit var instance: Amethyst
-      private set
-  }
+    companion object {
+        lateinit var instance: Amethyst
+            private set
+    }
 }
 
 internal val Context.safeCacheDir: File
-  get() {
-    val cacheDir = checkNotNull(cacheDir) { "cacheDir == null" }
-    return cacheDir.apply { mkdirs() }
-  }
+    get() {
+        val cacheDir = checkNotNull(cacheDir) { "cacheDir == null" }
+        return cacheDir.apply { mkdirs() }
+    }

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

@@ -24,28 +24,28 @@ import androidx.security.crypto.EncryptedSharedPreferences
 import androidx.security.crypto.MasterKey
 
 object EncryptedStorage {
-  private const val PREFERENCES_NAME = "secret_keeper"
+    private const val PREFERENCES_NAME = "secret_keeper"
 
-  // returns the preferences for each account or a global file if null.
-  fun prefsFileName(npub: String? = null): String {
-    return if (npub == null) PREFERENCES_NAME else "${PREFERENCES_NAME}_$npub"
-  }
+    // returns the preferences for each account or a global file if null.
+    fun prefsFileName(npub: String? = null): String {
+        return if (npub == null) PREFERENCES_NAME else "${PREFERENCES_NAME}_$npub"
+    }
 
-  fun preferences(npub: String? = null): EncryptedSharedPreferences {
-    val context = Amethyst.instance
-    val masterKey: MasterKey =
-      MasterKey.Builder(context, MasterKey.DEFAULT_MASTER_KEY_ALIAS)
-        .setKeyScheme(MasterKey.KeyScheme.AES256_GCM)
-        .build()
+    fun preferences(npub: String? = null): EncryptedSharedPreferences {
+        val context = Amethyst.instance
+        val masterKey: MasterKey =
+            MasterKey.Builder(context, MasterKey.DEFAULT_MASTER_KEY_ALIAS)
+                .setKeyScheme(MasterKey.KeyScheme.AES256_GCM)
+                .build()
 
-    val preferencesName = prefsFileName(npub)
+        val preferencesName = prefsFileName(npub)
 
-    return EncryptedSharedPreferences.create(
-      context,
-      preferencesName,
-      masterKey,
-      EncryptedSharedPreferences.PrefKeyEncryptionScheme.AES256_SIV,
-      EncryptedSharedPreferences.PrefValueEncryptionScheme.AES256_GCM,
-    ) as EncryptedSharedPreferences
-  }
+        return EncryptedSharedPreferences.create(
+            context,
+            preferencesName,
+            masterKey,
+            EncryptedSharedPreferences.PrefKeyEncryptionScheme.AES256_SIV,
+            EncryptedSharedPreferences.PrefValueEncryptionScheme.AES256_GCM,
+        ) as EncryptedSharedPreferences
+    }
 }

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

@@ -62,188 +62,188 @@ import kotlinx.coroutines.launch
 
 @Stable
 class ServiceManager {
-  private var isStarted: Boolean =
-    false // to not open amber in a loop trying to use auth relays and registering for notifications
-  private var account: Account? = null
+    private var isStarted: Boolean =
+        false // to not open amber in a loop trying to use auth relays and registering for notifications
+    private var account: Account? = null
 
-  private val scope = CoroutineScope(Dispatchers.IO + SupervisorJob())
-  private var collectorJob: Job? = null
+    private val scope = CoroutineScope(Dispatchers.IO + SupervisorJob())
+    private var collectorJob: Job? = null
 
-  private fun start(account: Account) {
-    this.account = account
-    start()
-  }
-
-  private fun start() {
-    Log.d("ServiceManager", "Pre Starting Relay Services $isStarted $account")
-    if (isStarted && account != null) {
-      return
-    }
-    Log.d("ServiceManager", "Starting Relay Services")
-
-    val myAccount = account
-
-    // Resets Proxy Use
-    HttpClient.start(account?.proxy)
-    LocalCache.antiSpam.active = account?.filterSpamFromStrangers ?: true
-    Coil.setImageLoader {
-      Amethyst.instance
-        .imageLoaderBuilder()
-        .components {
-          if (Build.VERSION.SDK_INT >= 28) {
-            add(ImageDecoderDecoder.Factory())
-          } else {
-            add(GifDecoder.Factory())
-          }
-          add(SvgDecoder.Factory())
-        } // .logger(DebugLogger())
-        .okHttpClient { HttpClient.getHttpClient() }
-        .precision(Precision.INEXACT)
-        .respectCacheHeaders(false)
-        .build()
-    }
-
-    if (myAccount != null) {
-      val relaySet = myAccount.activeRelays() ?: myAccount.convertLocalRelays()
-      Log.d("Relay", "Service Manager Connect Connecting ${relaySet.size}")
-      Client.reconnect(relaySet)
-
-      collectorJob?.cancel()
-      collectorJob = null
-      collectorJob =
-        scope.launch {
-          myAccount.userProfile().flow().relays.stateFlow.collect {
-            if (isStarted) {
-              val newRelaySet = myAccount.activeRelays() ?: myAccount.convertLocalRelays()
-              Client.reconnect(newRelaySet, onlyIfChanged = true)
-            }
-          }
-        }
-
-      // start services
-      NostrAccountDataSource.account = myAccount
-      NostrAccountDataSource.otherAccounts =
-        LocalPreferences.allSavedAccounts().mapNotNull {
-          try {
-            it.npub.bechToBytes().toHexKey()
-          } catch (e: Exception) {
-            null
-          }
-        }
-      NostrHomeDataSource.account = myAccount
-      NostrChatroomListDataSource.account = myAccount
-      NostrVideoDataSource.account = myAccount
-      NostrDiscoveryDataSource.account = myAccount
-
-      // Notification Elements
-      NostrHomeDataSource.start()
-      NostrAccountDataSource.start()
-      GlobalScope.launch(Dispatchers.IO) {
-        delay(3000)
-        NostrChatroomListDataSource.start()
-        NostrDiscoveryDataSource.start()
-        NostrVideoDataSource.start()
-      }
-
-      // More Info Data Sources
-      NostrSingleEventDataSource.start()
-      NostrSingleChannelDataSource.start()
-      NostrSingleUserDataSource.start()
-      isStarted = true
-    }
-  }
-
-  private fun pause() {
-    Log.d("ServiceManager", "Pausing Relay Services")
-
-    collectorJob?.cancel()
-    collectorJob = null
-
-    NostrAccountDataSource.stopSync()
-    NostrHomeDataSource.stopSync()
-    NostrChannelDataSource.stopSync()
-    NostrChatroomDataSource.stopSync()
-    NostrChatroomListDataSource.stopSync()
-    NostrDiscoveryDataSource.stopSync()
-
-    NostrCommunityDataSource.stopSync()
-    NostrHashtagDataSource.stopSync()
-    NostrGeohashDataSource.stopSync()
-    NostrSearchEventOrUserDataSource.stopSync()
-    NostrSingleChannelDataSource.stopSync()
-    NostrSingleEventDataSource.stopSync()
-    NostrSingleUserDataSource.stopSync()
-    NostrThreadDataSource.stopSync()
-    NostrUserProfileDataSource.stopSync()
-    NostrVideoDataSource.stopSync()
-
-    Client.reconnect(null)
-    isStarted = false
-  }
-
-  fun cleanObservers() {
-    LocalCache.cleanObservers()
-  }
-
-  fun trimMemory() {
-    LocalCache.cleanObservers()
-
-    val accounts =
-      LocalPreferences.allSavedAccounts().mapNotNull { decodePublicKeyAsHexOrNull(it.npub) }.toSet()
-
-    account?.let {
-      LocalCache.pruneOldAndHiddenMessages(it)
-      NostrChatroomDataSource.clearEOSEs(it)
-
-      LocalCache.pruneHiddenMessages(it)
-      LocalCache.pruneContactLists(accounts)
-      LocalCache.pruneRepliesAndReactions(accounts)
-      LocalCache.prunePastVersionsOfReplaceables()
-      LocalCache.pruneExpiredEvents()
-    }
-  }
-
-  // This method keeps the pause/start in a Syncronized block to
-  // avoid concurrent pauses and starts.
-  @Synchronized
-  fun forceRestart(
-    account: Account? = null,
-    start: Boolean = true,
-    pause: Boolean = true,
-  ) {
-    if (pause) {
-      pause()
-    }
-
-    if (start) {
-      if (account != null) {
-        start(account)
-      } else {
+    private fun start(account: Account) {
+        this.account = account
         start()
-      }
     }
-  }
 
-  fun restartIfDifferentAccount(account: Account) {
-    if (this.account != account) {
-      forceRestart(account, true, true)
+    private fun start() {
+        Log.d("ServiceManager", "Pre Starting Relay Services $isStarted $account")
+        if (isStarted && account != null) {
+            return
+        }
+        Log.d("ServiceManager", "Starting Relay Services")
+
+        val myAccount = account
+
+        // Resets Proxy Use
+        HttpClient.start(account?.proxy)
+        LocalCache.antiSpam.active = account?.filterSpamFromStrangers ?: true
+        Coil.setImageLoader {
+            Amethyst.instance
+                .imageLoaderBuilder()
+                .components {
+                    if (Build.VERSION.SDK_INT >= 28) {
+                        add(ImageDecoderDecoder.Factory())
+                    } else {
+                        add(GifDecoder.Factory())
+                    }
+                    add(SvgDecoder.Factory())
+                } // .logger(DebugLogger())
+                .okHttpClient { HttpClient.getHttpClient() }
+                .precision(Precision.INEXACT)
+                .respectCacheHeaders(false)
+                .build()
+        }
+
+        if (myAccount != null) {
+            val relaySet = myAccount.activeRelays() ?: myAccount.convertLocalRelays()
+            Log.d("Relay", "Service Manager Connect Connecting ${relaySet.size}")
+            Client.reconnect(relaySet)
+
+            collectorJob?.cancel()
+            collectorJob = null
+            collectorJob =
+                scope.launch {
+                    myAccount.userProfile().flow().relays.stateFlow.collect {
+                        if (isStarted) {
+                            val newRelaySet = myAccount.activeRelays() ?: myAccount.convertLocalRelays()
+                            Client.reconnect(newRelaySet, onlyIfChanged = true)
+                        }
+                    }
+                }
+
+            // start services
+            NostrAccountDataSource.account = myAccount
+            NostrAccountDataSource.otherAccounts =
+                LocalPreferences.allSavedAccounts().mapNotNull {
+                    try {
+                        it.npub.bechToBytes().toHexKey()
+                    } catch (e: Exception) {
+                        null
+                    }
+                }
+            NostrHomeDataSource.account = myAccount
+            NostrChatroomListDataSource.account = myAccount
+            NostrVideoDataSource.account = myAccount
+            NostrDiscoveryDataSource.account = myAccount
+
+            // Notification Elements
+            NostrHomeDataSource.start()
+            NostrAccountDataSource.start()
+            GlobalScope.launch(Dispatchers.IO) {
+                delay(3000)
+                NostrChatroomListDataSource.start()
+                NostrDiscoveryDataSource.start()
+                NostrVideoDataSource.start()
+            }
+
+            // More Info Data Sources
+            NostrSingleEventDataSource.start()
+            NostrSingleChannelDataSource.start()
+            NostrSingleUserDataSource.start()
+            isStarted = true
+        }
     }
-  }
 
-  fun forceRestart() {
-    forceRestart(null, true, true)
-  }
+    private fun pause() {
+        Log.d("ServiceManager", "Pausing Relay Services")
 
-  fun justStart() {
-    forceRestart(null, true, false)
-  }
+        collectorJob?.cancel()
+        collectorJob = null
 
-  fun pauseForGood() {
-    forceRestart(null, false, true)
-  }
+        NostrAccountDataSource.stopSync()
+        NostrHomeDataSource.stopSync()
+        NostrChannelDataSource.stopSync()
+        NostrChatroomDataSource.stopSync()
+        NostrChatroomListDataSource.stopSync()
+        NostrDiscoveryDataSource.stopSync()
 
-  fun pauseForGoodAndClearAccount() {
-    account = null
-    forceRestart(null, false, true)
-  }
+        NostrCommunityDataSource.stopSync()
+        NostrHashtagDataSource.stopSync()
+        NostrGeohashDataSource.stopSync()
+        NostrSearchEventOrUserDataSource.stopSync()
+        NostrSingleChannelDataSource.stopSync()
+        NostrSingleEventDataSource.stopSync()
+        NostrSingleUserDataSource.stopSync()
+        NostrThreadDataSource.stopSync()
+        NostrUserProfileDataSource.stopSync()
+        NostrVideoDataSource.stopSync()
+
+        Client.reconnect(null)
+        isStarted = false
+    }
+
+    fun cleanObservers() {
+        LocalCache.cleanObservers()
+    }
+
+    fun trimMemory() {
+        LocalCache.cleanObservers()
+
+        val accounts =
+            LocalPreferences.allSavedAccounts().mapNotNull { decodePublicKeyAsHexOrNull(it.npub) }.toSet()
+
+        account?.let {
+            LocalCache.pruneOldAndHiddenMessages(it)
+            NostrChatroomDataSource.clearEOSEs(it)
+
+            LocalCache.pruneHiddenMessages(it)
+            LocalCache.pruneContactLists(accounts)
+            LocalCache.pruneRepliesAndReactions(accounts)
+            LocalCache.prunePastVersionsOfReplaceables()
+            LocalCache.pruneExpiredEvents()
+        }
+    }
+
+    // This method keeps the pause/start in a Syncronized block to
+    // avoid concurrent pauses and starts.
+    @Synchronized
+    fun forceRestart(
+        account: Account? = null,
+        start: Boolean = true,
+        pause: Boolean = true,
+    ) {
+        if (pause) {
+            pause()
+        }
+
+        if (start) {
+            if (account != null) {
+                start(account)
+            } else {
+                start()
+            }
+        }
+    }
+
+    fun restartIfDifferentAccount(account: Account) {
+        if (this.account != account) {
+            forceRestart(account, true, true)
+        }
+    }
+
+    fun forceRestart() {
+        forceRestart(null, true, true)
+    }
+
+    fun justStart() {
+        forceRestart(null, true, false)
+    }
+
+    fun pauseForGood() {
+        forceRestart(null, false, true)
+    }
+
+    fun pauseForGoodAndClearAccount() {
+        account = null
+        forceRestart(null, false, true)
+    }
 }

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

@@ -35,94 +35,94 @@ import kotlinx.coroutines.Dispatchers
 data class Spammer(val pubkeyHex: HexKey, var duplicatedMessages: Set<HexKey>)
 
 class AntiSpamFilter {
-  val recentMessages = LruCache<Int, String>(1000)
-  val spamMessages = LruCache<Int, Spammer>(1000)
+    val recentMessages = LruCache<Int, String>(1000)
+    val spamMessages = LruCache<Int, Spammer>(1000)
 
-  var active: Boolean = true
+    var active: Boolean = true
 
-  fun isSpam(
-    event: Event,
-    relay: Relay?,
-  ): Boolean {
-    checkNotInMainThread()
+    fun isSpam(
+        event: Event,
+        relay: Relay?,
+    ): Boolean {
+        checkNotInMainThread()
 
-    if (!active) return false
+        if (!active) return false
 
-    val idHex = event.id
+        val idHex = event.id
 
-    // if short message, ok
-    // The idea here is to avoid considering repeated "GM" messages spam.
-    if (event.content.length < 50) return false
+        // if short message, ok
+        // The idea here is to avoid considering repeated "GM" messages spam.
+        if (event.content.length < 50) return false
 
-    // if the message is actually short but because it cites a user/event, the nostr: string is
-    // really long, make it ok.
-    // The idea here is to avoid considering repeated "@Bot, command" messages spam, while still
-    // blocking repeated "lnbc..." invoices or fishing urls
-    if (event.content.length < 180 && Nip19.nip19regex.matcher(event.content).find()) return false
+        // if the message is actually short but because it cites a user/event, the nostr: string is
+        // really long, make it ok.
+        // The idea here is to avoid considering repeated "@Bot, command" messages spam, while still
+        // blocking repeated "lnbc..." invoices or fishing urls
+        if (event.content.length < 180 && Nip19.nip19regex.matcher(event.content).find()) return false
 
-    // double list strategy:
-    // if duplicated, it goes into spam. 1000 spam messages are saved into the spam list.
+        // double list strategy:
+        // if duplicated, it goes into spam. 1000 spam messages are saved into the spam list.
 
-    // Considers tags so that same replies to different people don't count.
-    val hash = (event.content + event.tags.flatten().joinToString(",")).hashCode()
+        // Considers tags so that same replies to different people don't count.
+        val hash = (event.content + event.tags.flatten().joinToString(",")).hashCode()
 
-    if (
-      (recentMessages[hash] != null && recentMessages[hash] != idHex) || spamMessages[hash] != null
+        if (
+            (recentMessages[hash] != null && recentMessages[hash] != idHex) || spamMessages[hash] != null
+        ) {
+            Log.w(
+                "Potential SPAM Message for sharing",
+                "${Nip19.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", " | ")}",
+            )
+
+            // Log down offenders
+            logOffender(hash, event)
+
+            liveSpam.invalidateData()
+
+            return true
+        }
+
+        recentMessages.put(hash, idHex)
+
+        return false
+    }
+
+    @Synchronized
+    private fun logOffender(
+        hashCode: Int,
+        event: Event,
     ) {
-      Log.w(
-        "Potential SPAM Message for sharing",
-        "${Nip19.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", " | ")}",
-      )
-
-      // Log down offenders
-      logOffender(hash, event)
-
-      liveSpam.invalidateData()
-
-      return true
+        if (spamMessages.get(hashCode) == null) {
+            spamMessages.put(hashCode, Spammer(event.pubKey, setOf(recentMessages[hashCode], event.id)))
+        } else {
+            val spammer = spamMessages.get(hashCode)
+            spammer.duplicatedMessages = spammer.duplicatedMessages + event.id
+        }
     }
 
-    recentMessages.put(hash, idHex)
-
-    return false
-  }
-
-  @Synchronized
-  private fun logOffender(
-    hashCode: Int,
-    event: Event,
-  ) {
-    if (spamMessages.get(hashCode) == null) {
-      spamMessages.put(hashCode, Spammer(event.pubKey, setOf(recentMessages[hashCode], event.id)))
-    } else {
-      val spammer = spamMessages.get(hashCode)
-      spammer.duplicatedMessages = spammer.duplicatedMessages + event.id
-    }
-  }
-
-  val liveSpam: AntiSpamLiveData = AntiSpamLiveData(this)
+    val liveSpam: AntiSpamLiveData = AntiSpamLiveData(this)
 }
 
 @Stable
 class AntiSpamLiveData(val cache: AntiSpamFilter) : LiveData<AntiSpamState>(AntiSpamState(cache)) {
-  // Refreshes observers in batches.
-  private val bundler = BundledUpdate(300, Dispatchers.IO)
+    // Refreshes observers in batches.
+    private val bundler = BundledUpdate(300, Dispatchers.IO)
 
-  fun invalidateData() {
-    checkNotInMainThread()
+    fun invalidateData() {
+        checkNotInMainThread()
 
-    bundler.invalidate {
-      checkNotInMainThread()
+        bundler.invalidate {
+            checkNotInMainThread()
 
-      if (hasActiveObservers()) {
-        postValue(AntiSpamState(cache))
-      }
+            if (hasActiveObservers()) {
+                postValue(AntiSpamState(cache))
+            }
+        }
     }
-  }
 }
 
 class AntiSpamState(val cache: AntiSpamFilter)

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

@@ -32,176 +32,176 @@ import com.vitorpamplona.quartz.encoders.HexKey
 import com.vitorpamplona.quartz.encoders.toNote
 import com.vitorpamplona.quartz.events.ChannelCreateEvent
 import com.vitorpamplona.quartz.events.LiveActivitiesEvent
-import java.util.concurrent.ConcurrentHashMap
 import kotlinx.coroutines.Dispatchers
+import java.util.concurrent.ConcurrentHashMap
 
 @Stable
 class PublicChatChannel(idHex: String) : Channel(idHex) {
-  var info = ChannelCreateEvent.ChannelData(null, null, null)
+    var info = ChannelCreateEvent.ChannelData(null, null, null)
 
-  fun updateChannelInfo(
-    creator: User,
-    channelInfo: ChannelCreateEvent.ChannelData,
-    updatedAt: Long,
-  ) {
-    this.info = channelInfo
-    super.updateChannelInfo(creator, updatedAt)
-  }
+    fun updateChannelInfo(
+        creator: User,
+        channelInfo: ChannelCreateEvent.ChannelData,
+        updatedAt: Long,
+    ) {
+        this.info = channelInfo
+        super.updateChannelInfo(creator, updatedAt)
+    }
 
-  override fun toBestDisplayName(): String {
-    return info.name ?: super.toBestDisplayName()
-  }
+    override fun toBestDisplayName(): String {
+        return info.name ?: super.toBestDisplayName()
+    }
 
-  override fun summary(): String? {
-    return info.about
-  }
+    override fun summary(): String? {
+        return info.about
+    }
 
-  override fun profilePicture(): String? {
-    if (info.picture.isNullOrBlank()) return super.profilePicture()
-    return info.picture ?: super.profilePicture()
-  }
+    override fun profilePicture(): String? {
+        if (info.picture.isNullOrBlank()) return super.profilePicture()
+        return info.picture ?: super.profilePicture()
+    }
 
-  override fun anyNameStartsWith(prefix: String): Boolean {
-    return listOfNotNull(info.name, info.about).filter { it.contains(prefix, true) }.isNotEmpty()
-  }
+    override fun anyNameStartsWith(prefix: String): Boolean {
+        return listOfNotNull(info.name, info.about).filter { it.contains(prefix, true) }.isNotEmpty()
+    }
 }
 
 @Stable
 class LiveActivitiesChannel(val address: ATag) : Channel(address.toTag()) {
-  var info: LiveActivitiesEvent? = null
+    var info: LiveActivitiesEvent? = null
 
-  override fun idNote() = address.toNAddr()
+    override fun idNote() = address.toNAddr()
 
-  override fun idDisplayNote() = idNote().toShortenHex()
+    override fun idDisplayNote() = idNote().toShortenHex()
 
-  fun address() = address
+    fun address() = address
 
-  fun updateChannelInfo(
-    creator: User,
-    channelInfo: LiveActivitiesEvent,
-    updatedAt: Long,
-  ) {
-    this.info = channelInfo
-    super.updateChannelInfo(creator, updatedAt)
-  }
+    fun updateChannelInfo(
+        creator: User,
+        channelInfo: LiveActivitiesEvent,
+        updatedAt: Long,
+    ) {
+        this.info = channelInfo
+        super.updateChannelInfo(creator, updatedAt)
+    }
 
-  override fun toBestDisplayName(): String {
-    return info?.title() ?: super.toBestDisplayName()
-  }
+    override fun toBestDisplayName(): String {
+        return info?.title() ?: super.toBestDisplayName()
+    }
 
-  override fun summary(): String? {
-    return info?.summary()
-  }
+    override fun summary(): String? {
+        return info?.summary()
+    }
 
-  override fun profilePicture(): String? {
-    return info?.image()?.ifBlank { null }
-  }
+    override fun profilePicture(): String? {
+        return info?.image()?.ifBlank { null }
+    }
 
-  override fun anyNameStartsWith(prefix: String): Boolean {
-    return listOfNotNull(info?.title(), info?.summary())
-      .filter { it.contains(prefix, true) }
-      .isNotEmpty()
-  }
+    override fun anyNameStartsWith(prefix: String): Boolean {
+        return listOfNotNull(info?.title(), info?.summary())
+            .filter { it.contains(prefix, true) }
+            .isNotEmpty()
+    }
 }
 
 @Stable
 abstract class Channel(val idHex: String) {
-  var creator: User? = null
+    var creator: User? = null
 
-  var updatedMetadataAt: Long = 0
+    var updatedMetadataAt: Long = 0
 
-  val notes = ConcurrentHashMap<HexKey, Note>()
+    val notes = ConcurrentHashMap<HexKey, Note>()
 
-  open fun id() = Hex.decode(idHex)
+    open fun id() = Hex.decode(idHex)
 
-  open fun idNote() = id().toNote()
+    open fun idNote() = id().toNote()
 
-  open fun idDisplayNote() = idNote().toShortenHex()
+    open fun idDisplayNote() = idNote().toShortenHex()
 
-  open fun toBestDisplayName(): String {
-    return idDisplayNote()
-  }
+    open fun toBestDisplayName(): String {
+        return idDisplayNote()
+    }
 
-  open fun summary(): String? {
-    return null
-  }
+    open fun summary(): String? {
+        return null
+    }
 
-  open fun creatorName(): String? {
-    return creator?.toBestDisplayName()
-  }
+    open fun creatorName(): String? {
+        return creator?.toBestDisplayName()
+    }
 
-  open fun profilePicture(): String? {
-    return creator?.profilePicture()
-  }
+    open fun profilePicture(): String? {
+        return creator?.profilePicture()
+    }
 
-  open fun updateChannelInfo(
-    creator: User,
-    updatedAt: Long,
-  ) {
-    this.creator = creator
-    this.updatedMetadataAt = updatedAt
+    open fun updateChannelInfo(
+        creator: User,
+        updatedAt: Long,
+    ) {
+        this.creator = creator
+        this.updatedMetadataAt = updatedAt
 
-    live.invalidateData()
-  }
+        live.invalidateData()
+    }
 
-  fun addNote(note: Note) {
-    notes[note.idHex] = note
-  }
+    fun addNote(note: Note) {
+        notes[note.idHex] = note
+    }
 
-  fun removeNote(note: Note) {
-    notes.remove(note.idHex)
-  }
+    fun removeNote(note: Note) {
+        notes.remove(note.idHex)
+    }
 
-  fun removeNote(noteHex: String) {
-    notes.remove(noteHex)
-  }
+    fun removeNote(noteHex: String) {
+        notes.remove(noteHex)
+    }
 
-  abstract fun anyNameStartsWith(prefix: String): Boolean
+    abstract fun anyNameStartsWith(prefix: String): Boolean
 
-  // Observers line up here.
-  val live: ChannelLiveData = ChannelLiveData(this)
+    // Observers line up here.
+    val live: ChannelLiveData = ChannelLiveData(this)
 
-  fun pruneOldAndHiddenMessages(account: Account): Set<Note> {
-    val important =
-      notes.values
-        .filter { it.author?.let { it1 -> account.isHidden(it1) } == false }
-        .sortedWith(compareBy({ it.createdAt() }, { it.idHex }))
-        .reversed()
-        .take(1000)
-        .toSet()
+    fun pruneOldAndHiddenMessages(account: Account): Set<Note> {
+        val important =
+            notes.values
+                .filter { it.author?.let { it1 -> account.isHidden(it1) } == false }
+                .sortedWith(compareBy({ it.createdAt() }, { it.idHex }))
+                .reversed()
+                .take(1000)
+                .toSet()
 
-    val toBeRemoved = notes.values.filter { it !in important }.toSet()
+        val toBeRemoved = notes.values.filter { it !in important }.toSet()
 
-    toBeRemoved.forEach { notes.remove(it.idHex) }
+        toBeRemoved.forEach { notes.remove(it.idHex) }
 
-    return toBeRemoved
-  }
+        return toBeRemoved
+    }
 }
 
 class ChannelLiveData(val channel: Channel) : LiveData<ChannelState>(ChannelState(channel)) {
-  // Refreshes observers in batches.
-  private val bundler = BundledUpdate(300, Dispatchers.IO)
+    // Refreshes observers in batches.
+    private val bundler = BundledUpdate(300, Dispatchers.IO)
 
-  fun invalidateData() {
-    checkNotInMainThread()
+    fun invalidateData() {
+        checkNotInMainThread()
 
-    bundler.invalidate {
-      checkNotInMainThread()
-      if (hasActiveObservers()) {
-        postValue(ChannelState(channel))
-      }
+        bundler.invalidate {
+            checkNotInMainThread()
+            if (hasActiveObservers()) {
+                postValue(ChannelState(channel))
+            }
+        }
     }
-  }
 
-  override fun onActive() {
-    super.onActive()
-    NostrSingleChannelDataSource.add(channel)
-  }
+    override fun onActive() {
+        super.onActive()
+        NostrSingleChannelDataSource.add(channel)
+    }
 
-  override fun onInactive() {
-    super.onInactive()
-    NostrSingleChannelDataSource.remove(channel)
-  }
+    override fun onInactive() {
+        super.onInactive()
+        NostrSingleChannelDataSource.remove(channel)
+    }
 }
 
 class ChannelState(val channel: Channel)

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

@@ -27,62 +27,62 @@ import com.vitorpamplona.quartz.utils.TimeUtils
 
 @Stable
 class Chatroom() {
-  var roomMessages: Set<Note> = setOf()
-  var subject: String? = null
-  var subjectCreatedAt: Long? = null
+    var roomMessages: Set<Note> = setOf()
+    var subject: String? = null
+    var subjectCreatedAt: Long? = null
 
-  @Synchronized
-  fun addMessageSync(msg: Note) {
-    checkNotInMainThread()
+    @Synchronized
+    fun addMessageSync(msg: Note) {
+        checkNotInMainThread()
 
-    if (msg !in roomMessages) {
-      roomMessages = roomMessages + msg
+        if (msg !in roomMessages) {
+            roomMessages = roomMessages + msg
 
-      val newSubject = msg.event?.subject()
+            val newSubject = msg.event?.subject()
 
-      if (newSubject != null && (msg.createdAt() ?: 0) > (subjectCreatedAt ?: 0)) {
-        subject = newSubject
-        subjectCreatedAt = msg.createdAt()
-      }
-    }
-  }
-
-  @Synchronized
-  fun removeMessageSync(msg: Note) {
-    checkNotInMainThread()
-
-    if (msg !in roomMessages) {
-      roomMessages = roomMessages + msg
-
-      roomMessages
-        .filter { it.event?.subject() != null }
-        .sortedBy { it.createdAt() }
-        .lastOrNull()
-        ?.let {
-          subject = it.event?.subject()
-          subjectCreatedAt = it.createdAt()
+            if (newSubject != null && (msg.createdAt() ?: 0) > (subjectCreatedAt ?: 0)) {
+                subject = newSubject
+                subjectCreatedAt = msg.createdAt()
+            }
         }
     }
-  }
 
-  fun senderIntersects(keySet: Set<HexKey>): Boolean {
-    return roomMessages.any { it.author?.pubkeyHex in keySet }
-  }
+    @Synchronized
+    fun removeMessageSync(msg: Note) {
+        checkNotInMainThread()
 
-  fun pruneMessagesToTheLatestOnly(): Set<Note> {
-    val sorted = roomMessages.sortedWith(compareBy({ it.createdAt() }, { it.idHex })).reversed()
+        if (msg !in roomMessages) {
+            roomMessages = roomMessages + msg
 
-    val toKeep =
-      if ((sorted.firstOrNull()?.createdAt() ?: 0) > TimeUtils.oneWeekAgo()) {
-        // Recent messages, keep last 100
-        sorted.take(100).toSet()
-      } else {
-        // Old messages, keep the last one.
-        sorted.take(1).toSet()
-      } + sorted.filter { it.liveSet?.isInUse() ?: false }
+            roomMessages
+                .filter { it.event?.subject() != null }
+                .sortedBy { it.createdAt() }
+                .lastOrNull()
+                ?.let {
+                    subject = it.event?.subject()
+                    subjectCreatedAt = it.createdAt()
+                }
+        }
+    }
 
-    val toRemove = roomMessages.minus(toKeep)
-    roomMessages = toKeep
-    return toRemove
-  }
+    fun senderIntersects(keySet: Set<HexKey>): Boolean {
+        return roomMessages.any { it.author?.pubkeyHex in keySet }
+    }
+
+    fun pruneMessagesToTheLatestOnly(): Set<Note> {
+        val sorted = roomMessages.sortedWith(compareBy({ it.createdAt() }, { it.idHex })).reversed()
+
+        val toKeep =
+            if ((sorted.firstOrNull()?.createdAt() ?: 0) > TimeUtils.oneWeekAgo()) {
+                // Recent messages, keep last 100
+                sorted.take(100).toSet()
+            } else {
+                // Old messages, keep the last one.
+                sorted.take(1).toSet()
+            } + sorted.filter { it.liveSet?.isInUse() ?: false }
+
+        val toRemove = roomMessages.minus(toKeep)
+        roomMessages = toKeep
+        return toRemove
+    }
 }

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

@@ -28,144 +28,154 @@ import androidx.compose.ui.unit.dp
 import com.vitorpamplona.amethyst.R
 
 fun checkForHashtagWithIcon(
-  tag: String,
-  primary: Color,
+    tag: String,
+    primary: Color,
 ): HashtagIcon? {
-  return when (tag.lowercase()) {
-    "bitcoin",
-    "btc",
-    "timechain",
-    "bitcoiner",
-    "bitcoiners", ->
-      HashtagIcon(
-        R.drawable.ht_btc,
-        "Bitcoin",
-        Color.Unspecified,
-        Modifier.padding(2.dp, 2.dp, 0.dp, 0.dp),
-      )
-    "nostr",
-    "nostrich",
-    "nostriches",
-    "thenostr", ->
-      HashtagIcon(
-        R.drawable.ht_nostr,
-        "Nostr",
-        Color.Unspecified,
-        Modifier.padding(1.dp, 2.dp, 0.dp, 0.dp),
-      )
-    "lightning",
-    "lightningnetwork", ->
-      HashtagIcon(
-        R.drawable.ht_lightning,
-        "Lightning",
-        Color.Unspecified,
-        Modifier.padding(1.dp, 3.dp, 0.dp, 0.dp),
-      )
-    "zap",
-    "zaps",
-    "zapper",
-    "zappers",
-    "zapping",
-    "zapped",
-    "zapathon",
-    "zapraiser",
-    "zaplife",
-    "zapchain", ->
-      HashtagIcon(
-        R.drawable.zap,
-        "Zap",
-        Color.Unspecified,
-        Modifier.padding(1.dp, 3.dp, 0.dp, 0.dp),
-      )
-    "amethyst" ->
-      HashtagIcon(
-        R.drawable.amethyst,
-        "Amethyst",
-        Color.Unspecified,
-        Modifier.padding(3.dp, 2.dp, 0.dp, 0.dp),
-      )
-    "onyx" ->
-      HashtagIcon(
-        R.drawable.black_heart,
-        "Onyx",
-        Color.Unspecified,
-        Modifier.padding(1.dp, 3.dp, 0.dp, 0.dp),
-      )
-    "cashu",
-    "ecash",
-    "nut",
-    "nuts",
-    "deeznuts", ->
-      HashtagIcon(
-        R.drawable.cashu,
-        "Cashu",
-        Color.Unspecified,
-        Modifier.padding(1.dp, 3.dp, 0.dp, 0.dp),
-      )
-    "plebs",
-    "pleb",
-    "plebchain", ->
-      HashtagIcon(
-        R.drawable.plebs,
-        "Pleb",
-        Color.Unspecified,
-        Modifier.padding(2.dp, 2.dp, 0.dp, 1.dp),
-      )
-    "coffee",
-    "coffeechain",
-    "cafe", ->
-      HashtagIcon(
-        R.drawable.coffee,
-        "Coffee",
-        Color.Unspecified,
-        Modifier.padding(2.dp, 2.dp, 0.dp, 0.dp),
-      )
-    "skullofsatoshi" ->
-      HashtagIcon(
-        R.drawable.skull,
-        "SkullofSatoshi",
-        Color.Unspecified,
-        Modifier.padding(2.dp, 1.dp, 0.dp, 0.dp),
-      )
-    "grownostr",
-    "gardening",
-    "garden", ->
-      HashtagIcon(
-        R.drawable.grownostr,
-        "GrowNostr",
-        Color.Unspecified,
-        Modifier.padding(0.dp, 1.dp, 0.dp, 1.dp),
-      )
-    "footstr" ->
-      HashtagIcon(
-        R.drawable.footstr,
-        "Footstr",
-        Color.Unspecified,
-        Modifier.padding(1.dp, 1.dp, 0.dp, 0.dp),
-      )
-    "tunestr",
-    "music",
-    "nowplaying", ->
-      HashtagIcon(R.drawable.tunestr, "Tunestr", primary, Modifier.padding(0.dp, 3.dp, 0.dp, 1.dp))
-    "weed",
-    "weedstr",
-    "420",
-    "cannabis",
-    "marijuana", ->
-      HashtagIcon(
-        R.drawable.weed,
-        "Weed",
-        Color.Unspecified,
-        Modifier.padding(0.dp, 0.dp, 0.dp, 0.dp),
-      )
-    else -> null
-  }
+    return when (tag.lowercase()) {
+        "bitcoin",
+        "btc",
+        "timechain",
+        "bitcoiner",
+        "bitcoiners",
+        ->
+            HashtagIcon(
+                R.drawable.ht_btc,
+                "Bitcoin",
+                Color.Unspecified,
+                Modifier.padding(2.dp, 2.dp, 0.dp, 0.dp),
+            )
+        "nostr",
+        "nostrich",
+        "nostriches",
+        "thenostr",
+        ->
+            HashtagIcon(
+                R.drawable.ht_nostr,
+                "Nostr",
+                Color.Unspecified,
+                Modifier.padding(1.dp, 2.dp, 0.dp, 0.dp),
+            )
+        "lightning",
+        "lightningnetwork",
+        ->
+            HashtagIcon(
+                R.drawable.ht_lightning,
+                "Lightning",
+                Color.Unspecified,
+                Modifier.padding(1.dp, 3.dp, 0.dp, 0.dp),
+            )
+        "zap",
+        "zaps",
+        "zapper",
+        "zappers",
+        "zapping",
+        "zapped",
+        "zapathon",
+        "zapraiser",
+        "zaplife",
+        "zapchain",
+        ->
+            HashtagIcon(
+                R.drawable.zap,
+                "Zap",
+                Color.Unspecified,
+                Modifier.padding(1.dp, 3.dp, 0.dp, 0.dp),
+            )
+        "amethyst" ->
+            HashtagIcon(
+                R.drawable.amethyst,
+                "Amethyst",
+                Color.Unspecified,
+                Modifier.padding(3.dp, 2.dp, 0.dp, 0.dp),
+            )
+        "onyx" ->
+            HashtagIcon(
+                R.drawable.black_heart,
+                "Onyx",
+                Color.Unspecified,
+                Modifier.padding(1.dp, 3.dp, 0.dp, 0.dp),
+            )
+        "cashu",
+        "ecash",
+        "nut",
+        "nuts",
+        "deeznuts",
+        ->
+            HashtagIcon(
+                R.drawable.cashu,
+                "Cashu",
+                Color.Unspecified,
+                Modifier.padding(1.dp, 3.dp, 0.dp, 0.dp),
+            )
+        "plebs",
+        "pleb",
+        "plebchain",
+        ->
+            HashtagIcon(
+                R.drawable.plebs,
+                "Pleb",
+                Color.Unspecified,
+                Modifier.padding(2.dp, 2.dp, 0.dp, 1.dp),
+            )
+        "coffee",
+        "coffeechain",
+        "cafe",
+        ->
+            HashtagIcon(
+                R.drawable.coffee,
+                "Coffee",
+                Color.Unspecified,
+                Modifier.padding(2.dp, 2.dp, 0.dp, 0.dp),
+            )
+        "skullofsatoshi" ->
+            HashtagIcon(
+                R.drawable.skull,
+                "SkullofSatoshi",
+                Color.Unspecified,
+                Modifier.padding(2.dp, 1.dp, 0.dp, 0.dp),
+            )
+        "grownostr",
+        "gardening",
+        "garden",
+        ->
+            HashtagIcon(
+                R.drawable.grownostr,
+                "GrowNostr",
+                Color.Unspecified,
+                Modifier.padding(0.dp, 1.dp, 0.dp, 1.dp),
+            )
+        "footstr" ->
+            HashtagIcon(
+                R.drawable.footstr,
+                "Footstr",
+                Color.Unspecified,
+                Modifier.padding(1.dp, 1.dp, 0.dp, 0.dp),
+            )
+        "tunestr",
+        "music",
+        "nowplaying",
+        ->
+            HashtagIcon(R.drawable.tunestr, "Tunestr", primary, Modifier.padding(0.dp, 3.dp, 0.dp, 1.dp))
+        "weed",
+        "weedstr",
+        "420",
+        "cannabis",
+        "marijuana",
+        ->
+            HashtagIcon(
+                R.drawable.weed,
+                "Weed",
+                Color.Unspecified,
+                Modifier.padding(0.dp, 0.dp, 0.dp, 0.dp),
+            )
+        else -> null
+    }
 }
 
 @Immutable
 class HashtagIcon(
-  val icon: Int,
-  val description: String,
-  val color: Color,
-  val modifier: Modifier,
+    val icon: Int,
+    val description: String,
+    val color: Color,
+    val modifier: Modifier,
 )

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

@@ -23,94 +23,94 @@ package com.vitorpamplona.amethyst.model
 import com.vitorpamplona.quartz.encoders.HexKey
 
 class ParticipantListBuilder {
-  private fun addFollowsThatDirectlyParticipateOnToSet(
-    baseNote: Note,
-    followingSet: Set<HexKey>?,
-    set: MutableSet<User>,
-  ) {
-    baseNote.author?.let { author ->
-      if (author !in set && (followingSet == null || author.pubkeyHex in followingSet)) {
-        set.add(author)
-      }
-    }
-
-    // Breaks these searchers down to avoid the memory use of creating multiple lists
-    baseNote.replies.forEach { reply ->
-      reply.author?.let { author ->
-        if (author !in set && (followingSet == null || author.pubkeyHex in followingSet)) {
-          set.add(author)
+    private fun addFollowsThatDirectlyParticipateOnToSet(
+        baseNote: Note,
+        followingSet: Set<HexKey>?,
+        set: MutableSet<User>,
+    ) {
+        baseNote.author?.let { author ->
+            if (author !in set && (followingSet == null || author.pubkeyHex in followingSet)) {
+                set.add(author)
+            }
         }
-      }
-    }
 
-    baseNote.boosts.forEach { boost ->
-      boost.author?.let { author ->
-        if (author !in set && (followingSet == null || author.pubkeyHex in followingSet)) {
-          set.add(author)
+        // Breaks these searchers down to avoid the memory use of creating multiple lists
+        baseNote.replies.forEach { reply ->
+            reply.author?.let { author ->
+                if (author !in set && (followingSet == null || author.pubkeyHex in followingSet)) {
+                    set.add(author)
+                }
+            }
         }
-      }
-    }
 
-    baseNote.zaps.forEach { zapPair ->
-      zapPair.key.author?.let { author ->
-        if (author !in set && (followingSet == null || author.pubkeyHex in followingSet)) {
-          set.add(author)
+        baseNote.boosts.forEach { boost ->
+            boost.author?.let { author ->
+                if (author !in set && (followingSet == null || author.pubkeyHex in followingSet)) {
+                    set.add(author)
+                }
+            }
         }
-      }
-    }
 
-    baseNote.reactions.forEach { reactionSet ->
-      reactionSet.value.forEach { reaction ->
-        reaction.author?.let { author ->
-          if (author !in set && (followingSet == null || author.pubkeyHex in followingSet)) {
-            set.add(author)
-          }
+        baseNote.zaps.forEach { zapPair ->
+            zapPair.key.author?.let { author ->
+                if (author !in set && (followingSet == null || author.pubkeyHex in followingSet)) {
+                    set.add(author)
+                }
+            }
         }
-      }
-    }
-  }
 
-  fun followsThatParticipateOnDirect(
-    baseNote: Note?,
-    followingSet: Set<HexKey>?,
-  ): Set<User> {
-    if (baseNote == null) return mutableSetOf()
-
-    val set = mutableSetOf<User>()
-    addFollowsThatDirectlyParticipateOnToSet(baseNote, followingSet, set)
-    return set
-  }
-
-  fun followsThatParticipateOn(
-    baseNote: Note?,
-    followingSet: Set<HexKey>?,
-  ): Set<User> {
-    if (baseNote == null) return mutableSetOf()
-
-    val mySet = mutableSetOf<User>()
-    addFollowsThatDirectlyParticipateOnToSet(baseNote, followingSet, mySet)
-
-    baseNote.replies.forEach { addFollowsThatDirectlyParticipateOnToSet(it, followingSet, mySet) }
-
-    baseNote.boosts.forEach {
-      it.replyTo?.forEach { addFollowsThatDirectlyParticipateOnToSet(it, followingSet, mySet) }
+        baseNote.reactions.forEach { reactionSet ->
+            reactionSet.value.forEach { reaction ->
+                reaction.author?.let { author ->
+                    if (author !in set && (followingSet == null || author.pubkeyHex in followingSet)) {
+                        set.add(author)
+                    }
+                }
+            }
+        }
     }
 
-    LocalCache.getChannelIfExists(baseNote.idHex)?.notes?.values?.forEach {
-      addFollowsThatDirectlyParticipateOnToSet(it, followingSet, mySet)
+    fun followsThatParticipateOnDirect(
+        baseNote: Note?,
+        followingSet: Set<HexKey>?,
+    ): Set<User> {
+        if (baseNote == null) return mutableSetOf()
+
+        val set = mutableSetOf<User>()
+        addFollowsThatDirectlyParticipateOnToSet(baseNote, followingSet, set)
+        return set
     }
 
-    return mySet
-  }
+    fun followsThatParticipateOn(
+        baseNote: Note?,
+        followingSet: Set<HexKey>?,
+    ): Set<User> {
+        if (baseNote == null) return mutableSetOf()
 
-  fun countFollowsThatParticipateOn(
-    baseNote: Note?,
-    followingSet: Set<HexKey>?,
-  ): Int {
-    if (baseNote == null) return 0
+        val mySet = mutableSetOf<User>()
+        addFollowsThatDirectlyParticipateOnToSet(baseNote, followingSet, mySet)
 
-    val list = followsThatParticipateOn(baseNote, followingSet)
+        baseNote.replies.forEach { addFollowsThatDirectlyParticipateOnToSet(it, followingSet, mySet) }
 
-    return list.size
-  }
+        baseNote.boosts.forEach {
+            it.replyTo?.forEach { addFollowsThatDirectlyParticipateOnToSet(it, followingSet, mySet) }
+        }
+
+        LocalCache.getChannelIfExists(baseNote.idHex)?.notes?.values?.forEach {
+            addFollowsThatDirectlyParticipateOnToSet(it, followingSet, mySet)
+        }
+
+        return mySet
+    }
+
+    fun countFollowsThatParticipateOn(
+        baseNote: Note?,
+        followingSet: Set<HexKey>?,
+    ): Int {
+        if (baseNote == null) return 0
+
+        val list = followsThatParticipateOn(baseNote, followingSet)
+
+        return list.size
+    }
 }

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

@@ -26,57 +26,56 @@ import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 
 @Stable
 class RelayInformation(
-  val id: String?,
-  val name: String?,
-  val description: String?,
-  val pubkey: String?,
-  val contact: String?,
-  val supported_nips: List<Int>?,
-  val supported_nip_extensions: List<String>?,
-  val software: String?,
-  val version: String?,
-  val limitation: RelayInformationLimitation?,
-  val relay_countries: List<String>?,
-  val language_tags: List<String>?,
-  val tags: List<String>?,
-  val posting_policy: String?,
-  val payments_url: String?,
-  val fees: RelayInformationFees?,
+    val id: String?,
+    val name: String?,
+    val description: String?,
+    val pubkey: String?,
+    val contact: String?,
+    val supported_nips: List<Int>?,
+    val supported_nip_extensions: List<String>?,
+    val software: String?,
+    val version: String?,
+    val limitation: RelayInformationLimitation?,
+    val relay_countries: List<String>?,
+    val language_tags: List<String>?,
+    val tags: List<String>?,
+    val posting_policy: String?,
+    val payments_url: String?,
+    val fees: RelayInformationFees?,
 ) {
-  companion object {
-    val mapper =
-      jacksonObjectMapper().configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
+    companion object {
+        val mapper =
+            jacksonObjectMapper().configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
 
-    fun fromJson(json: String): RelayInformation =
-      mapper.readValue(json, RelayInformation::class.java)
-  }
+        fun fromJson(json: String): RelayInformation = mapper.readValue(json, RelayInformation::class.java)
+    }
 }
 
 @Stable
 class RelayInformationFee(
-  val amount: Int?,
-  val unit: String?,
-  val period: Int?,
-  val kinds: List<Int>?,
+    val amount: Int?,
+    val unit: String?,
+    val period: Int?,
+    val kinds: List<Int>?,
 )
 
 class RelayInformationFees(
-  val admission: List<RelayInformationFee>?,
-  val subscription: List<RelayInformationFee>?,
-  val publication: List<RelayInformationFee>?,
-  val retention: List<RelayInformationFee>?,
+    val admission: List<RelayInformationFee>?,
+    val subscription: List<RelayInformationFee>?,
+    val publication: List<RelayInformationFee>?,
+    val retention: List<RelayInformationFee>?,
 )
 
 class RelayInformationLimitation(
-  val max_message_length: Int?,
-  val max_subscriptions: Int?,
-  val max_filters: Int?,
-  val max_limit: Int?,
-  val max_subid_length: Int?,
-  val min_prefix: Int?,
-  val max_event_tags: Int?,
-  val max_content_length: Int?,
-  val min_pow_difficulty: Int?,
-  val auth_required: Boolean?,
-  val payment_required: Boolean?,
+    val max_message_length: Int?,
+    val max_subscriptions: Int?,
+    val max_filters: Int?,
+    val max_limit: Int?,
+    val max_subid_length: Int?,
+    val min_prefix: Int?,
+    val max_event_tags: Int?,
+    val max_content_length: Int?,
+    val min_pow_difficulty: Int?,
+    val auth_required: Boolean?,
+    val payment_required: Boolean?,
 )

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

@@ -25,15 +25,15 @@ import com.vitorpamplona.amethyst.service.relays.FeedType
 
 @Immutable
 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 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)
+    val briefInfo: RelayBriefInfoCache.RelayBriefInfo = RelayBriefInfoCache.RelayBriefInfo(url)
 }

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

@@ -25,83 +25,83 @@ import com.vitorpamplona.amethyst.R
 
 @Stable
 data class Settings(
-  val theme: ThemeType = ThemeType.SYSTEM,
-  val preferredLanguage: String? = null,
-  val automaticallyShowImages: ConnectivityType = ConnectivityType.ALWAYS,
-  val automaticallyStartPlayback: ConnectivityType = ConnectivityType.ALWAYS,
-  val automaticallyShowUrlPreview: ConnectivityType = ConnectivityType.ALWAYS,
-  val automaticallyHideNavigationBars: BooleanType = BooleanType.ALWAYS,
-  val automaticallyShowProfilePictures: ConnectivityType = ConnectivityType.ALWAYS,
-  val dontShowPushNotificationSelector: Boolean = false,
-  val dontAskForNotificationPermissions: Boolean = false,
+    val theme: ThemeType = ThemeType.SYSTEM,
+    val preferredLanguage: String? = null,
+    val automaticallyShowImages: ConnectivityType = ConnectivityType.ALWAYS,
+    val automaticallyStartPlayback: ConnectivityType = ConnectivityType.ALWAYS,
+    val automaticallyShowUrlPreview: ConnectivityType = ConnectivityType.ALWAYS,
+    val automaticallyHideNavigationBars: BooleanType = BooleanType.ALWAYS,
+    val automaticallyShowProfilePictures: ConnectivityType = ConnectivityType.ALWAYS,
+    val dontShowPushNotificationSelector: Boolean = false,
+    val dontAskForNotificationPermissions: Boolean = false,
 )
 
 enum class ThemeType(val screenCode: Int, val resourceId: Int) {
-  SYSTEM(0, R.string.system),
-  LIGHT(1, R.string.light),
-  DARK(2, R.string.dark),
+    SYSTEM(0, R.string.system),
+    LIGHT(1, R.string.light),
+    DARK(2, R.string.dark),
 }
 
 fun parseThemeType(code: Int?): ThemeType {
-  return when (code) {
-    ThemeType.SYSTEM.screenCode -> ThemeType.SYSTEM
-    ThemeType.LIGHT.screenCode -> ThemeType.LIGHT
-    ThemeType.DARK.screenCode -> ThemeType.DARK
-    else -> {
-      ThemeType.SYSTEM
+    return when (code) {
+        ThemeType.SYSTEM.screenCode -> ThemeType.SYSTEM
+        ThemeType.LIGHT.screenCode -> ThemeType.LIGHT
+        ThemeType.DARK.screenCode -> ThemeType.DARK
+        else -> {
+            ThemeType.SYSTEM
+        }
     }
-  }
 }
 
 enum class ConnectivityType(val prefCode: Boolean?, val screenCode: Int, val resourceId: Int) {
-  ALWAYS(null, 0, R.string.connectivity_type_always),
-  WIFI_ONLY(true, 1, R.string.connectivity_type_wifi_only),
-  NEVER(false, 2, R.string.connectivity_type_never),
+    ALWAYS(null, 0, R.string.connectivity_type_always),
+    WIFI_ONLY(true, 1, R.string.connectivity_type_wifi_only),
+    NEVER(false, 2, R.string.connectivity_type_never),
 }
 
 fun parseConnectivityType(code: Boolean?): ConnectivityType {
-  return when (code) {
-    ConnectivityType.ALWAYS.prefCode -> ConnectivityType.ALWAYS
-    ConnectivityType.WIFI_ONLY.prefCode -> ConnectivityType.WIFI_ONLY
-    ConnectivityType.NEVER.prefCode -> ConnectivityType.NEVER
-    else -> {
-      ConnectivityType.ALWAYS
+    return when (code) {
+        ConnectivityType.ALWAYS.prefCode -> ConnectivityType.ALWAYS
+        ConnectivityType.WIFI_ONLY.prefCode -> ConnectivityType.WIFI_ONLY
+        ConnectivityType.NEVER.prefCode -> ConnectivityType.NEVER
+        else -> {
+            ConnectivityType.ALWAYS
+        }
     }
-  }
 }
 
 fun parseConnectivityType(screenCode: Int): ConnectivityType {
-  return when (screenCode) {
-    ConnectivityType.ALWAYS.screenCode -> ConnectivityType.ALWAYS
-    ConnectivityType.WIFI_ONLY.screenCode -> ConnectivityType.WIFI_ONLY
-    ConnectivityType.NEVER.screenCode -> ConnectivityType.NEVER
-    else -> {
-      ConnectivityType.ALWAYS
+    return when (screenCode) {
+        ConnectivityType.ALWAYS.screenCode -> ConnectivityType.ALWAYS
+        ConnectivityType.WIFI_ONLY.screenCode -> ConnectivityType.WIFI_ONLY
+        ConnectivityType.NEVER.screenCode -> ConnectivityType.NEVER
+        else -> {
+            ConnectivityType.ALWAYS
+        }
     }
-  }
 }
 
 enum class BooleanType(val prefCode: Boolean?, val screenCode: Int, val reourceId: Int) {
-  ALWAYS(null, 0, R.string.connectivity_type_always),
-  NEVER(false, 1, R.string.connectivity_type_never),
+    ALWAYS(null, 0, R.string.connectivity_type_always),
+    NEVER(false, 1, R.string.connectivity_type_never),
 }
 
 fun parseBooleanType(code: Boolean?): BooleanType {
-  return when (code) {
-    BooleanType.ALWAYS.prefCode -> BooleanType.ALWAYS
-    BooleanType.NEVER.prefCode -> BooleanType.NEVER
-    else -> {
-      BooleanType.ALWAYS
+    return when (code) {
+        BooleanType.ALWAYS.prefCode -> BooleanType.ALWAYS
+        BooleanType.NEVER.prefCode -> BooleanType.NEVER
+        else -> {
+            BooleanType.ALWAYS
+        }
     }
-  }
 }
 
 fun parseBooleanType(screenCode: Int): BooleanType {
-  return when (screenCode) {
-    BooleanType.ALWAYS.screenCode -> BooleanType.ALWAYS
-    BooleanType.NEVER.screenCode -> BooleanType.NEVER
-    else -> {
-      BooleanType.ALWAYS
+    return when (screenCode) {
+        BooleanType.ALWAYS.screenCode -> BooleanType.ALWAYS
+        BooleanType.NEVER.screenCode -> BooleanType.NEVER
+        else -> {
+            BooleanType.ALWAYS
+        }
     }
-  }
 }

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

@@ -26,86 +26,86 @@ import com.vitorpamplona.quartz.events.RepostEvent
 import kotlin.time.measureTimedValue
 
 class ThreadAssembler {
-  private fun searchRoot(
-    note: Note,
-    testedNotes: MutableSet<Note> = mutableSetOf(),
-  ): Note? {
-    if (note.replyTo == null || note.replyTo?.isEmpty() == true) return note
+    private fun searchRoot(
+        note: Note,
+        testedNotes: MutableSet<Note> = mutableSetOf(),
+    ): Note? {
+        if (note.replyTo == null || note.replyTo?.isEmpty() == true) return note
 
-    if (note.event is RepostEvent || note.event is GenericRepostEvent) return note
+        if (note.event is RepostEvent || note.event is GenericRepostEvent) return note
 
-    testedNotes.add(note)
+        testedNotes.add(note)
 
-    val markedAsRoot =
-      note.event
-        ?.tags()
-        ?.firstOrNull { it[0] == "e" && it.size > 3 && it[3] == "root" }
-        ?.getOrNull(1)
-    if (markedAsRoot != null) {
-      // Check to ssee if there is an error in the tag and the root has replies
-      if (LocalCache.getNoteIfExists(markedAsRoot)?.replyTo?.isEmpty() == true) {
-        return LocalCache.checkGetOrCreateNote(markedAsRoot)
-      }
-    }
-
-    val hasNoReplyTo = note.replyTo?.reversed()?.firstOrNull { it.replyTo?.isEmpty() == true }
-    if (hasNoReplyTo != null) return hasNoReplyTo
-
-    // recursive
-    val roots =
-      note.replyTo
-        ?.map {
-          if (it !in testedNotes) {
-            searchRoot(it, testedNotes)
-          } else {
-            null
-          }
+        val markedAsRoot =
+            note.event
+                ?.tags()
+                ?.firstOrNull { it[0] == "e" && it.size > 3 && it[3] == "root" }
+                ?.getOrNull(1)
+        if (markedAsRoot != null) {
+            // Check to ssee if there is an error in the tag and the root has replies
+            if (LocalCache.getNoteIfExists(markedAsRoot)?.replyTo?.isEmpty() == true) {
+                return LocalCache.checkGetOrCreateNote(markedAsRoot)
+            }
         }
-        ?.filterNotNull()
 
-    if (roots != null && roots.isNotEmpty()) {
-      return roots[0]
-    }
+        val hasNoReplyTo = note.replyTo?.reversed()?.firstOrNull { it.replyTo?.isEmpty() == true }
+        if (hasNoReplyTo != null) return hasNoReplyTo
 
-    return null
-  }
+        // recursive
+        val roots =
+            note.replyTo
+                ?.map {
+                    if (it !in testedNotes) {
+                        searchRoot(it, testedNotes)
+                    } else {
+                        null
+                    }
+                }
+                ?.filterNotNull()
 
-  fun findThreadFor(noteId: String): Set<Note> {
-    checkNotInMainThread()
-
-    val (result, elapsed) =
-      measureTimedValue {
-        val note = LocalCache.checkGetOrCreateNote(noteId) ?: return emptySet<Note>()
-
-        if (note.event != null) {
-          val thread = mutableSetOf<Note>()
-
-          val threadRoot = searchRoot(note, thread) ?: note
-
-          loadDown(threadRoot, thread)
-          // adds the replies of the note in case the search for Root
-          // did not added them.
-          note.replies.forEach { loadDown(it, thread) }
-
-          thread.toSet()
-        } else {
-          setOf(note)
+        if (roots != null && roots.isNotEmpty()) {
+            return roots[0]
         }
-      }
 
-    println("Model Refresh: Thread loaded in $elapsed")
-
-    return result
-  }
-
-  fun loadDown(
-    note: Note,
-    thread: MutableSet<Note>,
-  ) {
-    if (note !in thread) {
-      thread.add(note)
-
-      note.replies.forEach { loadDown(it, thread) }
+        return null
+    }
+
+    fun findThreadFor(noteId: String): Set<Note> {
+        checkNotInMainThread()
+
+        val (result, elapsed) =
+            measureTimedValue {
+                val note = LocalCache.checkGetOrCreateNote(noteId) ?: return emptySet<Note>()
+
+                if (note.event != null) {
+                    val thread = mutableSetOf<Note>()
+
+                    val threadRoot = searchRoot(note, thread) ?: note
+
+                    loadDown(threadRoot, thread)
+                    // adds the replies of the note in case the search for Root
+                    // did not added them.
+                    note.replies.forEach { loadDown(it, thread) }
+
+                    thread.toSet()
+                } else {
+                    setOf(note)
+                }
+            }
+
+        println("Model Refresh: Thread loaded in $elapsed")
+
+        return result
+    }
+
+    fun loadDown(
+        note: Note,
+        thread: MutableSet<Note>,
+    ) {
+        if (note !in thread) {
+            thread.add(note)
+
+            note.replies.forEach { loadDown(it, thread) }
+        }
     }
-  }
 }

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

@@ -31,55 +31,54 @@ import kotlinx.coroutines.withContext
 
 @Stable
 object UrlCachedPreviewer {
-  var cache = LruCache<String, UrlPreviewState>(100)
-    private set
+    var cache = LruCache<String, UrlPreviewState>(100)
+        private set
 
-  suspend fun previewInfo(
-    url: String,
-    onReady: suspend (UrlPreviewState) -> Unit,
-  ) =
-    withContext(Dispatchers.IO) {
-      cache[url]?.let {
-        onReady(it)
-        return@withContext
-      }
+    suspend fun previewInfo(
+        url: String,
+        onReady: suspend (UrlPreviewState) -> Unit,
+    ) = withContext(Dispatchers.IO) {
+        cache[url]?.let {
+            onReady(it)
+            return@withContext
+        }
 
-      BahaUrlPreview(
-          url,
-          object : IUrlPreviewCallback {
-            override suspend fun onComplete(urlInfo: UrlInfoItem) =
-              withContext(Dispatchers.IO) {
-                cache[url]?.let {
-                  if (it is UrlPreviewState.Loaded || it is UrlPreviewState.Empty) {
-                    onReady(it)
-                    return@withContext
-                  }
-                }
+        BahaUrlPreview(
+            url,
+            object : IUrlPreviewCallback {
+                override suspend fun onComplete(urlInfo: UrlInfoItem) =
+                    withContext(Dispatchers.IO) {
+                        cache[url]?.let {
+                            if (it is UrlPreviewState.Loaded || it is UrlPreviewState.Empty) {
+                                onReady(it)
+                                return@withContext
+                            }
+                        }
 
-                val state =
-                  if (urlInfo.fetchComplete() && urlInfo.url == url) {
-                    UrlPreviewState.Loaded(urlInfo)
-                  } else {
-                    UrlPreviewState.Empty
-                  }
+                        val state =
+                            if (urlInfo.fetchComplete() && urlInfo.url == url) {
+                                UrlPreviewState.Loaded(urlInfo)
+                            } else {
+                                UrlPreviewState.Empty
+                            }
 
-                cache.put(url, state)
-                onReady(state)
-              }
+                        cache.put(url, state)
+                        onReady(state)
+                    }
 
-            override suspend fun onFailed(throwable: Throwable) =
-              withContext(Dispatchers.IO) {
-                cache[url]?.let {
-                  onReady(it)
-                  return@withContext
-                }
+                override suspend fun onFailed(throwable: Throwable) =
+                    withContext(Dispatchers.IO) {
+                        cache[url]?.let {
+                            onReady(it)
+                            return@withContext
+                        }
 
-                val state = UrlPreviewState.Error(throwable.message ?: "Error Loading url preview")
-                cache.put(url, state)
-                onReady(state)
-              }
-          },
+                        val state = UrlPreviewState.Error(throwable.message ?: "Error Loading url preview")
+                        cache.put(url, state)
+                        onReady(state)
+                    }
+            },
         )
-        .fetchUrlPreview()
+            .fetchUrlPreview()
     }
 }

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

@@ -27,296 +27,294 @@ import kotlin.math.pow
 import kotlin.math.withSign
 
 object BlurHashDecoder {
-  // cache Math.cos() calculations to improve performance.
-  // The number of calculations can be huge for many bitmaps: width * height * numCompX * numCompY *
-  // 2 * nBitmaps
-  // the cache is enabled by default, it is recommended to disable it only when just a few images
-  // are displayed
-  private val cacheCosinesX = HashMap<Int, DoubleArray>()
-  private val cacheCosinesY = HashMap<Int, DoubleArray>()
+    // cache Math.cos() calculations to improve performance.
+    // The number of calculations can be huge for many bitmaps: width * height * numCompX * numCompY *
+    // 2 * nBitmaps
+    // the cache is enabled by default, it is recommended to disable it only when just a few images
+    // are displayed
+    private val cacheCosinesX = HashMap<Int, DoubleArray>()
+    private val cacheCosinesY = HashMap<Int, DoubleArray>()
 
-  /**
-   * Clear calculations stored in memory cache. The cache is not big, but will increase when many
-   * image sizes are used, if the app needs memory it is recommended to clear it.
-   */
-  fun clearCache() {
-    cacheCosinesX.clear()
-    cacheCosinesY.clear()
-  }
-
-  /** Returns width/height */
-  fun aspectRatio(blurHash: String?): Float? {
-    if (blurHash == null || blurHash.length < 6) {
-      return null
-    }
-    val numCompEnc = decode83(blurHash, 0, 1)
-    val numCompX = (numCompEnc % 9) + 1
-    val numCompY = (numCompEnc / 9) + 1
-    if (blurHash.length != 4 + 2 * numCompX * numCompY) {
-      return null
+    /**
+     * Clear calculations stored in memory cache. The cache is not big, but will increase when many
+     * image sizes are used, if the app needs memory it is recommended to clear it.
+     */
+    fun clearCache() {
+        cacheCosinesX.clear()
+        cacheCosinesY.clear()
     }
 
-    return numCompX.toFloat() / numCompY.toFloat()
-  }
+    /** Returns width/height */
+    fun aspectRatio(blurHash: String?): Float? {
+        if (blurHash == null || blurHash.length < 6) {
+            return null
+        }
+        val numCompEnc = decode83(blurHash, 0, 1)
+        val numCompX = (numCompEnc % 9) + 1
+        val numCompY = (numCompEnc / 9) + 1
+        if (blurHash.length != 4 + 2 * numCompX * numCompY) {
+            return null
+        }
 
-  /**
-   * Decode a blur hash into a new bitmap.
-   *
-   * @param useCache use in memory cache for the calculated math, reused by images with same size.
-   *   if the cache does not exist yet it will be created and populated with new calculations. By
-   *   default it is true.
-   */
-  fun decode(
-    blurHash: String?,
-    width: Int,
-    height: Int,
-    punch: Float = 1f,
-    useCache: Boolean = true,
-  ): Bitmap? {
-    checkNotInMainThread()
+        return numCompX.toFloat() / numCompY.toFloat()
+    }
 
-    if (blurHash == null || blurHash.length < 6) {
-      return null
+    /**
+     * Decode a blur hash into a new bitmap.
+     *
+     * @param useCache use in memory cache for the calculated math, reused by images with same size.
+     *   if the cache does not exist yet it will be created and populated with new calculations. By
+     *   default it is true.
+     */
+    fun decode(
+        blurHash: String?,
+        width: Int,
+        height: Int,
+        punch: Float = 1f,
+        useCache: Boolean = true,
+    ): Bitmap? {
+        checkNotInMainThread()
+
+        if (blurHash == null || blurHash.length < 6) {
+            return null
+        }
+        val numCompEnc = decode83(blurHash, 0, 1)
+        val numCompX = (numCompEnc % 9) + 1
+        val numCompY = (numCompEnc / 9) + 1
+        if (blurHash.length != 4 + 2 * numCompX * numCompY) {
+            return null
+        }
+        val maxAcEnc = decode83(blurHash, 1, 2)
+        val maxAc = (maxAcEnc + 1) / 166f
+        val colors =
+            Array(numCompX * numCompY) { i ->
+                if (i == 0) {
+                    val colorEnc = decode83(blurHash, 2, 6)
+                    decodeDc(colorEnc)
+                } else {
+                    val from = 4 + i * 2
+                    val colorEnc = decode83(blurHash, from, from + 2)
+                    decodeAc(colorEnc, maxAc * punch)
+                }
+            }
+        return composeBitmap(width, height, numCompX, numCompY, colors, useCache)
     }
-    val numCompEnc = decode83(blurHash, 0, 1)
-    val numCompX = (numCompEnc % 9) + 1
-    val numCompY = (numCompEnc / 9) + 1
-    if (blurHash.length != 4 + 2 * numCompX * numCompY) {
-      return null
+
+    private fun decode83(
+        str: String,
+        from: Int = 0,
+        to: Int = str.length,
+    ): Int {
+        var result = 0
+        for (i in from until to) {
+            val index = charMap[str[i]] ?: -1
+            if (index != -1) {
+                result = result * 83 + index
+            }
+        }
+        return result
     }
-    val maxAcEnc = decode83(blurHash, 1, 2)
-    val maxAc = (maxAcEnc + 1) / 166f
-    val colors =
-      Array(numCompX * numCompY) { i ->
-        if (i == 0) {
-          val colorEnc = decode83(blurHash, 2, 6)
-          decodeDc(colorEnc)
+
+    private fun decodeDc(colorEnc: Int): FloatArray {
+        val r = colorEnc shr 16
+        val g = (colorEnc shr 8) and 255
+        val b = colorEnc and 255
+        return floatArrayOf(srgbToLinear(r), srgbToLinear(g), srgbToLinear(b))
+    }
+
+    private fun srgbToLinear(colorEnc: Int): Float {
+        val v = colorEnc / 255f
+        return if (v <= 0.04045f) {
+            (v / 12.92f)
         } else {
-          val from = 4 + i * 2
-          val colorEnc = decode83(blurHash, from, from + 2)
-          decodeAc(colorEnc, maxAc * punch)
+            ((v + 0.055f) / 1.055f).pow(2.4f)
         }
-      }
-    return composeBitmap(width, height, numCompX, numCompY, colors, useCache)
-  }
-
-  private fun decode83(
-    str: String,
-    from: Int = 0,
-    to: Int = str.length,
-  ): Int {
-    var result = 0
-    for (i in from until to) {
-      val index = charMap[str[i]] ?: -1
-      if (index != -1) {
-        result = result * 83 + index
-      }
     }
-    return result
-  }
 
-  private fun decodeDc(colorEnc: Int): FloatArray {
-    val r = colorEnc shr 16
-    val g = (colorEnc shr 8) and 255
-    val b = colorEnc and 255
-    return floatArrayOf(srgbToLinear(r), srgbToLinear(g), srgbToLinear(b))
-  }
-
-  private fun srgbToLinear(colorEnc: Int): Float {
-    val v = colorEnc / 255f
-    return if (v <= 0.04045f) {
-      (v / 12.92f)
-    } else {
-      ((v + 0.055f) / 1.055f).pow(2.4f)
+    private fun decodeAc(
+        value: Int,
+        maxAc: Float,
+    ): FloatArray {
+        val r = value / (19 * 19)
+        val g = (value / 19) % 19
+        val b = value % 19
+        return floatArrayOf(
+            signedPow2((r - 9) / 9.0f) * maxAc,
+            signedPow2((g - 9) / 9.0f) * maxAc,
+            signedPow2((b - 9) / 9.0f) * maxAc,
+        )
     }
-  }
 
-  private fun decodeAc(
-    value: Int,
-    maxAc: Float,
-  ): FloatArray {
-    val r = value / (19 * 19)
-    val g = (value / 19) % 19
-    val b = value % 19
-    return floatArrayOf(
-      signedPow2((r - 9) / 9.0f) * maxAc,
-      signedPow2((g - 9) / 9.0f) * maxAc,
-      signedPow2((b - 9) / 9.0f) * maxAc,
-    )
-  }
+    private fun signedPow2(value: Float) = value.pow(2f).withSign(value)
 
-  private fun signedPow2(value: Float) = value.pow(2f).withSign(value)
-
-  private fun composeBitmap(
-    width: Int,
-    height: Int,
-    numCompX: Int,
-    numCompY: Int,
-    colors: Array<FloatArray>,
-    useCache: Boolean,
-  ): Bitmap {
-    // use an array for better performance when writing pixel colors
-    val imageArray = IntArray(width * height)
-    val calculateCosX = !useCache || !cacheCosinesX.containsKey(width * numCompX)
-    val cosinesX = getArrayForCosinesX(calculateCosX, width, numCompX)
-    val calculateCosY = !useCache || !cacheCosinesY.containsKey(height * numCompY)
-    val cosinesY = getArrayForCosinesY(calculateCosY, height, numCompY)
-    for (y in 0 until height) {
-      for (x in 0 until width) {
-        var r = 0f
-        var g = 0f
-        var b = 0f
-        for (j in 0 until numCompY) {
-          for (i in 0 until numCompX) {
-            val cosX = cosinesX.getCos(calculateCosX, i, numCompX, x, width)
-            val cosY = cosinesY.getCos(calculateCosY, j, numCompY, y, height)
-            val basis = (cosX * cosY).toFloat()
-            val color = colors[j * numCompX + i]
-            r += color[0] * basis
-            g += color[1] * basis
-            b += color[2] * basis
-          }
+    private fun composeBitmap(
+        width: Int,
+        height: Int,
+        numCompX: Int,
+        numCompY: Int,
+        colors: Array<FloatArray>,
+        useCache: Boolean,
+    ): Bitmap {
+        // use an array for better performance when writing pixel colors
+        val imageArray = IntArray(width * height)
+        val calculateCosX = !useCache || !cacheCosinesX.containsKey(width * numCompX)
+        val cosinesX = getArrayForCosinesX(calculateCosX, width, numCompX)
+        val calculateCosY = !useCache || !cacheCosinesY.containsKey(height * numCompY)
+        val cosinesY = getArrayForCosinesY(calculateCosY, height, numCompY)
+        for (y in 0 until height) {
+            for (x in 0 until width) {
+                var r = 0f
+                var g = 0f
+                var b = 0f
+                for (j in 0 until numCompY) {
+                    for (i in 0 until numCompX) {
+                        val cosX = cosinesX.getCos(calculateCosX, i, numCompX, x, width)
+                        val cosY = cosinesY.getCos(calculateCosY, j, numCompY, y, height)
+                        val basis = (cosX * cosY).toFloat()
+                        val color = colors[j * numCompX + i]
+                        r += color[0] * basis
+                        g += color[1] * basis
+                        b += color[2] * basis
+                    }
+                }
+                imageArray[x + width * y] = Color.rgb(linearToSrgb(r), linearToSrgb(g), linearToSrgb(b))
+            }
         }
-        imageArray[x + width * y] = Color.rgb(linearToSrgb(r), linearToSrgb(g), linearToSrgb(b))
-      }
-    }
-    return Bitmap.createBitmap(imageArray, width, height, Bitmap.Config.ARGB_8888)
-  }
-
-  private fun getArrayForCosinesY(
-    calculate: Boolean,
-    height: Int,
-    numCompY: Int,
-  ) =
-    when {
-      calculate -> {
-        DoubleArray(height * numCompY).also { cacheCosinesY[height * numCompY] = it }
-      }
-      else -> {
-        cacheCosinesY[height * numCompY]!!
-      }
+        return Bitmap.createBitmap(imageArray, width, height, Bitmap.Config.ARGB_8888)
     }
 
-  private fun getArrayForCosinesX(
-    calculate: Boolean,
-    width: Int,
-    numCompX: Int,
-  ) =
-    when {
-      calculate -> {
-        DoubleArray(width * numCompX).also { cacheCosinesX[width * numCompX] = it }
-      }
-      else -> cacheCosinesX[width * numCompX]!!
+    private fun getArrayForCosinesY(
+        calculate: Boolean,
+        height: Int,
+        numCompY: Int,
+    ) = when {
+        calculate -> {
+            DoubleArray(height * numCompY).also { cacheCosinesY[height * numCompY] = it }
+        }
+        else -> {
+            cacheCosinesY[height * numCompY]!!
+        }
     }
 
-  private fun DoubleArray.getCos(
-    calculate: Boolean,
-    x: Int,
-    numComp: Int,
-    y: Int,
-    size: Int,
-  ): Double {
-    if (calculate) {
-      this[x + numComp * y] = cos(Math.PI * y * x / size)
+    private fun getArrayForCosinesX(
+        calculate: Boolean,
+        width: Int,
+        numCompX: Int,
+    ) = when {
+        calculate -> {
+            DoubleArray(width * numCompX).also { cacheCosinesX[width * numCompX] = it }
+        }
+        else -> cacheCosinesX[width * numCompX]!!
     }
-    return this[x + numComp * y]
-  }
 
-  private fun linearToSrgb(value: Float): Int {
-    val v = value.coerceIn(0f, 1f)
-    return if (v <= 0.0031308f) {
-      (v * 12.92f * 255f + 0.5f).toInt()
-    } else {
-      ((1.055f * v.pow(1 / 2.4f) - 0.055f) * 255 + 0.5f).toInt()
+    private fun DoubleArray.getCos(
+        calculate: Boolean,
+        x: Int,
+        numComp: Int,
+        y: Int,
+        size: Int,
+    ): Double {
+        if (calculate) {
+            this[x + numComp * y] = cos(Math.PI * y * x / size)
+        }
+        return this[x + numComp * y]
     }
-  }
 
-  private val charMap =
-    listOf(
-        '0',
-        '1',
-        '2',
-        '3',
-        '4',
-        '5',
-        '6',
-        '7',
-        '8',
-        '9',
-        'A',
-        'B',
-        'C',
-        'D',
-        'E',
-        'F',
-        'G',
-        'H',
-        'I',
-        'J',
-        'K',
-        'L',
-        'M',
-        'N',
-        'O',
-        'P',
-        'Q',
-        'R',
-        'S',
-        'T',
-        'U',
-        'V',
-        'W',
-        'X',
-        'Y',
-        'Z',
-        'a',
-        'b',
-        'c',
-        'd',
-        'e',
-        'f',
-        'g',
-        'h',
-        'i',
-        'j',
-        'k',
-        'l',
-        'm',
-        'n',
-        'o',
-        'p',
-        'q',
-        'r',
-        's',
-        't',
-        'u',
-        'v',
-        'w',
-        'x',
-        'y',
-        'z',
-        '#',
-        '$',
-        '%',
-        '*',
-        '+',
-        ',',
-        '-',
-        '.',
-        ':',
-        ';',
-        '=',
-        '?',
-        '@',
-        '[',
-        ']',
-        '^',
-        '_',
-        '{',
-        '|',
-        '}',
-        '~',
-      )
-      .mapIndexed { i, c -> c to i }
-      .toMap()
+    private fun linearToSrgb(value: Float): Int {
+        val v = value.coerceIn(0f, 1f)
+        return if (v <= 0.0031308f) {
+            (v * 12.92f * 255f + 0.5f).toInt()
+        } else {
+            ((1.055f * v.pow(1 / 2.4f) - 0.055f) * 255 + 0.5f).toInt()
+        }
+    }
+
+    private val charMap =
+        listOf(
+            '0',
+            '1',
+            '2',
+            '3',
+            '4',
+            '5',
+            '6',
+            '7',
+            '8',
+            '9',
+            'A',
+            'B',
+            'C',
+            'D',
+            'E',
+            'F',
+            'G',
+            'H',
+            'I',
+            'J',
+            'K',
+            'L',
+            'M',
+            'N',
+            'O',
+            'P',
+            'Q',
+            'R',
+            'S',
+            'T',
+            'U',
+            'V',
+            'W',
+            'X',
+            'Y',
+            'Z',
+            'a',
+            'b',
+            'c',
+            'd',
+            'e',
+            'f',
+            'g',
+            'h',
+            'i',
+            'j',
+            'k',
+            'l',
+            'm',
+            'n',
+            'o',
+            'p',
+            'q',
+            'r',
+            's',
+            't',
+            'u',
+            'v',
+            'w',
+            'x',
+            'y',
+            'z',
+            '#',
+            '$',
+            '%',
+            '*',
+            '+',
+            ',',
+            '-',
+            '.',
+            ':',
+            ';',
+            '=',
+            '?',
+            '@',
+            '[',
+            ']',
+            '^',
+            '_',
+            '{',
+            '|',
+            '}',
+            '~',
+        )
+            .mapIndexed { i, c -> c to i }
+            .toMap()
 }

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

@@ -37,58 +37,58 @@ import kotlin.math.roundToInt
 
 @Stable
 class BlurHashFetcher(
-  private val options: Options,
-  private val data: Uri,
+    private val options: Options,
+    private val data: Uri,
 ) : Fetcher {
-  override suspend fun fetch(): FetchResult {
-    checkNotInMainThread()
+    override suspend fun fetch(): FetchResult {
+        checkNotInMainThread()
 
-    val encodedHash = data.toString().removePrefix("bluehash:")
-    val hash = URLDecoder.decode(encodedHash, "utf-8")
+        val encodedHash = data.toString().removePrefix("bluehash:")
+        val hash = URLDecoder.decode(encodedHash, "utf-8")
 
-    val aspectRatio = BlurHashDecoder.aspectRatio(hash) ?: 1.0f
+        val aspectRatio = BlurHashDecoder.aspectRatio(hash) ?: 1.0f
 
-    val preferredWidth = 100
+        val preferredWidth = 100
 
-    val bitmap =
-      BlurHashDecoder.decode(
-        hash,
-        preferredWidth,
-        (preferredWidth * (1 / aspectRatio)).roundToInt(),
-      )
+        val bitmap =
+            BlurHashDecoder.decode(
+                hash,
+                preferredWidth,
+                (preferredWidth * (1 / aspectRatio)).roundToInt(),
+            )
 
-    if (bitmap == null) {
-      throw Exception("Unable to convert Bluehash $hash")
+        if (bitmap == null) {
+            throw Exception("Unable to convert Bluehash $hash")
+        }
+
+        return DrawableResult(
+            drawable = bitmap.toDrawable(options.context.resources),
+            isSampled = false,
+            dataSource = DataSource.MEMORY,
+        )
     }
 
-    return DrawableResult(
-      drawable = bitmap.toDrawable(options.context.resources),
-      isSampled = false,
-      dataSource = DataSource.MEMORY,
-    )
-  }
-
-  object Factory : Fetcher.Factory<Uri> {
-    override fun create(
-      data: Uri,
-      options: Options,
-      imageLoader: ImageLoader,
-    ): Fetcher {
-      return BlurHashFetcher(options, data)
+    object Factory : Fetcher.Factory<Uri> {
+        override fun create(
+            data: Uri,
+            options: Options,
+            imageLoader: ImageLoader,
+        ): Fetcher {
+            return BlurHashFetcher(options, data)
+        }
     }
-  }
 }
 
 object BlurHashRequester {
-  fun imageRequest(
-    context: Context,
-    message: String,
-  ): ImageRequest {
-    val encodedMessage = URLEncoder.encode(message, "utf-8")
+    fun imageRequest(
+        context: Context,
+        message: String,
+    ): ImageRequest {
+        val encodedMessage = URLEncoder.encode(message, "utf-8")
 
-    return ImageRequest.Builder(context)
-      .data("bluehash:$encodedMessage")
-      .fetcherFactory(BlurHashFetcher.Factory)
-      .build()
-  }
+        return ImageRequest.Builder(context)
+            .data("bluehash:$encodedMessage")
+            .fetcherFactory(BlurHashFetcher.Factory)
+            .build()
+    }
 }

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

@@ -35,7 +35,6 @@ import com.vitorpamplona.amethyst.ui.components.removeQueryParamsForExtensionCom
 import com.vitorpamplona.amethyst.ui.components.tagIndex
 import com.vitorpamplona.amethyst.ui.components.videoExtensions
 import com.vitorpamplona.quartz.events.ImmutableListOfLists
-import java.util.regex.Pattern
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.ImmutableMap
 import kotlinx.collections.immutable.ImmutableSet
@@ -43,33 +42,34 @@ import kotlinx.collections.immutable.persistentListOf
 import kotlinx.collections.immutable.toImmutableList
 import kotlinx.collections.immutable.toImmutableMap
 import kotlinx.collections.immutable.toImmutableSet
+import java.util.regex.Pattern
 
 @Immutable
 data class RichTextViewerState(
-  val urlSet: ImmutableSet<String>,
-  val imagesForPager: ImmutableMap<String, ZoomableUrlContent>,
-  val imageList: ImmutableList<ZoomableUrlContent>,
-  val customEmoji: ImmutableMap<String, String>,
-  val paragraphs: ImmutableList<ParagraphState>,
+    val urlSet: ImmutableSet<String>,
+    val imagesForPager: ImmutableMap<String, ZoomableUrlContent>,
+    val imageList: ImmutableList<ZoomableUrlContent>,
+    val customEmoji: ImmutableMap<String, String>,
+    val paragraphs: ImmutableList<ParagraphState>,
 )
 
 data class ParagraphState(val words: ImmutableList<Segment>, val isRTL: Boolean)
 
 object CachedRichTextParser {
-  val richTextCache = LruCache<String, RichTextViewerState>(200)
+    val richTextCache = LruCache<String, RichTextViewerState>(200)
 
-  fun parseText(
-    content: String,
-    tags: ImmutableListOfLists<String>,
-  ): RichTextViewerState {
-    return if (richTextCache[content] != null) {
-      richTextCache[content]
-    } else {
-      val newUrls = RichTextParser().parseText(content, tags)
-      richTextCache.put(content, newUrls)
-      newUrls
+    fun parseText(
+        content: String,
+        tags: ImmutableListOfLists<String>,
+    ): RichTextViewerState {
+        return if (richTextCache[content] != null) {
+            richTextCache[content]
+        } else {
+            val newUrls = RichTextParser().parseText(content, tags)
+            richTextCache.put(content, newUrls)
+            newUrls
+        }
     }
-  }
 }
 
 // Group 1 = url, group 4 additional chars
@@ -78,236 +78,236 @@ object CachedRichTextParser {
 
 // Android9 seems to have an issue starting this regex.
 val noProtocolUrlValidator =
-  try {
-    Pattern.compile(
-      "(([\\w\\d-]+\\.)*[a-zA-Z][\\w-]+[\\.\\:]\\w+([\\/\\?\\=\\&\\#\\.]?[\\w-]+[^\\p{IsHan}\\p{IsHiragana}\\p{IsKatakana}])*\\/?)(.*)",
-    )
-  } catch (e: Exception) {
-    Pattern.compile(
-      "(([\\w\\d-]+\\.)*[a-zA-Z][\\w-]+[\\.\\:]\\w+([\\/\\?\\=\\&\\#\\.]?[\\w-]+)*\\/?)(.*)",
-    )
-  }
+    try {
+        Pattern.compile(
+            "(([\\w\\d-]+\\.)*[a-zA-Z][\\w-]+[\\.\\:]\\w+([\\/\\?\\=\\&\\#\\.]?[\\w-]+[^\\p{IsHan}\\p{IsHiragana}\\p{IsKatakana}])*\\/?)(.*)",
+        )
+    } catch (e: Exception) {
+        Pattern.compile(
+            "(([\\w\\d-]+\\.)*[a-zA-Z][\\w-]+[\\.\\:]\\w+([\\/\\?\\=\\&\\#\\.]?[\\w-]+)*\\/?)(.*)",
+        )
+    }
 
 val HTTPRegex =
-  "^((http|https)://)?([A-Za-z0-9-_]+(\\.[A-Za-z0-9-_]+)+)(:[0-9]+)?(/[^?#]*)?(\\?[^#]*)?(#.*)?"
-    .toRegex(RegexOption.IGNORE_CASE)
+    "^((http|https)://)?([A-Za-z0-9-_]+(\\.[A-Za-z0-9-_]+)+)(:[0-9]+)?(/[^?#]*)?(\\?[^#]*)?(#.*)?"
+        .toRegex(RegexOption.IGNORE_CASE)
 
 class RichTextParser() {
-  fun parseMediaUrl(fullUrl: String): ZoomableUrlContent? {
-    val removedParamsFromUrl = removeQueryParamsForExtensionComparison(fullUrl)
-    return if (imageExtensions.any { removedParamsFromUrl.endsWith(it) }) {
-      val frags = Nip44UrlParser().parse(fullUrl)
-      ZoomableUrlImage(
-        url = fullUrl,
-        description = frags["alt"],
-        hash = frags["x"],
-        blurhash = frags["blurhash"],
-        dim = frags["dim"],
-      )
-    } else if (videoExtensions.any { removedParamsFromUrl.endsWith(it) }) {
-      val frags = Nip44UrlParser().parse(fullUrl)
-      ZoomableUrlVideo(
-        url = fullUrl,
-        description = frags["alt"],
-        hash = frags["x"],
-        blurhash = frags["blurhash"],
-        dim = frags["dim"],
-      )
-    } else {
-      null
-    }
-  }
-
-  fun parseText(
-    content: String,
-    tags: ImmutableListOfLists<String>,
-  ): RichTextViewerState {
-    val urls = UrlDetector(content, UrlDetectorOptions.Default).detect()
-
-    val urlSet =
-      urls.mapNotNullTo(LinkedHashSet(urls.size)) {
-        // removes e-mails
-        if (Patterns.EMAIL_ADDRESS.matcher(it.originalUrl).matches()) {
-          null
-        } else if (isNumber(it.originalUrl)) {
-          null
-        } else if (it.originalUrl.contains("。")) {
-          null
+    fun parseMediaUrl(fullUrl: String): ZoomableUrlContent? {
+        val removedParamsFromUrl = removeQueryParamsForExtensionComparison(fullUrl)
+        return if (imageExtensions.any { removedParamsFromUrl.endsWith(it) }) {
+            val frags = Nip44UrlParser().parse(fullUrl)
+            ZoomableUrlImage(
+                url = fullUrl,
+                description = frags["alt"],
+                hash = frags["x"],
+                blurhash = frags["blurhash"],
+                dim = frags["dim"],
+            )
+        } else if (videoExtensions.any { removedParamsFromUrl.endsWith(it) }) {
+            val frags = Nip44UrlParser().parse(fullUrl)
+            ZoomableUrlVideo(
+                url = fullUrl,
+                description = frags["alt"],
+                hash = frags["x"],
+                blurhash = frags["blurhash"],
+                dim = frags["dim"],
+            )
         } else {
-          if (HTTPRegex.matches(it.originalUrl)) {
-            it.originalUrl
-          } else {
             null
-          }
         }
-      }
-
-    val imagesForPager =
-      urlSet.mapNotNull { fullUrl -> parseMediaUrl(fullUrl) }.associateBy { it.url }
-    val imageList = imagesForPager.values.toList()
-
-    val emojiMap =
-      tags.lists.filter { it.size > 2 && it[0] == "emoji" }.associate { ":${it[1]}:" to it[2] }
-
-    val segments = findTextSegments(content, imagesForPager.keys, urlSet, emojiMap, tags)
-
-    return RichTextViewerState(
-      urlSet.toImmutableSet(),
-      imagesForPager.toImmutableMap(),
-      imageList.toImmutableList(),
-      emojiMap.toImmutableMap(),
-      segments,
-    )
-  }
-
-  private fun findTextSegments(
-    content: String,
-    images: Set<String>,
-    urls: Set<String>,
-    emojis: Map<String, String>,
-    tags: ImmutableListOfLists<String>,
-  ): ImmutableList<ParagraphState> {
-    var paragraphSegments = persistentListOf<ParagraphState>()
-
-    content.split('\n').forEach { paragraph ->
-      var segments = persistentListOf<Segment>()
-      var isDirty = false
-
-      val isRTL = isArabic(paragraph)
-
-      val wordList = paragraph.trimEnd().split(' ')
-      wordList.forEach { word ->
-        val wordSegment = wordIdentifier(word, images, urls, emojis, tags)
-        if (wordSegment !is RegularTextSegment) {
-          isDirty = true
-        }
-        segments = segments.add(wordSegment)
-      }
-
-      val newSegments =
-        if (isDirty) {
-          ParagraphState(segments, isRTL)
-        } else {
-          ParagraphState(persistentListOf<Segment>(RegularTextSegment(paragraph)), isRTL)
-        }
-
-      paragraphSegments = paragraphSegments.add(newSegments)
     }
 
-    return paragraphSegments
-  }
+    fun parseText(
+        content: String,
+        tags: ImmutableListOfLists<String>,
+    ): RichTextViewerState {
+        val urls = UrlDetector(content, UrlDetectorOptions.Default).detect()
 
-  fun isNumber(word: String): Boolean {
-    return numberPattern.matcher(word).matches()
-  }
-
-  fun isDate(word: String): Boolean {
-    return shortDatePattern.matcher(word).matches() || longDatePattern.matcher(word).matches()
-  }
-
-  private fun isArabic(text: String): Boolean {
-    return text.any { it in '\u0600'..'\u06FF' || it in '\u0750'..'\u077F' }
-  }
-
-  private fun wordIdentifier(
-    word: String,
-    images: Set<String>,
-    urls: Set<String>,
-    emojis: Map<String, String>,
-    tags: ImmutableListOfLists<String>,
-  ): Segment {
-    val emailMatcher = Patterns.EMAIL_ADDRESS.matcher(word)
-    val phoneMatcher = Patterns.PHONE.matcher(word)
-    val schemelessMatcher = noProtocolUrlValidator.matcher(word)
-
-    return if (word.isEmpty()) {
-      RegularTextSegment(word)
-    } else if (images.contains(word)) {
-      ImageSegment(word)
-    } else if (urls.contains(word)) {
-      LinkSegment(word)
-    } else if (emojis.any { word.contains(it.key) }) {
-      EmojiSegment(word)
-    } else if (word.startsWith("lnbc", true)) {
-      InvoiceSegment(word)
-    } else if (word.startsWith("lnurl", true)) {
-      WithdrawSegment(word)
-    } else if (word.startsWith("cashuA", true)) {
-      CashuSegment(word)
-    } else if (emailMatcher.matches()) {
-      EmailSegment(word)
-    } else if (word.length in 7..14 && !isDate(word) && phoneMatcher.matches()) {
-      PhoneSegment(word)
-    } else if (startsWithNIP19Scheme(word)) {
-      BechSegment(word)
-    } else if (word.startsWith("#")) {
-      parseHash(word, tags)
-    } else if (word.contains(".") && schemelessMatcher.find()) {
-      val url = schemelessMatcher.group(1) // url
-      val additionalChars = schemelessMatcher.group(4) // additional chars
-      val pattern =
-        """^([A-Za-z0-9-_]+(\.[A-Za-z0-9-_]+)+)(:[0-9]+)?(/[^?#]*)?(\?[^#]*)?(#.*)?"""
-          .toRegex(RegexOption.IGNORE_CASE)
-      if (pattern.find(word) != null) {
-        SchemelessUrlSegment(word, url, additionalChars)
-      } else {
-        RegularTextSegment(word)
-      }
-    } else {
-      RegularTextSegment(word)
-    }
-  }
-
-  private fun parseHash(
-    word: String,
-    tags: ImmutableListOfLists<String>,
-  ): Segment {
-    // First #[n]
-
-    val matcher = tagIndex.matcher(word)
-    try {
-      if (matcher.find()) {
-        val index = matcher.group(1)?.toInt()
-        val suffix = matcher.group(2)
-
-        if (index != null && index >= 0 && index < tags.lists.size) {
-          val tag = tags.lists[index]
-
-          if (tag.size > 1) {
-            if (tag[0] == "p") {
-              return HashIndexUserSegment(word, tag[1], suffix)
-            } else if (tag[0] == "e" || tag[0] == "a") {
-              return HashIndexEventSegment(word, tag[1], suffix)
+        val urlSet =
+            urls.mapNotNullTo(LinkedHashSet(urls.size)) {
+                // removes e-mails
+                if (Patterns.EMAIL_ADDRESS.matcher(it.originalUrl).matches()) {
+                    null
+                } else if (isNumber(it.originalUrl)) {
+                    null
+                } else if (it.originalUrl.contains("。")) {
+                    null
+                } else {
+                    if (HTTPRegex.matches(it.originalUrl)) {
+                        it.originalUrl
+                    } else {
+                        null
+                    }
+                }
             }
-          }
-        }
-      }
-    } catch (e: Exception) {
-      Log.w("Tag Parser", "Couldn't link tag $word", e)
+
+        val imagesForPager =
+            urlSet.mapNotNull { fullUrl -> parseMediaUrl(fullUrl) }.associateBy { it.url }
+        val imageList = imagesForPager.values.toList()
+
+        val emojiMap =
+            tags.lists.filter { it.size > 2 && it[0] == "emoji" }.associate { ":${it[1]}:" to it[2] }
+
+        val segments = findTextSegments(content, imagesForPager.keys, urlSet, emojiMap, tags)
+
+        return RichTextViewerState(
+            urlSet.toImmutableSet(),
+            imagesForPager.toImmutableMap(),
+            imageList.toImmutableList(),
+            emojiMap.toImmutableMap(),
+            segments,
+        )
     }
 
-    // Second #Amethyst
-    val hashtagMatcher = hashTagsPattern.matcher(word)
+    private fun findTextSegments(
+        content: String,
+        images: Set<String>,
+        urls: Set<String>,
+        emojis: Map<String, String>,
+        tags: ImmutableListOfLists<String>,
+    ): ImmutableList<ParagraphState> {
+        var paragraphSegments = persistentListOf<ParagraphState>()
 
-    try {
-      if (hashtagMatcher.find()) {
-        val hashtag = hashtagMatcher.group(1)
-        if (hashtag != null) {
-          return HashTagSegment(word, hashtag, hashtagMatcher.group(2))
+        content.split('\n').forEach { paragraph ->
+            var segments = persistentListOf<Segment>()
+            var isDirty = false
+
+            val isRTL = isArabic(paragraph)
+
+            val wordList = paragraph.trimEnd().split(' ')
+            wordList.forEach { word ->
+                val wordSegment = wordIdentifier(word, images, urls, emojis, tags)
+                if (wordSegment !is RegularTextSegment) {
+                    isDirty = true
+                }
+                segments = segments.add(wordSegment)
+            }
+
+            val newSegments =
+                if (isDirty) {
+                    ParagraphState(segments, isRTL)
+                } else {
+                    ParagraphState(persistentListOf<Segment>(RegularTextSegment(paragraph)), isRTL)
+                }
+
+            paragraphSegments = paragraphSegments.add(newSegments)
         }
-      }
-    } catch (e: Exception) {
-      Log.e("Hashtag Parser", "Couldn't link hashtag $word", e)
+
+        return paragraphSegments
     }
 
-    return RegularTextSegment(word)
-  }
+    fun isNumber(word: String): Boolean {
+        return numberPattern.matcher(word).matches()
+    }
 
-  companion object {
-    val longDatePattern: Pattern = Pattern.compile("^\\d{4}-\\d{2}-\\d{2}$")
-    val shortDatePattern: Pattern = Pattern.compile("^\\d{2}-\\d{2}-\\d{2}$")
-    val numberPattern: Pattern = Pattern.compile("^(-?[\\d.]+)([a-zA-Z%]*)$")
-  }
+    fun isDate(word: String): Boolean {
+        return shortDatePattern.matcher(word).matches() || longDatePattern.matcher(word).matches()
+    }
+
+    private fun isArabic(text: String): Boolean {
+        return text.any { it in '\u0600'..'\u06FF' || it in '\u0750'..'\u077F' }
+    }
+
+    private fun wordIdentifier(
+        word: String,
+        images: Set<String>,
+        urls: Set<String>,
+        emojis: Map<String, String>,
+        tags: ImmutableListOfLists<String>,
+    ): Segment {
+        val emailMatcher = Patterns.EMAIL_ADDRESS.matcher(word)
+        val phoneMatcher = Patterns.PHONE.matcher(word)
+        val schemelessMatcher = noProtocolUrlValidator.matcher(word)
+
+        return if (word.isEmpty()) {
+            RegularTextSegment(word)
+        } else if (images.contains(word)) {
+            ImageSegment(word)
+        } else if (urls.contains(word)) {
+            LinkSegment(word)
+        } else if (emojis.any { word.contains(it.key) }) {
+            EmojiSegment(word)
+        } else if (word.startsWith("lnbc", true)) {
+            InvoiceSegment(word)
+        } else if (word.startsWith("lnurl", true)) {
+            WithdrawSegment(word)
+        } else if (word.startsWith("cashuA", true)) {
+            CashuSegment(word)
+        } else if (emailMatcher.matches()) {
+            EmailSegment(word)
+        } else if (word.length in 7..14 && !isDate(word) && phoneMatcher.matches()) {
+            PhoneSegment(word)
+        } else if (startsWithNIP19Scheme(word)) {
+            BechSegment(word)
+        } else if (word.startsWith("#")) {
+            parseHash(word, tags)
+        } else if (word.contains(".") && schemelessMatcher.find()) {
+            val url = schemelessMatcher.group(1) // url
+            val additionalChars = schemelessMatcher.group(4) // additional chars
+            val pattern =
+                """^([A-Za-z0-9-_]+(\.[A-Za-z0-9-_]+)+)(:[0-9]+)?(/[^?#]*)?(\?[^#]*)?(#.*)?"""
+                    .toRegex(RegexOption.IGNORE_CASE)
+            if (pattern.find(word) != null) {
+                SchemelessUrlSegment(word, url, additionalChars)
+            } else {
+                RegularTextSegment(word)
+            }
+        } else {
+            RegularTextSegment(word)
+        }
+    }
+
+    private fun parseHash(
+        word: String,
+        tags: ImmutableListOfLists<String>,
+    ): Segment {
+        // First #[n]
+
+        val matcher = tagIndex.matcher(word)
+        try {
+            if (matcher.find()) {
+                val index = matcher.group(1)?.toInt()
+                val suffix = matcher.group(2)
+
+                if (index != null && index >= 0 && index < tags.lists.size) {
+                    val tag = tags.lists[index]
+
+                    if (tag.size > 1) {
+                        if (tag[0] == "p") {
+                            return HashIndexUserSegment(word, tag[1], suffix)
+                        } else if (tag[0] == "e" || tag[0] == "a") {
+                            return HashIndexEventSegment(word, tag[1], suffix)
+                        }
+                    }
+                }
+            }
+        } catch (e: Exception) {
+            Log.w("Tag Parser", "Couldn't link tag $word", e)
+        }
+
+        // Second #Amethyst
+        val hashtagMatcher = hashTagsPattern.matcher(word)
+
+        try {
+            if (hashtagMatcher.find()) {
+                val hashtag = hashtagMatcher.group(1)
+                if (hashtag != null) {
+                    return HashTagSegment(word, hashtag, hashtagMatcher.group(2))
+                }
+            }
+        } catch (e: Exception) {
+            Log.e("Hashtag Parser", "Couldn't link hashtag $word", e)
+        }
+
+        return RegularTextSegment(word)
+    }
+
+    companion object {
+        val longDatePattern: Pattern = Pattern.compile("^\\d{4}-\\d{2}-\\d{2}$")
+        val shortDatePattern: Pattern = Pattern.compile("^\\d{2}-\\d{2}-\\d{2}$")
+        val numberPattern: Pattern = Pattern.compile("^(-?[\\d.]+)([a-zA-Z%]*)$")
+    }
 }
 
 @Immutable open class Segment(val segmentText: String)
@@ -332,27 +332,27 @@ class RichTextParser() {
 
 @Immutable
 open class HashIndexSegment(segment: String, val hex: String, val extras: String?) :
-  Segment(segment)
+    Segment(segment)
 
 @Immutable
 class HashIndexUserSegment(segment: String, hex: String, extras: String?) :
-  HashIndexSegment(segment, hex, extras)
+    HashIndexSegment(segment, hex, extras)
 
 @Immutable
 class HashIndexEventSegment(segment: String, hex: String, extras: String?) :
-  HashIndexSegment(segment, hex, extras)
+    HashIndexSegment(segment, hex, extras)
 
 @Immutable
 class HashTagSegment(segment: String, val hashtag: String, val extras: String?) : Segment(segment)
 
 @Immutable
 class SchemelessUrlSegment(segment: String, val url: String, val extras: String?) :
-  Segment(segment)
+    Segment(segment)
 
 @Immutable class RegularTextSegment(segment: String) : Segment(segment)
 
 fun startsWithNIP19Scheme(word: String): Boolean {
-  val cleaned = word.lowercase().removePrefix("@").removePrefix("nostr:").removePrefix("@")
+    val cleaned = word.lowercase().removePrefix("@").removePrefix("nostr:").removePrefix("@")
 
-  return listOf("npub1", "naddr1", "note1", "nprofile1", "nevent1").any { cleaned.startsWith(it) }
+    return listOf("npub1", "naddr1", "note1", "nprofile1", "nevent1").any { cleaned.startsWith(it) }
 }

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

@@ -28,193 +28,193 @@ import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.service.lnurl.LightningAddressResolver
 import com.vitorpamplona.amethyst.ui.components.GenericLoadable
 import com.vitorpamplona.quartz.events.Event
-import java.util.Base64
 import okhttp3.MediaType.Companion.toMediaType
 import okhttp3.Request
 import okhttp3.RequestBody.Companion.toRequestBody
+import java.util.Base64
 
 @Immutable
 data class CashuToken(
-  val token: String,
-  val mint: String,
-  val totalAmount: Long,
-  val proofs: JsonNode,
+    val token: String,
+    val mint: String,
+    val totalAmount: Long,
+    val proofs: JsonNode,
 )
 
 class CashuProcessor {
-  fun parse(cashuToken: String): GenericLoadable<CashuToken> {
-    checkNotInMainThread()
+    fun parse(cashuToken: String): GenericLoadable<CashuToken> {
+        checkNotInMainThread()
 
-    try {
-      val base64token = cashuToken.replace("cashuA", "")
-      val cashu = jacksonObjectMapper().readTree(String(Base64.getDecoder().decode(base64token)))
-      val token = cashu.get("token").get(0)
-      val proofs = token.get("proofs")
-      val mint = token.get("mint").asText()
+        try {
+            val base64token = cashuToken.replace("cashuA", "")
+            val cashu = jacksonObjectMapper().readTree(String(Base64.getDecoder().decode(base64token)))
+            val token = cashu.get("token").get(0)
+            val proofs = token.get("proofs")
+            val mint = token.get("mint").asText()
 
-      var totalAmount = 0L
-      for (proof in proofs) {
-        totalAmount += proof.get("amount").asLong()
-      }
+            var totalAmount = 0L
+            for (proof in proofs) {
+                totalAmount += proof.get("amount").asLong()
+            }
 
-      return GenericLoadable.Loaded(CashuToken(cashuToken, mint, totalAmount, proofs))
-    } catch (e: Exception) {
-      return GenericLoadable.Error<CashuToken>("Could not parse this cashu token")
+            return GenericLoadable.Loaded(CashuToken(cashuToken, mint, totalAmount, proofs))
+        } catch (e: Exception) {
+            return GenericLoadable.Error<CashuToken>("Could not parse this cashu token")
+        }
     }
-  }
 
-  suspend fun melt(
-    token: CashuToken,
-    lud16: String,
-    onSuccess: (String, String) -> Unit,
-    onError: (String, String) -> Unit,
-    context: Context,
-  ) {
-    checkNotInMainThread()
+    suspend fun melt(
+        token: CashuToken,
+        lud16: String,
+        onSuccess: (String, String) -> Unit,
+        onError: (String, String) -> Unit,
+        context: Context,
+    ) {
+        checkNotInMainThread()
 
-    runCatching {
-      LightningAddressResolver()
-        .lnAddressInvoice(
-          lnaddress = lud16,
-          // Make invoice and leave room for fees
-          milliSats = token.totalAmount * 1000,
-          message = "Calculate Fees for Cashu",
-          onSuccess = { baseInvoice ->
-            feeCalculator(
-              token.mint,
-              baseInvoice,
-              onSuccess = { fees ->
-                LightningAddressResolver()
-                  .lnAddressInvoice(
+        runCatching {
+            LightningAddressResolver()
+                .lnAddressInvoice(
                     lnaddress = lud16,
                     // Make invoice and leave room for fees
-                    milliSats = (token.totalAmount - fees) * 1000,
-                    message = "Redeem Cashu",
-                    onSuccess = { invoice ->
-                      meltInvoice(token, invoice, fees, onSuccess, onError, context)
+                    milliSats = token.totalAmount * 1000,
+                    message = "Calculate Fees for Cashu",
+                    onSuccess = { baseInvoice ->
+                        feeCalculator(
+                            token.mint,
+                            baseInvoice,
+                            onSuccess = { fees ->
+                                LightningAddressResolver()
+                                    .lnAddressInvoice(
+                                        lnaddress = lud16,
+                                        // Make invoice and leave room for fees
+                                        milliSats = (token.totalAmount - fees) * 1000,
+                                        message = "Redeem Cashu",
+                                        onSuccess = { invoice ->
+                                            meltInvoice(token, invoice, fees, onSuccess, onError, context)
+                                        },
+                                        onProgress = {},
+                                        onError = onError,
+                                        context = context,
+                                    )
+                            },
+                            onError = onError,
+                            context,
+                        )
                     },
                     onProgress = {},
                     onError = onError,
                     context = context,
-                  )
-              },
-              onError = onError,
-              context,
+                )
+        }
+    }
+
+    fun feeCalculator(
+        mintAddress: String,
+        invoice: String,
+        onSuccess: (Int) -> Unit,
+        onError: (String, String) -> Unit,
+        context: Context,
+    ) {
+        checkNotInMainThread()
+
+        try {
+            val client = HttpClient.getHttpClient()
+            val url = "$mintAddress/checkfees" // Melt cashu tokens at Mint
+
+            val factory = Event.mapper.nodeFactory
+
+            val jsonObject = factory.objectNode()
+            jsonObject.put("pr", invoice)
+
+            val mediaType = "application/json; charset=utf-8".toMediaType()
+            val requestBody = jsonObject.toString().toRequestBody(mediaType)
+            val request = Request.Builder().url(url).post(requestBody).build()
+
+            client.newCall(request).execute().use {
+                val body = it.body.string()
+                val tree = jacksonObjectMapper().readTree(body)
+
+                val feeCost = tree?.get("fee")?.asInt()
+
+                if (feeCost != null) {
+                    onSuccess(
+                        feeCost,
+                    )
+                } else {
+                    val msg = tree?.get("detail")?.asText()?.split('.')?.getOrNull(0)?.ifBlank { null }
+                    onError(
+                        context.getString(R.string.cashu_failed_redemption),
+                        if (msg != null) {
+                            context.getString(R.string.cashu_failed_redemption_explainer_error_msg, msg)
+                        } else {
+                            context.getString(R.string.cashu_failed_redemption_explainer_error_msg)
+                        },
+                    )
+                }
+            }
+        } catch (e: Exception) {
+            onError(
+                context.getString(R.string.cashu_successful_redemption),
+                context.getString(R.string.cashu_failed_redemption_explainer_error_msg, e.message),
             )
-          },
-          onProgress = {},
-          onError = onError,
-          context = context,
-        )
-    }
-  }
-
-  fun feeCalculator(
-    mintAddress: String,
-    invoice: String,
-    onSuccess: (Int) -> Unit,
-    onError: (String, String) -> Unit,
-    context: Context,
-  ) {
-    checkNotInMainThread()
-
-    try {
-      val client = HttpClient.getHttpClient()
-      val url = "$mintAddress/checkfees" // Melt cashu tokens at Mint
-
-      val factory = Event.mapper.nodeFactory
-
-      val jsonObject = factory.objectNode()
-      jsonObject.put("pr", invoice)
-
-      val mediaType = "application/json; charset=utf-8".toMediaType()
-      val requestBody = jsonObject.toString().toRequestBody(mediaType)
-      val request = Request.Builder().url(url).post(requestBody).build()
-
-      client.newCall(request).execute().use {
-        val body = it.body.string()
-        val tree = jacksonObjectMapper().readTree(body)
-
-        val feeCost = tree?.get("fee")?.asInt()
-
-        if (feeCost != null) {
-          onSuccess(
-            feeCost,
-          )
-        } else {
-          val msg = tree?.get("detail")?.asText()?.split('.')?.getOrNull(0)?.ifBlank { null }
-          onError(
-            context.getString(R.string.cashu_failed_redemption),
-            if (msg != null) {
-              context.getString(R.string.cashu_failed_redemption_explainer_error_msg, msg)
-            } else {
-              context.getString(R.string.cashu_failed_redemption_explainer_error_msg)
-            },
-          )
         }
-      }
-    } catch (e: Exception) {
-      onError(
-        context.getString(R.string.cashu_successful_redemption),
-        context.getString(R.string.cashu_failed_redemption_explainer_error_msg, e.message),
-      )
     }
-  }
 
-  private fun meltInvoice(
-    token: CashuToken,
-    invoice: String,
-    fees: Int,
-    onSuccess: (String, String) -> Unit,
-    onError: (String, String) -> Unit,
-    context: Context,
-  ) {
-    try {
-      val client = HttpClient.getHttpClient()
-      val url = token.mint + "/melt" // Melt cashu tokens at Mint
+    private fun meltInvoice(
+        token: CashuToken,
+        invoice: String,
+        fees: Int,
+        onSuccess: (String, String) -> Unit,
+        onError: (String, String) -> Unit,
+        context: Context,
+    ) {
+        try {
+            val client = HttpClient.getHttpClient()
+            val url = token.mint + "/melt" // Melt cashu tokens at Mint
 
-      val factory = Event.mapper.nodeFactory
+            val factory = Event.mapper.nodeFactory
 
-      val jsonObject = factory.objectNode()
-      jsonObject.put("proofs", token.proofs)
-      jsonObject.put("pr", invoice)
+            val jsonObject = factory.objectNode()
+            jsonObject.put("proofs", token.proofs)
+            jsonObject.put("pr", invoice)
 
-      val mediaType = "application/json; charset=utf-8".toMediaType()
-      val requestBody = jsonObject.toString().toRequestBody(mediaType)
-      val request = Request.Builder().url(url).post(requestBody).build()
+            val mediaType = "application/json; charset=utf-8".toMediaType()
+            val requestBody = jsonObject.toString().toRequestBody(mediaType)
+            val request = Request.Builder().url(url).post(requestBody).build()
 
-      client.newCall(request).execute().use {
-        val body = it.body.string()
-        val tree = jacksonObjectMapper().readTree(body)
+            client.newCall(request).execute().use {
+                val body = it.body.string()
+                val tree = jacksonObjectMapper().readTree(body)
 
-        val successful = tree?.get("paid")?.asText() == "true"
+                val successful = tree?.get("paid")?.asText() == "true"
 
-        if (successful) {
-          onSuccess(
-            context.getString(R.string.cashu_successful_redemption),
-            context.getString(
-              R.string.cashu_successful_redemption_explainer,
-              token.totalAmount.toString(),
-              fees.toString(),
-            ),
-          )
-        } else {
-          val msg = tree?.get("detail")?.asText()?.split('.')?.getOrNull(0)?.ifBlank { null }
-          onError(
-            context.getString(R.string.cashu_failed_redemption),
-            if (msg != null) {
-              context.getString(R.string.cashu_failed_redemption_explainer_error_msg, msg)
-            } else {
-              context.getString(R.string.cashu_failed_redemption_explainer_error_msg)
-            },
-          )
+                if (successful) {
+                    onSuccess(
+                        context.getString(R.string.cashu_successful_redemption),
+                        context.getString(
+                            R.string.cashu_successful_redemption_explainer,
+                            token.totalAmount.toString(),
+                            fees.toString(),
+                        ),
+                    )
+                } else {
+                    val msg = tree?.get("detail")?.asText()?.split('.')?.getOrNull(0)?.ifBlank { null }
+                    onError(
+                        context.getString(R.string.cashu_failed_redemption),
+                        if (msg != null) {
+                            context.getString(R.string.cashu_failed_redemption_explainer_error_msg, msg)
+                        } else {
+                            context.getString(R.string.cashu_failed_redemption_explainer_error_msg)
+                        },
+                    )
+                }
+            }
+        } catch (e: Exception) {
+            onError(
+                context.getString(R.string.cashu_successful_redemption),
+                context.getString(R.string.cashu_failed_redemption_explainer_error_msg, e.message),
+            )
         }
-      }
-    } catch (e: Exception) {
-      onError(
-        context.getString(R.string.cashu_successful_redemption),
-        context.getString(R.string.cashu_failed_redemption_explainer_error_msg, e.message),
-      )
     }
-  }
 }

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

@@ -23,106 +23,109 @@ package com.vitorpamplona.amethyst.service
 import com.vitorpamplona.quartz.events.ImmutableListOfLists
 
 fun String.isUTF16Char(pos: Int): Boolean {
-  return Character.charCount(this.codePointAt(pos)) == 2
+    return Character.charCount(this.codePointAt(pos)) == 2
 }
 
 fun String.firstFullCharOld(): String {
-  return when (this.length) {
-    0,
-    1, -> return this
-    2,
-    3, -> return if (isUTF16Char(0)) this.take(2) else this.take(1)
-    else -> {
-      val first = isUTF16Char(0)
-      val second = isUTF16Char(2)
-      if (first && second) {
-        this.take(4)
-      } else if (first) {
-        this.take(2)
-      } else {
-        this.take(1)
-      }
+    return when (this.length) {
+        0,
+        1,
+        -> return this
+        2,
+        3,
+        -> return if (isUTF16Char(0)) this.take(2) else this.take(1)
+        else -> {
+            val first = isUTF16Char(0)
+            val second = isUTF16Char(2)
+            if (first && second) {
+                this.take(4)
+            } else if (first) {
+                this.take(2)
+            } else {
+                this.take(1)
+            }
+        }
     }
-  }
 }
 
 fun String.firstFullChar(): String {
-  var isInJoin = false
-  var hasHadSecondChance = false
-  var start = 0
-  var previousCharLength = 0
-  var next: Int
-  var codePoint: Int
+    var isInJoin = false
+    var hasHadSecondChance = false
+    var start = 0
+    var previousCharLength = 0
+    var next: Int
+    var codePoint: Int
 
-  var i = 0
+    var i = 0
 
-  while (i < this.length) {
-    codePoint = codePointAt(i)
+    while (i < this.length) {
+        codePoint = codePointAt(i)
 
-    // Skips if it starts with the join char 0x200D
-    if (codePoint == 0x200D && previousCharLength == 0) {
-      next = offsetByCodePoints(i, 1)
-      start = next
-    } else {
-      // If join, searches for the next char
-      if (codePoint == 0xFE0F) {} else if (codePoint == 0x200D) {
-        isInJoin = true
-      } else {
-        // stops when two chars are not joined together
-        if (previousCharLength > 0 && !isInJoin) {
-          if (Character.charCount(codePoint) == 1 || hasHadSecondChance) {
-            break
-          } else {
-            hasHadSecondChance = true
-          }
+        // Skips if it starts with the join char 0x200D
+        if (codePoint == 0x200D && previousCharLength == 0) {
+            next = offsetByCodePoints(i, 1)
+            start = next
         } else {
-          hasHadSecondChance = false
+            // If join, searches for the next char
+            if (codePoint == 0xFE0F) {
+            } else if (codePoint == 0x200D) {
+                isInJoin = true
+            } else {
+                // stops when two chars are not joined together
+                if (previousCharLength > 0 && !isInJoin) {
+                    if (Character.charCount(codePoint) == 1 || hasHadSecondChance) {
+                        break
+                    } else {
+                        hasHadSecondChance = true
+                    }
+                } else {
+                    hasHadSecondChance = false
+                }
+
+                isInJoin = false
+            }
+
+            // next char to evaluate
+            next = offsetByCodePoints(i, 1)
+            previousCharLength += (next - i)
         }
 
-        isInJoin = false
-      }
-
-      // next char to evaluate
-      next = offsetByCodePoints(i, 1)
-      previousCharLength += (next - i)
+        i = next
     }
 
-    i = next
-  }
+    // if ends in join, then seachers backwards until a char is found.
+    if (isInJoin) {
+        i = previousCharLength - 1
+        while (i > 0) {
+            if (this[i].code == 0x200D) {
+                previousCharLength -= 1
+            } else {
+                break
+            }
 
-  // if ends in join, then seachers backwards until a char is found.
-  if (isInJoin) {
-    i = previousCharLength - 1
-    while (i > 0) {
-      if (this[i].code == 0x200D) {
-        previousCharLength -= 1
-      } else {
-        break
-      }
-
-      i -= 1
+            i -= 1
+        }
     }
-  }
 
-  return substring(start, start + previousCharLength)
+    return substring(start, start + previousCharLength)
 }
 
 fun String.firstFullCharOrEmoji(tags: ImmutableListOfLists<String>): String {
-  if (length <= 2) {
-    return firstFullChar()
-  }
-
-  if (this[0] == ':') {
-    // makes sure an emoji exists
-    val emojiParts = this.split(":", limit = 3)
-    if (emojiParts.size >= 2) {
-      val emojiName = emojiParts[1]
-      val emojiUrl = tags.lists.firstOrNull { it.size > 1 && it[1] == emojiName }?.getOrNull(2)
-      if (emojiUrl != null) {
-        return ":$emojiName:$emojiUrl"
-      }
+    if (length <= 2) {
+        return firstFullChar()
     }
-  }
 
-  return firstFullChar()
+    if (this[0] == ':') {
+        // makes sure an emoji exists
+        val emojiParts = this.split(":", limit = 3)
+        if (emojiParts.size >= 2) {
+            val emojiName = emojiParts[1]
+            val emojiUrl = tags.lists.firstOrNull { it.size > 1 && it[1] == emojiName }?.getOrNull(2)
+            if (emojiUrl != null) {
+                return ":$emojiName:$emojiUrl"
+            }
+        }
+    }
+
+    return firstFullChar()
 }

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

@@ -36,229 +36,230 @@ import java.io.IOException
 import kotlin.math.roundToInt
 
 class FileHeader(
-  val mimeType: String?,
-  val hash: String,
-  val size: Int,
-  val dim: String?,
-  val blurHash: String?,
+    val mimeType: String?,
+    val hash: String,
+    val size: Int,
+    val dim: String?,
+    val blurHash: String?,
 ) {
-  companion object {
-    suspend fun prepare(
-      fileUrl: String,
-      mimeType: String?,
-      dimPrecomputed: String?,
-      onReady: (FileHeader) -> Unit,
-      onError: (String?) -> Unit,
-    ) {
-      try {
-        val imageData: ByteArray? = ImageDownloader().waitAndGetImage(fileUrl)
+    companion object {
+        suspend fun prepare(
+            fileUrl: String,
+            mimeType: String?,
+            dimPrecomputed: String?,
+            onReady: (FileHeader) -> Unit,
+            onError: (String?) -> Unit,
+        ) {
+            try {
+                val imageData: ByteArray? = ImageDownloader().waitAndGetImage(fileUrl)
 
-        if (imageData != null) {
-          prepare(imageData, mimeType, dimPrecomputed, onReady, onError)
-        } else {
-          onError(null)
-        }
-      } catch (e: Exception) {
-        Log.e("ImageDownload", "Couldn't download image from server: ${e.message}")
-        onError(e.message)
-      }
-    }
-
-    fun prepare(
-      data: ByteArray,
-      mimeType: String?,
-      dimPrecomputed: String?,
-      onReady: (FileHeader) -> Unit,
-      onError: (String?) -> Unit,
-    ) {
-      try {
-        val hash = CryptoUtils.sha256(data).toHexKey()
-        val size = data.size
-
-        val (blurHash, dim) =
-          if (mimeType?.startsWith("image/") == true) {
-            val opt = BitmapFactory.Options()
-            opt.inPreferredConfig = Bitmap.Config.ARGB_8888
-            val mBitmap = BitmapFactory.decodeByteArray(data, 0, data.size, opt)
-
-            val intArray = IntArray(mBitmap.width * mBitmap.height)
-            mBitmap.getPixels(
-              intArray,
-              0,
-              mBitmap.width,
-              0,
-              0,
-              mBitmap.width,
-              mBitmap.height,
-            )
-
-            val dim = "${mBitmap.width}x${mBitmap.height}"
-
-            val aspectRatio = (mBitmap.width).toFloat() / (mBitmap.height).toFloat()
-
-            if (aspectRatio > 1) {
-              Pair(
-                BlurHash.encode(
-                  intArray,
-                  mBitmap.width,
-                  mBitmap.height,
-                  9,
-                  (9 * (1 / aspectRatio)).roundToInt(),
-                ),
-                dim,
-              )
-            } else if (aspectRatio < 1) {
-              Pair(
-                BlurHash.encode(
-                  intArray,
-                  mBitmap.width,
-                  mBitmap.height,
-                  (9 * aspectRatio).roundToInt(),
-                  9,
-                ),
-                dim,
-              )
-            } else {
-              Pair(BlurHash.encode(intArray, mBitmap.width, mBitmap.height, 4, 4), dim)
-            }
-          } else if (mimeType?.startsWith("video/") == true) {
-            val mediaMetadataRetriever = MediaMetadataRetriever()
-            mediaMetadataRetriever.setDataSource(ByteArrayMediaDataSource(data))
-
-            val newDim = mediaMetadataRetriever.prepareDimFromVideo() ?: dimPrecomputed
-
-            val blurhash =
-              mediaMetadataRetriever.getThumbnail()?.let { thumbnail ->
-                val aspectRatio = (thumbnail.width).toFloat() / (thumbnail.height).toFloat()
-
-                val intArray = IntArray(thumbnail.width * thumbnail.height)
-                thumbnail.getPixels(
-                  intArray,
-                  0,
-                  thumbnail.width,
-                  0,
-                  0,
-                  thumbnail.width,
-                  thumbnail.height,
-                )
-
-                if (aspectRatio > 1) {
-                  BlurHash.encode(
-                    intArray,
-                    thumbnail.width,
-                    thumbnail.height,
-                    9,
-                    (9 * (1 / aspectRatio)).roundToInt(),
-                  )
-                } else if (aspectRatio < 1) {
-                  BlurHash.encode(
-                    intArray,
-                    thumbnail.width,
-                    thumbnail.height,
-                    (9 * aspectRatio).roundToInt(),
-                    9,
-                  )
+                if (imageData != null) {
+                    prepare(imageData, mimeType, dimPrecomputed, onReady, onError)
                 } else {
-                  BlurHash.encode(intArray, thumbnail.width, thumbnail.height, 4, 4)
+                    onError(null)
                 }
-              }
-
-            if (newDim != "0x0") {
-              Pair(blurhash, newDim)
-            } else {
-              Pair(blurhash, null)
+            } catch (e: Exception) {
+                Log.e("ImageDownload", "Couldn't download image from server: ${e.message}")
+                onError(e.message)
             }
-          } else {
-            Pair(null, null)
-          }
+        }
 
-        onReady(FileHeader(mimeType, hash, size, dim, blurHash))
-      } catch (e: Exception) {
-        Log.e("ImageDownload", "Couldn't convert image in to File Header: ${e.message}")
-        onError(e.message)
-      }
+        fun prepare(
+            data: ByteArray,
+            mimeType: String?,
+            dimPrecomputed: String?,
+            onReady: (FileHeader) -> Unit,
+            onError: (String?) -> Unit,
+        ) {
+            try {
+                val hash = CryptoUtils.sha256(data).toHexKey()
+                val size = data.size
+
+                val (blurHash, dim) =
+                    if (mimeType?.startsWith("image/") == true) {
+                        val opt = BitmapFactory.Options()
+                        opt.inPreferredConfig = Bitmap.Config.ARGB_8888
+                        val mBitmap = BitmapFactory.decodeByteArray(data, 0, data.size, opt)
+
+                        val intArray = IntArray(mBitmap.width * mBitmap.height)
+                        mBitmap.getPixels(
+                            intArray,
+                            0,
+                            mBitmap.width,
+                            0,
+                            0,
+                            mBitmap.width,
+                            mBitmap.height,
+                        )
+
+                        val dim = "${mBitmap.width}x${mBitmap.height}"
+
+                        val aspectRatio = (mBitmap.width).toFloat() / (mBitmap.height).toFloat()
+
+                        if (aspectRatio > 1) {
+                            Pair(
+                                BlurHash.encode(
+                                    intArray,
+                                    mBitmap.width,
+                                    mBitmap.height,
+                                    9,
+                                    (9 * (1 / aspectRatio)).roundToInt(),
+                                ),
+                                dim,
+                            )
+                        } else if (aspectRatio < 1) {
+                            Pair(
+                                BlurHash.encode(
+                                    intArray,
+                                    mBitmap.width,
+                                    mBitmap.height,
+                                    (9 * aspectRatio).roundToInt(),
+                                    9,
+                                ),
+                                dim,
+                            )
+                        } else {
+                            Pair(BlurHash.encode(intArray, mBitmap.width, mBitmap.height, 4, 4), dim)
+                        }
+                    } else if (mimeType?.startsWith("video/") == true) {
+                        val mediaMetadataRetriever = MediaMetadataRetriever()
+                        mediaMetadataRetriever.setDataSource(ByteArrayMediaDataSource(data))
+
+                        val newDim = mediaMetadataRetriever.prepareDimFromVideo() ?: dimPrecomputed
+
+                        val blurhash =
+                            mediaMetadataRetriever.getThumbnail()?.let { thumbnail ->
+                                val aspectRatio = (thumbnail.width).toFloat() / (thumbnail.height).toFloat()
+
+                                val intArray = IntArray(thumbnail.width * thumbnail.height)
+                                thumbnail.getPixels(
+                                    intArray,
+                                    0,
+                                    thumbnail.width,
+                                    0,
+                                    0,
+                                    thumbnail.width,
+                                    thumbnail.height,
+                                )
+
+                                if (aspectRatio > 1) {
+                                    BlurHash.encode(
+                                        intArray,
+                                        thumbnail.width,
+                                        thumbnail.height,
+                                        9,
+                                        (9 * (1 / aspectRatio)).roundToInt(),
+                                    )
+                                } else if (aspectRatio < 1) {
+                                    BlurHash.encode(
+                                        intArray,
+                                        thumbnail.width,
+                                        thumbnail.height,
+                                        (9 * aspectRatio).roundToInt(),
+                                        9,
+                                    )
+                                } else {
+                                    BlurHash.encode(intArray, thumbnail.width, thumbnail.height, 4, 4)
+                                }
+                            }
+
+                        if (newDim != "0x0") {
+                            Pair(blurhash, newDim)
+                        } else {
+                            Pair(blurhash, null)
+                        }
+                    } else {
+                        Pair(null, null)
+                    }
+
+                onReady(FileHeader(mimeType, hash, size, dim, blurHash))
+            } catch (e: Exception) {
+                Log.e("ImageDownload", "Couldn't convert image in to File Header: ${e.message}")
+                onError(e.message)
+            }
+        }
     }
-  }
 }
 
 fun MediaMetadataRetriever.getThumbnail(): Bitmap? {
-  val raw: ByteArray? = getEmbeddedPicture()
-  if (raw != null) {
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-      return ImageDecoder.decodeBitmap(ImageDecoder.createSource(raw))
+    val raw: ByteArray? = getEmbeddedPicture()
+    if (raw != null) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+            return ImageDecoder.decodeBitmap(ImageDecoder.createSource(raw))
+        }
     }
-  }
 
-  return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
-    val params = BitmapParams()
-    params.preferredConfig = Bitmap.Config.ARGB_8888
+    return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+        val params = BitmapParams()
+        params.preferredConfig = Bitmap.Config.ARGB_8888
 
-    // Fall back to middle of video
-    // Note: METADATA_KEY_DURATION unit is in ms, not us.
-    val thumbnailTimeUs: Long =
-      (extractMetadata(MediaMetadataRetriever.METADATA_KEY_DURATION)?.toLong() ?: 0) * 1000 / 2
+        // Fall back to middle of video
+        // Note: METADATA_KEY_DURATION unit is in ms, not us.
+        val thumbnailTimeUs: Long =
+            (extractMetadata(MediaMetadataRetriever.METADATA_KEY_DURATION)?.toLong() ?: 0) * 1000 / 2
 
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-      getFrameAtTime(thumbnailTimeUs, MediaMetadataRetriever.OPTION_CLOSEST_SYNC, params)
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+            getFrameAtTime(thumbnailTimeUs, MediaMetadataRetriever.OPTION_CLOSEST_SYNC, params)
+        } else {
+            null
+        }
     } else {
-      null
+        null
     }
-  } else {
-    null
-  }
 }
 
 fun MediaMetadataRetriever.prepareDimFromVideo(): String? {
-  val width = prepareVideoWidth() ?: return null
-  val height = prepareVideoHeight() ?: return null
+    val width = prepareVideoWidth() ?: return null
+    val height = prepareVideoHeight() ?: return null
 
-  return "${width}x$height"
+    return "${width}x$height"
 }
 
 fun MediaMetadataRetriever.prepareVideoWidth(): Int? {
-  val widthData = extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_WIDTH)
-  return if (widthData.isNullOrEmpty()) {
-    null
-  } else {
-    widthData.toInt()
-  }
+    val widthData = extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_WIDTH)
+    return if (widthData.isNullOrEmpty()) {
+        null
+    } else {
+        widthData.toInt()
+    }
 }
 
 fun MediaMetadataRetriever.prepareVideoHeight(): Int? {
-  val heightData = extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_HEIGHT)
-  return if (heightData.isNullOrEmpty()) {
-    null
-  } else {
-    heightData.toInt()
-  }
+    val heightData = extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_HEIGHT)
+    return if (heightData.isNullOrEmpty()) {
+        null
+    } else {
+        heightData.toInt()
+    }
 }
 
 class ByteArrayMediaDataSource(var imageData: ByteArray) : MediaDataSource() {
-  override fun getSize(): Long {
-    return imageData.size.toLong()
-  }
-
-  @Throws(IOException::class)
-  override fun readAt(
-    position: Long,
-    buffer: ByteArray,
-    offset: Int,
-    size: Int,
-  ): Int {
-    if (position >= imageData.size) {
-      return -1
+    override fun getSize(): Long {
+        return imageData.size.toLong()
     }
-    val newSize =
-      if (position + size > imageData.size) {
-        size - ((position.toInt() + size) - imageData.size)
-      } else {
-        size
-      }
 
-    imageData.copyInto(buffer, offset, position.toInt(), position.toInt() + newSize)
+    @Throws(IOException::class)
+    override fun readAt(
+        position: Long,
+        buffer: ByteArray,
+        offset: Int,
+        size: Int,
+    ): Int {
+        if (position >= imageData.size) {
+            return -1
+        }
+        val newSize =
+            if (position + size > imageData.size) {
+                size - ((position.toInt() + size) - imageData.size)
+            } else {
+                size
+            }
 
-    return newSize
-  }
+        imageData.copyInto(buffer, offset, position.toInt(), position.toInt() + newSize)
 
-  @Throws(IOException::class) override fun close() {}
+        return newSize
+    }
+
+    @Throws(IOException::class)
+    override fun close() {}
 }

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

@@ -22,98 +22,98 @@ package com.vitorpamplona.amethyst.service
 
 import android.util.Log
 import com.vitorpamplona.amethyst.BuildConfig
+import okhttp3.Interceptor
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import okhttp3.Response
 import java.io.IOException
 import java.net.InetSocketAddress
 import java.net.Proxy
 import java.time.Duration
 import kotlin.properties.Delegates
-import okhttp3.Interceptor
-import okhttp3.OkHttpClient
-import okhttp3.Request
-import okhttp3.Response
 
 object HttpClient {
-  val DEFAULT_TIMEOUT_ON_WIFI = Duration.ofSeconds(10L)
-  val DEFAULT_TIMEOUT_ON_MOBILE = Duration.ofSeconds(30L)
+    val DEFAULT_TIMEOUT_ON_WIFI = Duration.ofSeconds(10L)
+    val DEFAULT_TIMEOUT_ON_MOBILE = Duration.ofSeconds(30L)
 
-  var proxyChangeListeners = ArrayList<() -> Unit>()
-  var defaultTimeout = DEFAULT_TIMEOUT_ON_WIFI
+    var proxyChangeListeners = ArrayList<() -> Unit>()
+    var defaultTimeout = DEFAULT_TIMEOUT_ON_WIFI
 
-  var defaultHttpClient: OkHttpClient? = null
+    var defaultHttpClient: OkHttpClient? = null
 
-  // fires off every time value of the property changes
-  private var internalProxy: Proxy? by
-    Delegates.observable(null) { _, oldValue, newValue ->
-      if (oldValue != newValue) {
-        proxyChangeListeners.forEach { it() }
-      }
+    // fires off every time value of the property changes
+    private var internalProxy: Proxy? by
+        Delegates.observable(null) { _, oldValue, newValue ->
+            if (oldValue != newValue) {
+                proxyChangeListeners.forEach { it() }
+            }
+        }
+
+    fun start(proxy: Proxy?) {
+        if (internalProxy != proxy) {
+            this.internalProxy = proxy
+            this.defaultHttpClient = getHttpClient()
+        }
     }
 
-  fun start(proxy: Proxy?) {
-    if (internalProxy != proxy) {
-      this.internalProxy = proxy
-      this.defaultHttpClient = getHttpClient()
+    fun changeTimeouts(timeout: Duration) {
+        Log.d("HttpClient", "Changing timeout to: $timeout")
+        if (this.defaultTimeout.seconds != timeout.seconds) {
+            this.defaultTimeout = timeout
+            this.defaultHttpClient = getHttpClient()
+        }
     }
-  }
 
-  fun changeTimeouts(timeout: Duration) {
-    Log.d("HttpClient", "Changing timeout to: $timeout")
-    if (this.defaultTimeout.seconds != timeout.seconds) {
-      this.defaultTimeout = timeout
-      this.defaultHttpClient = getHttpClient()
+    fun getHttpClient(timeout: Duration): OkHttpClient {
+        val seconds = if (internalProxy != null) timeout.seconds * 2 else timeout.seconds
+        val duration = Duration.ofSeconds(seconds)
+        return OkHttpClient.Builder()
+            .proxy(internalProxy)
+            .readTimeout(duration)
+            .connectTimeout(duration)
+            .writeTimeout(duration)
+            .addInterceptor(DefaultContentTypeInterceptor())
+            .followRedirects(true)
+            .followSslRedirects(true)
+            .build()
     }
-  }
 
-  fun getHttpClient(timeout: Duration): OkHttpClient {
-    val seconds = if (internalProxy != null) timeout.seconds * 2 else timeout.seconds
-    val duration = Duration.ofSeconds(seconds)
-    return OkHttpClient.Builder()
-      .proxy(internalProxy)
-      .readTimeout(duration)
-      .connectTimeout(duration)
-      .writeTimeout(duration)
-      .addInterceptor(DefaultContentTypeInterceptor())
-      .followRedirects(true)
-      .followSslRedirects(true)
-      .build()
-  }
-
-  class DefaultContentTypeInterceptor : Interceptor {
-    @Throws(IOException::class)
-    override fun intercept(chain: Interceptor.Chain): Response {
-      val originalRequest: Request = chain.request()
-      val requestWithUserAgent: Request =
-        originalRequest
-          .newBuilder()
-          .header("User-Agent", "Amethyst/${BuildConfig.VERSION_NAME}")
-          .build()
-      return chain.proceed(requestWithUserAgent)
+    class DefaultContentTypeInterceptor : Interceptor {
+        @Throws(IOException::class)
+        override fun intercept(chain: Interceptor.Chain): Response {
+            val originalRequest: Request = chain.request()
+            val requestWithUserAgent: Request =
+                originalRequest
+                    .newBuilder()
+                    .header("User-Agent", "Amethyst/${BuildConfig.VERSION_NAME}")
+                    .build()
+            return chain.proceed(requestWithUserAgent)
+        }
     }
-  }
 
-  fun getHttpClientForRelays(): OkHttpClient {
-    if (this.defaultHttpClient == null) {
-      this.defaultHttpClient = getHttpClient(defaultTimeout)
+    fun getHttpClientForRelays(): OkHttpClient {
+        if (this.defaultHttpClient == null) {
+            this.defaultHttpClient = getHttpClient(defaultTimeout)
+        }
+        return defaultHttpClient!!
     }
-    return defaultHttpClient!!
-  }
 
-  fun getHttpClient(): OkHttpClient {
-    if (this.defaultHttpClient == null) {
-      this.defaultHttpClient = getHttpClient(defaultTimeout)
+    fun getHttpClient(): OkHttpClient {
+        if (this.defaultHttpClient == null) {
+            this.defaultHttpClient = getHttpClient(defaultTimeout)
+        }
+        return defaultHttpClient!!
     }
-    return defaultHttpClient!!
-  }
 
-  fun getProxy(): Proxy? {
-    return internalProxy
-  }
+    fun getProxy(): Proxy? {
+        return internalProxy
+    }
 
-  fun initProxy(
-    useProxy: Boolean,
-    hostname: String,
-    port: Int,
-  ): Proxy? {
-    return if (useProxy) Proxy(Proxy.Type.SOCKS, InetSocketAddress(hostname, port)) else null
-  }
+    fun initProxy(
+        useProxy: Boolean,
+        hostname: String,
+        port: Int,
+    ): Proxy? {
+        return if (useProxy) Proxy(Proxy.Type.SOCKS, InetSocketAddress(hostname, port)) else null
+    }
 }

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

@@ -32,81 +32,81 @@ import androidx.compose.runtime.mutableStateOf
 import kotlinx.coroutines.flow.MutableStateFlow
 
 class LocationUtil(context: Context) {
-  companion object {
-    const val MIN_TIME: Long = 1000L
-    const val MIN_DISTANCE: Float = 0.0f
-  }
-
-  private val locationManager =
-    context.getSystemService(Context.LOCATION_SERVICE) as LocationManager
-  private var locationListener: LocationListener? = null
-
-  val locationStateFlow = MutableStateFlow<Location>(Location(LocationManager.NETWORK_PROVIDER))
-  val providerState = mutableStateOf(false)
-  val isStart: MutableState<Boolean> = mutableStateOf(false)
-
-  private val locHandlerThread = HandlerThread("LocationUtil Thread")
-
-  init {
-    locHandlerThread.start()
-  }
-
-  @SuppressLint("MissingPermission")
-  fun start(
-    minTimeMs: Long = MIN_TIME,
-    minDistanceM: Float = MIN_DISTANCE,
-  ) {
-    locationListener().let {
-      locationListener = it
-      locationManager.requestLocationUpdates(
-        LocationManager.NETWORK_PROVIDER,
-        minTimeMs,
-        minDistanceM,
-        it,
-        locHandlerThread.looper,
-      )
+    companion object {
+        const val MIN_TIME: Long = 1000L
+        const val MIN_DISTANCE: Float = 0.0f
     }
-    providerState.value = locationManager.isProviderEnabled(LocationManager.NETWORK_PROVIDER)
-    isStart.value = true
-  }
 
-  fun stop() {
-    locationListener?.let { locationManager.removeUpdates(it) }
-    isStart.value = false
-  }
+    private val locationManager =
+        context.getSystemService(Context.LOCATION_SERVICE) as LocationManager
+    private var locationListener: LocationListener? = null
 
-  private fun locationListener() =
-    object : LocationListener {
-      override fun onLocationChanged(location: Location) {
-        locationStateFlow.value = location
-      }
+    val locationStateFlow = MutableStateFlow<Location>(Location(LocationManager.NETWORK_PROVIDER))
+    val providerState = mutableStateOf(false)
+    val isStart: MutableState<Boolean> = mutableStateOf(false)
 
-      override fun onProviderEnabled(provider: String) {
-        providerState.value = true
-      }
+    private val locHandlerThread = HandlerThread("LocationUtil Thread")
 
-      override fun onProviderDisabled(provider: String) {
-        providerState.value = false
-      }
+    init {
+        locHandlerThread.start()
     }
+
+    @SuppressLint("MissingPermission")
+    fun start(
+        minTimeMs: Long = MIN_TIME,
+        minDistanceM: Float = MIN_DISTANCE,
+    ) {
+        locationListener().let {
+            locationListener = it
+            locationManager.requestLocationUpdates(
+                LocationManager.NETWORK_PROVIDER,
+                minTimeMs,
+                minDistanceM,
+                it,
+                locHandlerThread.looper,
+            )
+        }
+        providerState.value = locationManager.isProviderEnabled(LocationManager.NETWORK_PROVIDER)
+        isStart.value = true
+    }
+
+    fun stop() {
+        locationListener?.let { locationManager.removeUpdates(it) }
+        isStart.value = false
+    }
+
+    private fun locationListener() =
+        object : LocationListener {
+            override fun onLocationChanged(location: Location) {
+                locationStateFlow.value = location
+            }
+
+            override fun onProviderEnabled(provider: String) {
+                providerState.value = true
+            }
+
+            override fun onProviderDisabled(provider: String) {
+                providerState.value = false
+            }
+        }
 }
 
 class ReverseGeoLocationUtil {
-  suspend fun execute(
-    location: Location,
-    context: Context,
-  ): String? {
-    return try {
-      Geocoder(context)
-        .getFromLocation(location.latitude, location.longitude, 1)
-        ?.firstOrNull()
-        ?.let { address ->
-          listOfNotNull(address.locality ?: address.subAdminArea, address.countryCode)
-            .joinToString(", ")
+    suspend fun execute(
+        location: Location,
+        context: Context,
+    ): String? {
+        return try {
+            Geocoder(context)
+                .getFromLocation(location.latitude, location.longitude, 1)
+                ?.firstOrNull()
+                ?.let { address ->
+                    listOfNotNull(address.locality ?: address.subAdminArea, address.countryCode)
+                        .joinToString(", ")
+                }
+        } catch (e: Exception) {
+            e.printStackTrace()
+            return null
         }
-    } catch (e: Exception) {
-      e.printStackTrace()
-      return null
     }
-  }
 }

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

@@ -24,9 +24,9 @@ import android.os.Looper
 import com.vitorpamplona.amethyst.BuildConfig
 
 fun checkNotInMainThread() {
-  if (BuildConfig.DEBUG && isMainThread()) {
-    throw OnMainThreadException("It should not be in the MainThread")
-  }
+    if (BuildConfig.DEBUG && isMainThread()) {
+        throw OnMainThreadException("It should not be in the MainThread")
+    }
 }
 
 fun isMainThread() = Looper.myLooper() == Looper.getMainLooper()

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

@@ -30,121 +30,120 @@ import okhttp3.Request
 import okhttp3.Response
 
 class Nip05NostrAddressVerifier() {
-  fun assembleUrl(nip05address: String): String? {
-    val parts = nip05address.trim().split("@")
+    fun assembleUrl(nip05address: String): String? {
+        val parts = nip05address.trim().split("@")
 
-    if (parts.size == 2) {
-      return "https://${parts[1]}/.well-known/nostr.json?name=${parts[0]}"
-    }
-    if (parts.size == 1) {
-      return "https://${parts[0]}/.well-known/nostr.json?name=_"
+        if (parts.size == 2) {
+            return "https://${parts[1]}/.well-known/nostr.json?name=${parts[0]}"
+        }
+        if (parts.size == 1) {
+            return "https://${parts[0]}/.well-known/nostr.json?name=_"
+        }
+
+        return null
     }
 
-    return null
-  }
-
-  suspend fun fetchNip05Json(
-    nip05: String,
-    onSuccess: (String) -> Unit,
-    onError: (String) -> Unit,
-  ) =
-    withContext(Dispatchers.IO) {
-      checkNotInMainThread()
-
-      val url = assembleUrl(nip05)
-
-      if (url == null) {
-        onError("Could not assemble url from Nip05: \"${nip05}\". Check the user's setup")
-        return@withContext
-      }
-
-      try {
-        val request =
-          Request.Builder()
-            .header("User-Agent", "Amethyst/${BuildConfig.VERSION_NAME}")
-            .url(url)
-            .build()
-
-        HttpClient.getHttpClient()
-          .newCall(request)
-          .enqueue(
-            object : Callback {
-              override fun onResponse(
-                call: Call,
-                response: Response,
-              ) {
-                checkNotInMainThread()
-
-                response.use {
-                  if (it.isSuccessful) {
-                    onSuccess(it.body.string())
-                  } else {
-                    onError(
-                      "Could not resolve $nip05. Error: ${it.code}. Check if the server is up and if the address $nip05 is correct",
-                    )
-                  }
-                }
-              }
-
-              override fun onFailure(
-                call: Call,
-                e: java.io.IOException,
-              ) {
-                onError(
-                  "Could not resolve $url. Check if the server is up and if the address $nip05 is correct",
-                )
-                e.printStackTrace()
-              }
-            },
-          )
-      } catch (e: java.lang.Exception) {
-        onError("Could not resolve '$url': ${e.message}")
-      }
-    }
-
-  suspend fun verifyNip05(
-    nip05: String,
-    onSuccess: (String) -> Unit,
-    onError: (String) -> Unit,
-  ) {
-    // check fails on tests
-    checkNotInMainThread()
-
-    val mapper = jacksonObjectMapper()
-
-    fetchNip05Json(
-      nip05,
-      onSuccess = {
+    suspend fun fetchNip05Json(
+        nip05: String,
+        onSuccess: (String) -> Unit,
+        onError: (String) -> Unit,
+    ) = withContext(Dispatchers.IO) {
         checkNotInMainThread()
 
-        // NIP05 usernames are case insensitive, but JSON properties are not
-        // converts the json to lowercase and then tries to access the username via a
-        // lowercase version of the username.
-        val nip05url =
-          try {
-            mapper.readTree(it.lowercase())
-          } catch (t: Throwable) {
-            onError("Error Parsing JSON from Lightning Address. Check the user's lightning setup")
-            null
-          }
+        val url = assembleUrl(nip05)
 
-        val parts = nip05.split("@")
-        val user =
-          if (parts.size == 2) {
-            parts[0].lowercase()
-          } else {
-            "_"
-          }
-
-        val hexKey = nip05url?.get("names")?.get(user)?.asText()
-
-        if (hexKey == null) {
-          onError("Username not found in the NIP05 JSON")
-        } else {
-          onSuccess(hexKey)
+        if (url == null) {
+            onError("Could not assemble url from Nip05: \"${nip05}\". Check the user's setup")
+            return@withContext
         }
-      },
-      onError = onError,
-    )
-  }
+
+        try {
+            val request =
+                Request.Builder()
+                    .header("User-Agent", "Amethyst/${BuildConfig.VERSION_NAME}")
+                    .url(url)
+                    .build()
+
+            HttpClient.getHttpClient()
+                .newCall(request)
+                .enqueue(
+                    object : Callback {
+                        override fun onResponse(
+                            call: Call,
+                            response: Response,
+                        ) {
+                            checkNotInMainThread()
+
+                            response.use {
+                                if (it.isSuccessful) {
+                                    onSuccess(it.body.string())
+                                } else {
+                                    onError(
+                                        "Could not resolve $nip05. Error: ${it.code}. Check if the server is up and if the address $nip05 is correct",
+                                    )
+                                }
+                            }
+                        }
+
+                        override fun onFailure(
+                            call: Call,
+                            e: java.io.IOException,
+                        ) {
+                            onError(
+                                "Could not resolve $url. Check if the server is up and if the address $nip05 is correct",
+                            )
+                            e.printStackTrace()
+                        }
+                    },
+                )
+        } catch (e: java.lang.Exception) {
+            onError("Could not resolve '$url': ${e.message}")
+        }
+    }
+
+    suspend fun verifyNip05(
+        nip05: String,
+        onSuccess: (String) -> Unit,
+        onError: (String) -> Unit,
+    ) {
+        // check fails on tests
+        checkNotInMainThread()
+
+        val mapper = jacksonObjectMapper()
+
+        fetchNip05Json(
+            nip05,
+            onSuccess = {
+                checkNotInMainThread()
+
+                // NIP05 usernames are case insensitive, but JSON properties are not
+                // converts the json to lowercase and then tries to access the username via a
+                // lowercase version of the username.
+                val nip05url =
+                    try {
+                        mapper.readTree(it.lowercase())
+                    } catch (t: Throwable) {
+                        onError("Error Parsing JSON from Lightning Address. Check the user's lightning setup")
+                        null
+                    }
+
+                val parts = nip05.split("@")
+                val user =
+                    if (parts.size == 2) {
+                        parts[0].lowercase()
+                    } else {
+                        "_"
+                    }
+
+                val hexKey = nip05url?.get("names")?.get(user)?.asText()
+
+                if (hexKey == null) {
+                    onError("Username not found in the NIP05 JSON")
+                } else {
+                    onSuccess(hexKey)
+                }
+            },
+            onError = onError,
+        )
+    }
 }

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

@@ -23,107 +23,107 @@ package com.vitorpamplona.amethyst.service
 import android.util.Log
 import android.util.LruCache
 import com.vitorpamplona.amethyst.model.RelayInformation
-import java.io.IOException
 import okhttp3.Call
 import okhttp3.Callback
 import okhttp3.Request
 import okhttp3.Response
+import java.io.IOException
 
 object Nip11CachedRetriever {
-  val relayInformationDocumentCache = LruCache<String, RelayInformation>(100)
-  val retriever = Nip11Retriever()
+    val relayInformationDocumentCache = LruCache<String, RelayInformation>(100)
+    val retriever = Nip11Retriever()
 
-  suspend fun loadRelayInfo(
-    dirtyUrl: String,
-    onInfo: (RelayInformation) -> Unit,
-    onError: (String, Nip11Retriever.ErrorCode, String?) -> Unit,
-  ) {
-    val url = retriever.cleanUrl(dirtyUrl)
-    val doc = relayInformationDocumentCache.get(url)
+    suspend fun loadRelayInfo(
+        dirtyUrl: String,
+        onInfo: (RelayInformation) -> Unit,
+        onError: (String, Nip11Retriever.ErrorCode, String?) -> Unit,
+    ) {
+        val url = retriever.cleanUrl(dirtyUrl)
+        val doc = relayInformationDocumentCache.get(url)
 
-    if (doc != null) {
-      onInfo(doc)
-    } else {
-      Nip11Retriever()
-        .loadRelayInfo(
-          url,
-          dirtyUrl,
-          onInfo = {
-            relayInformationDocumentCache.put(url, it)
-            onInfo(it)
-          },
-          onError,
-        )
+        if (doc != null) {
+            onInfo(doc)
+        } else {
+            Nip11Retriever()
+                .loadRelayInfo(
+                    url,
+                    dirtyUrl,
+                    onInfo = {
+                        relayInformationDocumentCache.put(url, it)
+                        onInfo(it)
+                    },
+                    onError,
+                )
+        }
     }
-  }
 }
 
 class Nip11Retriever {
-  enum class ErrorCode {
-    FAIL_TO_ASSEMBLE_URL,
-    FAIL_TO_REACH_SERVER,
-    FAIL_TO_PARSE_RESULT,
-    FAIL_WITH_HTTP_STATUS,
-  }
-
-  fun cleanUrl(dirtyUrl: String): String {
-    return if (dirtyUrl.contains("://")) {
-      dirtyUrl.replace("wss://", "https://").replace("ws://", "http://")
-    } else {
-      "https://$dirtyUrl"
+    enum class ErrorCode {
+        FAIL_TO_ASSEMBLE_URL,
+        FAIL_TO_REACH_SERVER,
+        FAIL_TO_PARSE_RESULT,
+        FAIL_WITH_HTTP_STATUS,
     }
-  }
 
-  suspend fun loadRelayInfo(
-    url: String,
-    dirtyUrl: String,
-    onInfo: (RelayInformation) -> Unit,
-    onError: (String, ErrorCode, String?) -> Unit,
-  ) {
-    try {
-      val request: Request =
-        Request.Builder().header("Accept", "application/nostr+json").url(url).build()
-
-      HttpClient.getHttpClient()
-        .newCall(request)
-        .enqueue(
-          object : Callback {
-            override fun onResponse(
-              call: Call,
-              response: Response,
-            ) {
-              checkNotInMainThread()
-              response.use {
-                val body = it.body.string()
-                try {
-                  if (it.isSuccessful) {
-                    onInfo(RelayInformation.fromJson(body))
-                  } else {
-                    onError(dirtyUrl, ErrorCode.FAIL_WITH_HTTP_STATUS, it.code.toString())
-                  }
-                } catch (e: Exception) {
-                  Log.e(
-                    "RelayInfoFail",
-                    "Resulting Message from Relay $dirtyUrl in not parseable: $body",
-                    e,
-                  )
-                  onError(dirtyUrl, ErrorCode.FAIL_TO_PARSE_RESULT, e.message)
-                }
-              }
-            }
-
-            override fun onFailure(
-              call: Call,
-              e: IOException,
-            ) {
-              Log.e("RelayInfoFail", "$dirtyUrl unavailable", e)
-              onError(dirtyUrl, ErrorCode.FAIL_TO_REACH_SERVER, e.message)
-            }
-          },
-        )
-    } catch (e: Exception) {
-      Log.e("RelayInfoFail", "Invalid URL $dirtyUrl", e)
-      onError(dirtyUrl, ErrorCode.FAIL_TO_ASSEMBLE_URL, e.message)
+    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,
+        onInfo: (RelayInformation) -> Unit,
+        onError: (String, ErrorCode, String?) -> Unit,
+    ) {
+        try {
+            val request: Request =
+                Request.Builder().header("Accept", "application/nostr+json").url(url).build()
+
+            HttpClient.getHttpClient()
+                .newCall(request)
+                .enqueue(
+                    object : Callback {
+                        override fun onResponse(
+                            call: Call,
+                            response: Response,
+                        ) {
+                            checkNotInMainThread()
+                            response.use {
+                                val body = it.body.string()
+                                try {
+                                    if (it.isSuccessful) {
+                                        onInfo(RelayInformation.fromJson(body))
+                                    } else {
+                                        onError(dirtyUrl, ErrorCode.FAIL_WITH_HTTP_STATUS, it.code.toString())
+                                    }
+                                } catch (e: Exception) {
+                                    Log.e(
+                                        "RelayInfoFail",
+                                        "Resulting Message from Relay $dirtyUrl in not parseable: $body",
+                                        e,
+                                    )
+                                    onError(dirtyUrl, ErrorCode.FAIL_TO_PARSE_RESULT, e.message)
+                                }
+                            }
+                        }
+
+                        override fun onFailure(
+                            call: Call,
+                            e: IOException,
+                        ) {
+                            Log.e("RelayInfoFail", "$dirtyUrl unavailable", e)
+                            onError(dirtyUrl, ErrorCode.FAIL_TO_REACH_SERVER, e.message)
+                        }
+                    },
+                )
+        } catch (e: Exception) {
+            Log.e("RelayInfoFail", "Invalid URL $dirtyUrl", e)
+            onError(dirtyUrl, ErrorCode.FAIL_TO_ASSEMBLE_URL, e.message)
+        }
     }
-  }
 }

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

@@ -25,31 +25,31 @@ import java.util.regex.Pattern
 
 @Immutable
 class Nip30CustomEmoji {
-  val customEmojiPattern: Pattern =
-    Pattern.compile("\\:([A-Za-z0-9_\\-]+)\\:", Pattern.CASE_INSENSITIVE)
+    val customEmojiPattern: Pattern =
+        Pattern.compile("\\:([A-Za-z0-9_\\-]+)\\:", Pattern.CASE_INSENSITIVE)
 
-  fun buildArray(input: String): List<String> {
-    val matcher = customEmojiPattern.matcher(input)
-    val list = mutableListOf<String>()
-    while (matcher.find()) {
-      list.add(matcher.group())
+    fun buildArray(input: String): List<String> {
+        val matcher = customEmojiPattern.matcher(input)
+        val list = mutableListOf<String>()
+        while (matcher.find()) {
+            list.add(matcher.group())
+        }
+
+        if (list.isEmpty()) {
+            return listOf(input)
+        }
+
+        val regularChars = input.split(customEmojiPattern.toRegex())
+
+        val finalList = mutableListOf<String>()
+        var index = 0
+        for (e in regularChars) {
+            finalList.add(e)
+            if (index < list.size) {
+                finalList.add(list[index])
+            }
+            index++
+        }
+        return finalList
     }
-
-    if (list.isEmpty()) {
-      return listOf(input)
-    }
-
-    val regularChars = input.split(customEmojiPattern.toRegex())
-
-    val finalList = mutableListOf<String>()
-    var index = 0
-    for (e in regularChars) {
-      finalList.add(e)
-      if (index < list.size) {
-        finalList.add(list[index])
-      }
-      index++
-    }
-    return finalList
-  }
 }

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

@@ -24,21 +24,21 @@ import java.net.URI
 import java.net.URLDecoder
 
 class Nip44UrlParser {
-  fun parse(url: String): Map<String, String> {
-    return try {
-      fragments(URI(url))
-    } catch (e: Exception) {
-      emptyMap()
+    fun parse(url: String): Map<String, String> {
+        return try {
+            fragments(URI(url))
+        } catch (e: Exception) {
+            emptyMap()
+        }
     }
-  }
 
-  private fun fragments(uri: URI): Map<String, String> {
-    if (uri.rawFragment == null) return emptyMap()
-    return uri.rawFragment.split('&').associate { keyValuePair ->
-      val parts = keyValuePair.split('=')
-      val name = parts.firstOrNull() ?: ""
-      val value = parts.getOrNull(1)?.let { URLDecoder.decode(it, "UTF-8") } ?: ""
-      Pair(name, value)
+    private fun fragments(uri: URI): Map<String, String> {
+        if (uri.rawFragment == null) return emptyMap()
+        return uri.rawFragment.split('&').associate { keyValuePair ->
+            val parts = keyValuePair.split('=')
+            val name = parts.firstOrNull() ?: ""
+            val value = parts.getOrNull(1)?.let { URLDecoder.decode(it, "UTF-8") } ?: ""
+            Pair(name, value)
+        }
     }
-  }
 }

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

@@ -27,27 +27,27 @@ import com.vitorpamplona.quartz.encoders.toHexKey
 
 // Rename to the corect nip number when ready.
 object Nip47WalletConnectParser {
-  fun parse(uri: String): Nip47URI {
-    // nostrwalletconnect://b889ff5b1513b641e2a139f661a661364979c5beee91842f8f0ef42ab558e9d4?relay=wss%3A%2F%2Frelay.damus.io&metadata=%7B%22name%22%3A%22Example%22%7D
+    fun parse(uri: String): Nip47URI {
+        // nostrwalletconnect://b889ff5b1513b641e2a139f661a661364979c5beee91842f8f0ef42ab558e9d4?relay=wss%3A%2F%2Frelay.damus.io&metadata=%7B%22name%22%3A%22Example%22%7D
 
-    val url = Uri.parse(uri)
+        val url = Uri.parse(uri)
 
-    if (url.scheme != "nostrwalletconnect" && url.scheme != "nostr+walletconnect") {
-      throw IllegalArgumentException("Not a Wallet Connect QR Code")
+        if (url.scheme != "nostrwalletconnect" && url.scheme != "nostr+walletconnect") {
+            throw IllegalArgumentException("Not a Wallet Connect QR Code")
+        }
+
+        val pubkey = url.host ?: throw IllegalArgumentException("Hostname cannot be null")
+
+        val pubkeyHex =
+            try {
+                decodePublicKey(pubkey).toHexKey()
+            } catch (e: Exception) {
+                throw IllegalArgumentException("Hostname is not a valid Nostr Pubkey")
+            }
+
+        val relay = url.getQueryParameter("relay")
+        val secret = url.getQueryParameter("secret")
+
+        return Nip47URI(pubkeyHex, relay, secret)
     }
-
-    val pubkey = url.host ?: throw IllegalArgumentException("Hostname cannot be null")
-
-    val pubkeyHex =
-      try {
-        decodePublicKey(pubkey).toHexKey()
-      } catch (e: Exception) {
-        throw IllegalArgumentException("Hostname is not a valid Nostr Pubkey")
-      }
-
-    val relay = url.getQueryParameter("relay")
-    val secret = url.getQueryParameter("secret")
-
-    return Nip47URI(pubkeyHex, relay, secret)
-  }
 }

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

@@ -27,85 +27,85 @@ import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import okhttp3.Request
 
 object Nip96MediaServers {
-  val DEFAULT =
-    listOf(
-      ServerName("Nostr.Build", "https://nostr.build"),
-      ServerName("NostrCheck.me", "https://nostrcheck.me"),
-      ServerName("Nostrage", "https://nostrage.com"),
-      ServerName("Sove", "https://sove.rent"),
-      ServerName("Sovbit", "https://files.sovbit.host"),
-      ServerName("Void.cat", "https://void.cat"),
-    )
+    val DEFAULT =
+        listOf(
+            ServerName("Nostr.Build", "https://nostr.build"),
+            ServerName("NostrCheck.me", "https://nostrcheck.me"),
+            ServerName("Nostrage", "https://nostrage.com"),
+            ServerName("Sove", "https://sove.rent"),
+            ServerName("Sovbit", "https://files.sovbit.host"),
+            ServerName("Void.cat", "https://void.cat"),
+        )
 
-  data class ServerName(val name: String, val baseUrl: String)
+    data class ServerName(val name: String, val baseUrl: String)
 
-  val cache: MutableMap<String, Nip96Retriever.ServerInfo> = mutableMapOf()
+    val cache: MutableMap<String, Nip96Retriever.ServerInfo> = mutableMapOf()
 
-  suspend fun load(url: String): Nip96Retriever.ServerInfo {
-    val cached = cache[url]
-    if (cached != null) return cached
+    suspend fun load(url: String): Nip96Retriever.ServerInfo {
+        val cached = cache[url]
+        if (cached != null) return cached
 
-    val fetched = Nip96Retriever().loadInfo(url)
-    cache[url] = fetched
-    return fetched
-  }
+        val fetched = Nip96Retriever().loadInfo(url)
+        cache[url] = fetched
+        return fetched
+    }
 }
 
 class Nip96Retriever {
-  data class ServerInfo(
-    @JsonProperty("api_url") val apiUrl: String,
-    @JsonProperty("download_url") val downloadUrl: String? = null,
-    @JsonProperty("delegated_to_url") val delegatedToUrl: String? = null,
-    @JsonProperty("supported_nips") val supportedNips: ArrayList<Int> = arrayListOf(),
-    @JsonProperty("tos_url") val tosUrl: String? = null,
-    @JsonProperty("content_types") val contentTypes: ArrayList<MimeType> = arrayListOf(),
-    @JsonProperty("plans") val plans: Map<PlanName, Plan> = mapOf(),
-  )
+    data class ServerInfo(
+        @JsonProperty("api_url") val apiUrl: String,
+        @JsonProperty("download_url") val downloadUrl: String? = null,
+        @JsonProperty("delegated_to_url") val delegatedToUrl: String? = null,
+        @JsonProperty("supported_nips") val supportedNips: ArrayList<Int> = arrayListOf(),
+        @JsonProperty("tos_url") val tosUrl: String? = null,
+        @JsonProperty("content_types") val contentTypes: ArrayList<MimeType> = arrayListOf(),
+        @JsonProperty("plans") val plans: Map<PlanName, Plan> = mapOf(),
+    )
 
-  data class Plan(
-    @JsonProperty("name") val name: String? = null,
-    @JsonProperty("is_nip98_required") val isNip98Required: Boolean? = null,
-    @JsonProperty("url") val url: String? = null,
-    @JsonProperty("max_byte_size") val maxByteSize: Long? = null,
-    @JsonProperty("file_expiration") val fileExpiration: ArrayList<Int> = arrayListOf(),
-    @JsonProperty("media_transformations")
-    val mediaTransformations: Map<MimeType, Array<String>> = emptyMap(),
-  )
+    data class Plan(
+        @JsonProperty("name") val name: String? = null,
+        @JsonProperty("is_nip98_required") val isNip98Required: Boolean? = null,
+        @JsonProperty("url") val url: String? = null,
+        @JsonProperty("max_byte_size") val maxByteSize: Long? = null,
+        @JsonProperty("file_expiration") val fileExpiration: ArrayList<Int> = arrayListOf(),
+        @JsonProperty("media_transformations")
+        val mediaTransformations: Map<MimeType, Array<String>> = emptyMap(),
+    )
 
-  fun parse(body: String): ServerInfo {
-    val mapper =
-      jacksonObjectMapper().configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
-    return mapper.readValue(body, ServerInfo::class.java)
-  }
-
-  suspend fun loadInfo(baseUrl: String): ServerInfo {
-    checkNotInMainThread()
-
-    val request: Request =
-      Request.Builder()
-        .header("Accept", "application/nostr+json")
-        .url(baseUrl.removeSuffix("/") + "/.well-known/nostr/nip96.json")
-        .build()
-
-    HttpClient.getHttpClient().newCall(request).execute().use { response ->
-      checkNotInMainThread()
-      response.use {
-        val body = it.body.string()
-        try {
-          if (it.isSuccessful) {
-            return parse(body)
-          } else {
-            throw RuntimeException(
-              "Resulting Message from $baseUrl is an error: ${response.code} ${response.message}",
-            )
-          }
-        } catch (e: Exception) {
-          Log.e("RelayInfoFail", "Resulting Message from $baseUrl in not parseable: $body", e)
-          throw e
-        }
-      }
+    fun parse(body: String): ServerInfo {
+        val mapper =
+            jacksonObjectMapper().configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
+        return mapper.readValue(body, ServerInfo::class.java)
+    }
+
+    suspend fun loadInfo(baseUrl: String): ServerInfo {
+        checkNotInMainThread()
+
+        val request: Request =
+            Request.Builder()
+                .header("Accept", "application/nostr+json")
+                .url(baseUrl.removeSuffix("/") + "/.well-known/nostr/nip96.json")
+                .build()
+
+        HttpClient.getHttpClient().newCall(request).execute().use { response ->
+            checkNotInMainThread()
+            response.use {
+                val body = it.body.string()
+                try {
+                    if (it.isSuccessful) {
+                        return parse(body)
+                    } else {
+                        throw RuntimeException(
+                            "Resulting Message from $baseUrl is an error: ${response.code} ${response.message}",
+                        )
+                    }
+                } catch (e: Exception) {
+                    Log.e("RelayInfoFail", "Resulting Message from $baseUrl in not parseable: $body", e)
+                    throw e
+                }
+            }
+        }
     }
-  }
 }
 
 typealias PlanName = String

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

@@ -30,9 +30,6 @@ import com.fasterxml.jackson.databind.DeserializationFeature
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import com.vitorpamplona.amethyst.BuildConfig
 import com.vitorpamplona.amethyst.model.Account
-import java.io.InputStream
-import java.util.Base64
-import kotlin.coroutines.resume
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.suspendCancellableCoroutine
 import kotlinx.coroutines.withTimeoutOrNull
@@ -42,276 +39,279 @@ import okhttp3.Request
 import okhttp3.RequestBody
 import okio.BufferedSink
 import okio.source
+import java.io.InputStream
+import java.util.Base64
+import kotlin.coroutines.resume
 
 val charPool: List<Char> = ('a'..'z') + ('A'..'Z') + ('0'..'9')
 
 fun randomChars() = List(16) { charPool.random() }.joinToString("")
 
 class Nip96Uploader(val account: Account?) {
-  suspend fun uploadImage(
-    uri: Uri,
-    contentType: String?,
-    size: Long?,
-    alt: String?,
-    sensitiveContent: String?,
-    server: Nip96MediaServers.ServerName,
-    contentResolver: ContentResolver,
-    onProgress: (percentage: Float) -> Unit,
-  ): PartialEvent {
-    val serverInfo =
-      Nip96Retriever()
-        .loadInfo(
-          server.baseUrl,
+    suspend fun uploadImage(
+        uri: Uri,
+        contentType: String?,
+        size: Long?,
+        alt: String?,
+        sensitiveContent: String?,
+        server: Nip96MediaServers.ServerName,
+        contentResolver: ContentResolver,
+        onProgress: (percentage: Float) -> Unit,
+    ): PartialEvent {
+        val serverInfo =
+            Nip96Retriever()
+                .loadInfo(
+                    server.baseUrl,
+                )
+
+        return uploadImage(
+            uri,
+            contentType,
+            size,
+            alt,
+            sensitiveContent,
+            serverInfo,
+            contentResolver,
+            onProgress,
         )
+    }
 
-    return uploadImage(
-      uri,
-      contentType,
-      size,
-      alt,
-      sensitiveContent,
-      serverInfo,
-      contentResolver,
-      onProgress,
-    )
-  }
+    suspend fun uploadImage(
+        uri: Uri,
+        contentType: String?,
+        size: Long?,
+        alt: String?,
+        sensitiveContent: String?,
+        server: Nip96Retriever.ServerInfo,
+        contentResolver: ContentResolver,
+        onProgress: (percentage: Float) -> Unit,
+    ): PartialEvent {
+        checkNotInMainThread()
 
-  suspend fun uploadImage(
-    uri: Uri,
-    contentType: String?,
-    size: Long?,
-    alt: String?,
-    sensitiveContent: String?,
-    server: Nip96Retriever.ServerInfo,
-    contentResolver: ContentResolver,
-    onProgress: (percentage: Float) -> Unit,
-  ): PartialEvent {
-    checkNotInMainThread()
+        val myContentType = contentType ?: contentResolver.getType(uri)
+        val imageInputStream = contentResolver.openInputStream(uri)
 
-    val myContentType = contentType ?: contentResolver.getType(uri)
-    val imageInputStream = contentResolver.openInputStream(uri)
+        val length =
+            size
+                ?: contentResolver.query(uri, null, null, null, null)?.use {
+                    it.moveToFirst()
+                    val sizeIndex = it.getColumnIndex(OpenableColumns.SIZE)
+                    it.getLong(sizeIndex)
+                }
+                ?: kotlin.runCatching { uri.toFile().length() }.getOrNull() ?: 0
 
-    val length =
-      size
-        ?: contentResolver.query(uri, null, null, null, null)?.use {
-          it.moveToFirst()
-          val sizeIndex = it.getColumnIndex(OpenableColumns.SIZE)
-          it.getLong(sizeIndex)
-        }
-          ?: kotlin.runCatching { uri.toFile().length() }.getOrNull() ?: 0
+        checkNotNull(imageInputStream) { "Can't open the image input stream" }
 
-    checkNotNull(imageInputStream) { "Can't open the image input stream" }
+        return uploadImage(
+            imageInputStream,
+            length,
+            myContentType,
+            alt,
+            sensitiveContent,
+            server,
+            onProgress,
+        )
+    }
 
-    return uploadImage(
-      imageInputStream,
-      length,
-      myContentType,
-      alt,
-      sensitiveContent,
-      server,
-      onProgress,
-    )
-  }
+    suspend fun uploadImage(
+        inputStream: InputStream,
+        length: Long,
+        contentType: String?,
+        alt: String?,
+        sensitiveContent: String?,
+        server: Nip96Retriever.ServerInfo,
+        onProgress: (percentage: Float) -> Unit,
+    ): PartialEvent {
+        checkNotInMainThread()
 
-  suspend fun uploadImage(
-    inputStream: InputStream,
-    length: Long,
-    contentType: String?,
-    alt: String?,
-    sensitiveContent: String?,
-    server: Nip96Retriever.ServerInfo,
-    onProgress: (percentage: Float) -> Unit,
-  ): PartialEvent {
-    checkNotInMainThread()
+        val fileName = randomChars()
+        val extension =
+            contentType?.let { MimeTypeMap.getSingleton().getExtensionFromMimeType(it) } ?: ""
 
-    val fileName = randomChars()
-    val extension =
-      contentType?.let { MimeTypeMap.getSingleton().getExtensionFromMimeType(it) } ?: ""
+        val client = HttpClient.getHttpClient()
+        val requestBody: RequestBody
+        val requestBuilder = Request.Builder()
 
-    val client = HttpClient.getHttpClient()
-    val requestBody: RequestBody
-    val requestBuilder = Request.Builder()
+        requestBody =
+            MultipartBody.Builder()
+                .setType(MultipartBody.FORM)
+                .addFormDataPart("expiration", "")
+                .addFormDataPart("size", length.toString())
+                .also { body ->
+                    alt?.let { body.addFormDataPart("alt", it) }
+                    sensitiveContent?.let { body.addFormDataPart("content-warning", it) }
+                    contentType?.let { body.addFormDataPart("content_type", it) }
+                }
+                .addFormDataPart(
+                    "file",
+                    "$fileName.$extension",
+                    object : RequestBody() {
+                        override fun contentType() = contentType?.toMediaType()
 
-    requestBody =
-      MultipartBody.Builder()
-        .setType(MultipartBody.FORM)
-        .addFormDataPart("expiration", "")
-        .addFormDataPart("size", length.toString())
-        .also { body ->
-          alt?.let { body.addFormDataPart("alt", it) }
-          sensitiveContent?.let { body.addFormDataPart("content-warning", it) }
-          contentType?.let { body.addFormDataPart("content_type", it) }
-        }
-        .addFormDataPart(
-          "file",
-          "$fileName.$extension",
-          object : RequestBody() {
-            override fun contentType() = contentType?.toMediaType()
+                        override fun contentLength() = length
 
-            override fun contentLength() = length
+                        override fun writeTo(sink: BufferedSink) {
+                            inputStream.source().use(sink::writeAll)
+                        }
+                    },
+                )
+                .build()
 
-            override fun writeTo(sink: BufferedSink) {
-              inputStream.source().use(sink::writeAll)
+        nip98Header(server.apiUrl)?.let { requestBuilder.addHeader("Authorization", it) }
+
+        requestBuilder
+            .addHeader("User-Agent", "Amethyst/${BuildConfig.VERSION_NAME}")
+            .url(server.apiUrl)
+            .post(requestBody)
+
+        val request = requestBuilder.build()
+
+        client.newCall(request).execute().use { response ->
+            if (response.isSuccessful) {
+                response.body.use { body ->
+                    val str = body.string()
+                    val result = parseResults(str)
+
+                    if (!result.processingUrl.isNullOrBlank()) {
+                        return waitProcessing(result, server, onProgress)
+                    } else if (result.status == "success" && result.nip94Event != null) {
+                        return result.nip94Event
+                    } else {
+                        throw RuntimeException("Failed to upload with message: ${result.message}")
+                    }
+                }
+            } else {
+                throw RuntimeException("Error Uploading image: ${response.code}")
             }
-          },
-        )
-        .build()
-
-    nip98Header(server.apiUrl)?.let { requestBuilder.addHeader("Authorization", it) }
-
-    requestBuilder
-      .addHeader("User-Agent", "Amethyst/${BuildConfig.VERSION_NAME}")
-      .url(server.apiUrl)
-      .post(requestBody)
-
-    val request = requestBuilder.build()
-
-    client.newCall(request).execute().use { response ->
-      if (response.isSuccessful) {
-        response.body.use { body ->
-          val str = body.string()
-          val result = parseResults(str)
-
-          if (!result.processingUrl.isNullOrBlank()) {
-            return waitProcessing(result, server, onProgress)
-          } else if (result.status == "success" && result.nip94Event != null) {
-            return result.nip94Event
-          } else {
-            throw RuntimeException("Failed to upload with message: ${result.message}")
-          }
         }
-      } else {
-        throw RuntimeException("Error Uploading image: ${response.code}")
-      }
     }
-  }
 
-  suspend fun delete(
-    hash: String,
-    contentType: String?,
-    server: Nip96Retriever.ServerInfo,
-  ): Boolean {
-    val extension =
-      contentType?.let { MimeTypeMap.getSingleton().getExtensionFromMimeType(it) } ?: ""
+    suspend fun delete(
+        hash: String,
+        contentType: String?,
+        server: Nip96Retriever.ServerInfo,
+    ): Boolean {
+        val extension =
+            contentType?.let { MimeTypeMap.getSingleton().getExtensionFromMimeType(it) } ?: ""
 
-    val client = HttpClient.getHttpClient()
+        val client = HttpClient.getHttpClient()
 
-    val requestBuilder = Request.Builder()
+        val requestBuilder = Request.Builder()
 
-    nip98Header(server.apiUrl)?.let { requestBuilder.addHeader("Authorization", it) }
+        nip98Header(server.apiUrl)?.let { requestBuilder.addHeader("Authorization", it) }
 
-    println(server.apiUrl.removeSuffix("/") + "/$hash.$extension")
+        println(server.apiUrl.removeSuffix("/") + "/$hash.$extension")
 
-    val request =
-      requestBuilder
-        .header("User-Agent", "Amethyst/${BuildConfig.VERSION_NAME}")
-        .url(server.apiUrl.removeSuffix("/") + "/$hash.$extension")
-        .delete()
-        .build()
+        val request =
+            requestBuilder
+                .header("User-Agent", "Amethyst/${BuildConfig.VERSION_NAME}")
+                .url(server.apiUrl.removeSuffix("/") + "/$hash.$extension")
+                .delete()
+                .build()
 
-    client.newCall(request).execute().use { response ->
-      if (response.isSuccessful) {
-        response.body.use { body ->
-          val str = body.string()
-          val result = parseDeleteResults(str)
-          return result.status == "success"
+        client.newCall(request).execute().use { response ->
+            if (response.isSuccessful) {
+                response.body.use { body ->
+                    val str = body.string()
+                    val result = parseDeleteResults(str)
+                    return result.status == "success"
+                }
+            } else {
+                throw RuntimeException("Error Uploading image: ${response.code}")
+            }
         }
-      } else {
-        throw RuntimeException("Error Uploading image: ${response.code}")
-      }
     }
-  }
 
-  private suspend fun waitProcessing(
-    result: Nip96Result,
-    server: Nip96Retriever.ServerInfo,
-    onProgress: (percentage: Float) -> Unit,
-  ): PartialEvent {
-    val client = HttpClient.getHttpClient()
-    var currentResult = result
+    private suspend fun waitProcessing(
+        result: Nip96Result,
+        server: Nip96Retriever.ServerInfo,
+        onProgress: (percentage: Float) -> Unit,
+    ): PartialEvent {
+        val client = HttpClient.getHttpClient()
+        var currentResult = result
 
-    while (!result.processingUrl.isNullOrBlank() && (currentResult.percentage ?: 100) < 100) {
-      onProgress((currentResult.percentage ?: 100) / 100f)
+        while (!result.processingUrl.isNullOrBlank() && (currentResult.percentage ?: 100) < 100) {
+            onProgress((currentResult.percentage ?: 100) / 100f)
 
-      val request: Request =
-        Request.Builder()
-          .header("User-Agent", "Amethyst/${BuildConfig.VERSION_NAME}")
-          .url(result.processingUrl)
-          .build()
+            val request: Request =
+                Request.Builder()
+                    .header("User-Agent", "Amethyst/${BuildConfig.VERSION_NAME}")
+                    .url(result.processingUrl)
+                    .build()
 
-      client.newCall(request).execute().use {
-        if (it.isSuccessful) {
-          it.body.use { currentResult = parseResults(it.string()) }
+            client.newCall(request).execute().use {
+                if (it.isSuccessful) {
+                    it.body.use { currentResult = parseResults(it.string()) }
+                }
+            }
+
+            delay(500)
         }
-      }
+        onProgress((currentResult.percentage ?: 100) / 100f)
 
-      delay(500)
-    }
-    onProgress((currentResult.percentage ?: 100) / 100f)
+        val nip94 = currentResult.nip94Event
 
-    val nip94 = currentResult.nip94Event
-
-    if (nip94 != null) {
-      return nip94
-    } else {
-      throw RuntimeException("Error waiting for processing. Final result is unavailable")
-    }
-  }
-
-  suspend fun nip98Header(url: String): String? {
-    return withTimeoutOrNull(5000) {
-      suspendCancellableCoroutine { continuation ->
-        nip98Header(url, "POST") { authorizationToken -> continuation.resume(authorizationToken) }
-      }
-    }
-  }
-
-  fun nip98Header(
-    url: String,
-    method: String,
-    file: ByteArray? = null,
-    onReady: (String?) -> Unit,
-  ) {
-    val myAccount = account
-
-    if (myAccount == null) {
-      onReady(null)
-      return
+        if (nip94 != null) {
+            return nip94
+        } else {
+            throw RuntimeException("Error waiting for processing. Final result is unavailable")
+        }
     }
 
-    myAccount.createHTTPAuthorization(url, method, file) {
-      val encodedNIP98Event = Base64.getEncoder().encodeToString(it.toJson().toByteArray())
-      onReady("Nostr $encodedNIP98Event")
+    suspend fun nip98Header(url: String): String? {
+        return withTimeoutOrNull(5000) {
+            suspendCancellableCoroutine { continuation ->
+                nip98Header(url, "POST") { authorizationToken -> continuation.resume(authorizationToken) }
+            }
+        }
     }
-  }
 
-  data class DeleteResult(
-    val status: String?,
-    val message: String?,
-  )
+    fun nip98Header(
+        url: String,
+        method: String,
+        file: ByteArray? = null,
+        onReady: (String?) -> Unit,
+    ) {
+        val myAccount = account
 
-  private fun parseDeleteResults(body: String): DeleteResult {
-    val mapper =
-      jacksonObjectMapper().configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
-    return mapper.readValue(body, DeleteResult::class.java)
-  }
+        if (myAccount == null) {
+            onReady(null)
+            return
+        }
 
-  data class Nip96Result(
-    val status: String? = null,
-    val message: String? = null,
-    @JsonProperty("processing_url") val processingUrl: String? = null,
-    val percentage: Int? = null,
-    @JsonProperty("nip94_event") val nip94Event: PartialEvent? = null,
-  )
+        myAccount.createHTTPAuthorization(url, method, file) {
+            val encodedNIP98Event = Base64.getEncoder().encodeToString(it.toJson().toByteArray())
+            onReady("Nostr $encodedNIP98Event")
+        }
+    }
 
-  class PartialEvent(
-    val tags: Array<Array<String>>? = null,
-    val content: String? = null,
-  )
+    data class DeleteResult(
+        val status: String?,
+        val message: String?,
+    )
 
-  private fun parseResults(body: String): Nip96Result {
-    val mapper =
-      jacksonObjectMapper().configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
-    return mapper.readValue(body, Nip96Result::class.java)
-  }
+    private fun parseDeleteResults(body: String): DeleteResult {
+        val mapper =
+            jacksonObjectMapper().configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
+        return mapper.readValue(body, DeleteResult::class.java)
+    }
+
+    data class Nip96Result(
+        val status: String? = null,
+        val message: String? = null,
+        @JsonProperty("processing_url") val processingUrl: String? = null,
+        val percentage: Int? = null,
+        @JsonProperty("nip94_event") val nip94Event: PartialEvent? = null,
+    )
+
+    class PartialEvent(
+        val tags: Array<Array<String>>? = null,
+        val content: String? = null,
+    )
+
+    private fun parseResults(body: String): Nip96Result {
+        val mapper =
+            jacksonObjectMapper().configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
+        return mapper.readValue(body, Nip96Result::class.java)
+    }
 }

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

@@ -58,289 +58,290 @@ import com.vitorpamplona.quartz.utils.TimeUtils
 
 // TODO: Migrate this to a property of AccountVi
 object NostrAccountDataSource : NostrDataSource("AccountData") {
-  lateinit var account: Account
-  var otherAccounts = listOf<HexKey>()
+    lateinit var account: Account
+    var otherAccounts = listOf<HexKey>()
 
-  val latestEOSEs = EOSEAccount()
-  val hasLoadedTheBasics = mutableMapOf<User, Boolean>()
+    val latestEOSEs = EOSEAccount()
+    val hasLoadedTheBasics = mutableMapOf<User, Boolean>()
 
-  fun createAccountContactListFilter(): TypedFilter {
-    return TypedFilter(
-      types = COMMON_FEED_TYPES,
-      filter =
-        JsonFilter(
-          kinds = listOf(ContactListEvent.KIND),
-          authors = listOf(account.userProfile().pubkeyHex),
-          limit = 1,
-        ),
-    )
-  }
-
-  fun createAccountMetadataFilter(): TypedFilter {
-    return TypedFilter(
-      types = COMMON_FEED_TYPES,
-      filter =
-        JsonFilter(
-          kinds = listOf(MetadataEvent.KIND),
-          authors = listOf(account.userProfile().pubkeyHex),
-          limit = 1,
-        ),
-    )
-  }
-
-  fun createAccountRelayListFilter(): TypedFilter {
-    return TypedFilter(
-      types = COMMON_FEED_TYPES,
-      filter =
-        JsonFilter(
-          kinds = listOf(AdvertisedRelayListEvent.KIND, StatusEvent.KIND),
-          authors = listOf(account.userProfile().pubkeyHex),
-          limit = 5,
-        ),
-    )
-  }
-
-  fun createOtherAccountsBaseFilter(): TypedFilter? {
-    if (otherAccounts.isEmpty()) return null
-    return TypedFilter(
-      types = COMMON_FEED_TYPES,
-      filter =
-        JsonFilter(
-          kinds =
-            listOf(
-              MetadataEvent.KIND,
-              ContactListEvent.KIND,
-              AdvertisedRelayListEvent.KIND,
-              MuteListEvent.KIND,
-              PeopleListEvent.KIND,
-            ),
-          authors = otherAccounts.filter { it != account.userProfile().pubkeyHex },
-          limit = 100,
-        ),
-    )
-  }
-
-  fun createAccountAcceptedAwardsFilter(): TypedFilter {
-    return TypedFilter(
-      types = COMMON_FEED_TYPES,
-      filter =
-        JsonFilter(
-          kinds = listOf(BadgeProfilesEvent.KIND, EmojiPackSelectionEvent.KIND),
-          authors = listOf(account.userProfile().pubkeyHex),
-          limit = 10,
-        ),
-    )
-  }
-
-  fun createAccountBookmarkListFilter(): TypedFilter {
-    return TypedFilter(
-      types = COMMON_FEED_TYPES,
-      filter =
-        JsonFilter(
-          kinds = listOf(BookmarkListEvent.KIND, PeopleListEvent.KIND, MuteListEvent.KIND),
-          authors = listOf(account.userProfile().pubkeyHex),
-          limit = 100,
-        ),
-    )
-  }
-
-  fun createAccountReportsFilter(): TypedFilter {
-    return TypedFilter(
-      types = COMMON_FEED_TYPES,
-      filter =
-        JsonFilter(
-          kinds = listOf(ReportEvent.KIND),
-          authors = listOf(account.userProfile().pubkeyHex),
-          since =
-            latestEOSEs.users[account.userProfile()]
-              ?.followList
-              ?.get(account.defaultNotificationFollowList.value)
-              ?.relayList,
-        ),
-    )
-  }
-
-  fun createAccountLastPostsListFilter(): TypedFilter {
-    return TypedFilter(
-      types = COMMON_FEED_TYPES,
-      filter =
-        JsonFilter(
-          authors = listOf(account.userProfile().pubkeyHex),
-          limit = 400,
-        ),
-    )
-  }
-
-  fun createNotificationFilter(): TypedFilter {
-    val since =
-      latestEOSEs.users[account.userProfile()]
-        ?.followList
-        ?.get(account.defaultNotificationFollowList.value)
-        ?.relayList
-        ?: account.activeRelays()?.associate { it.url to EOSETime(TimeUtils.oneWeekAgo()) }
-          ?: account.convertLocalRelays().associate { it.url to EOSETime(TimeUtils.oneWeekAgo()) }
-
-    return TypedFilter(
-      types = COMMON_FEED_TYPES,
-      filter =
-        JsonFilter(
-          kinds =
-            listOf(
-              TextNoteEvent.KIND,
-              PollNoteEvent.KIND,
-              ReactionEvent.KIND,
-              RepostEvent.KIND,
-              GenericRepostEvent.KIND,
-              ReportEvent.KIND,
-              LnZapEvent.KIND,
-              LnZapPaymentResponseEvent.KIND,
-              ChannelMessageEvent.KIND,
-              BadgeAwardEvent.KIND,
-            ),
-          tags = mapOf("p" to listOf(account.userProfile().pubkeyHex)),
-          limit = 4000,
-          since = since,
-        ),
-    )
-  }
-
-  fun createGiftWrapsToMeFilter() =
-    TypedFilter(
-      types = COMMON_FEED_TYPES,
-      filter =
-        JsonFilter(
-          kinds = listOf(GiftWrapEvent.KIND),
-          tags = mapOf("p" to listOf(account.userProfile().pubkeyHex)),
-        ),
-    )
-
-  val accountChannel = requestNewChannel { time, relayUrl ->
-    if (hasLoadedTheBasics[account.userProfile()] != null) {
-      latestEOSEs.addOrUpdate(
-        account.userProfile(),
-        account.defaultNotificationFollowList.value,
-        relayUrl,
-        time,
-      )
-    } else {
-      hasLoadedTheBasics[account.userProfile()] = true
-
-      invalidateFilters()
-    }
-  }
-
-  override fun consume(
-    event: Event,
-    relay: Relay,
-  ) {
-    checkNotInMainThread()
-
-    if (LocalCache.justVerify(event)) {
-      if (event is GiftWrapEvent) {
-        // Avoid decrypting over and over again if the event already exist.
-        val note = LocalCache.getNoteIfExists(event.id)
-        if (note != null && relay.brief in note.relays) return
-
-        event.cachedGift(account.signer) { this.consume(it, relay) }
-      }
-
-      if (event is SealedGossipEvent) {
-        // Avoid decrypting over and over again if the event already exist.
-        val note = LocalCache.getNoteIfExists(event.id)
-        if (note != null && relay.brief in note.relays) return
-
-        event.cachedGossip(account.signer) { LocalCache.justConsume(it, relay) }
-      } else {
-        LocalCache.justConsume(event, relay)
-      }
-    }
-  }
-
-  override fun markAsSeenOnRelay(
-    eventId: String,
-    relay: Relay,
-  ) {
-    checkNotInMainThread()
-
-    super.markAsSeenOnRelay(eventId, relay)
-
-    val note = LocalCache.getNoteIfExists(eventId) ?: return
-    val privKey = account.keyPair.privKey ?: return
-
-    val noteEvent = note.event ?: return
-    markInnerAsSeenOnRelay(noteEvent, privKey, relay)
-  }
-
-  private fun markInnerAsSeenOnRelay(
-    noteEvent: EventInterface,
-    privKey: ByteArray,
-    relay: Relay,
-  ) {
-    LocalCache.getNoteIfExists(noteEvent.id())?.addRelay(relay)
-
-    if (noteEvent is GiftWrapEvent) {
-      noteEvent.cachedGift(account.signer) { gift -> markInnerAsSeenOnRelay(gift, privKey, relay) }
-    } else if (noteEvent is SealedGossipEvent) {
-      noteEvent.cachedGossip(account.signer) { rumor ->
-        markInnerAsSeenOnRelay(rumor, privKey, relay)
-      }
-    }
-  }
-
-  override fun updateChannelFilters() {
-    return if (hasLoadedTheBasics[account.userProfile()] != null) {
-      // gets everything about the user logged in
-      accountChannel.typedFilters =
-        listOfNotNull(
-            createAccountMetadataFilter(),
-            createAccountContactListFilter(),
-            createAccountRelayListFilter(),
-            createNotificationFilter(),
-            createGiftWrapsToMeFilter(),
-            createAccountReportsFilter(),
-            createAccountAcceptedAwardsFilter(),
-            createAccountBookmarkListFilter(),
-            createAccountLastPostsListFilter(),
-            createOtherAccountsBaseFilter(),
-          )
-          .ifEmpty { null }
-    } else {
-      // just the basics.
-      accountChannel.typedFilters =
-        listOf(
-            createAccountMetadataFilter(),
-            createAccountContactListFilter(),
-            createAccountRelayListFilter(),
-            createAccountBookmarkListFilter(),
-          )
-          .ifEmpty { null }
-    }
-  }
-
-  override fun auth(
-    relay: Relay,
-    challenge: String,
-  ) {
-    super.auth(relay, challenge)
-
-    if (this::account.isInitialized) {
-      account.createAuthEvent(relay, challenge) {
-        Client.send(
-          it,
-          relay.url,
+    fun createAccountContactListFilter(): TypedFilter {
+        return TypedFilter(
+            types = COMMON_FEED_TYPES,
+            filter =
+                JsonFilter(
+                    kinds = listOf(ContactListEvent.KIND),
+                    authors = listOf(account.userProfile().pubkeyHex),
+                    limit = 1,
+                ),
         )
-      }
     }
-  }
 
-  override fun notify(
-    relay: Relay,
-    description: String,
-  ) {
-    super.notify(relay, description)
-
-    if (this::account.isInitialized) {
-      account.addPaymentRequestIfNew(Account.PaymentRequest(relay.url, description))
+    fun createAccountMetadataFilter(): TypedFilter {
+        return TypedFilter(
+            types = COMMON_FEED_TYPES,
+            filter =
+                JsonFilter(
+                    kinds = listOf(MetadataEvent.KIND),
+                    authors = listOf(account.userProfile().pubkeyHex),
+                    limit = 1,
+                ),
+        )
+    }
+
+    fun createAccountRelayListFilter(): TypedFilter {
+        return TypedFilter(
+            types = COMMON_FEED_TYPES,
+            filter =
+                JsonFilter(
+                    kinds = listOf(AdvertisedRelayListEvent.KIND, StatusEvent.KIND),
+                    authors = listOf(account.userProfile().pubkeyHex),
+                    limit = 5,
+                ),
+        )
+    }
+
+    fun createOtherAccountsBaseFilter(): TypedFilter? {
+        if (otherAccounts.isEmpty()) return null
+        return TypedFilter(
+            types = COMMON_FEED_TYPES,
+            filter =
+                JsonFilter(
+                    kinds =
+                        listOf(
+                            MetadataEvent.KIND,
+                            ContactListEvent.KIND,
+                            AdvertisedRelayListEvent.KIND,
+                            MuteListEvent.KIND,
+                            PeopleListEvent.KIND,
+                        ),
+                    authors = otherAccounts.filter { it != account.userProfile().pubkeyHex },
+                    limit = 100,
+                ),
+        )
+    }
+
+    fun createAccountAcceptedAwardsFilter(): TypedFilter {
+        return TypedFilter(
+            types = COMMON_FEED_TYPES,
+            filter =
+                JsonFilter(
+                    kinds = listOf(BadgeProfilesEvent.KIND, EmojiPackSelectionEvent.KIND),
+                    authors = listOf(account.userProfile().pubkeyHex),
+                    limit = 10,
+                ),
+        )
+    }
+
+    fun createAccountBookmarkListFilter(): TypedFilter {
+        return TypedFilter(
+            types = COMMON_FEED_TYPES,
+            filter =
+                JsonFilter(
+                    kinds = listOf(BookmarkListEvent.KIND, PeopleListEvent.KIND, MuteListEvent.KIND),
+                    authors = listOf(account.userProfile().pubkeyHex),
+                    limit = 100,
+                ),
+        )
+    }
+
+    fun createAccountReportsFilter(): TypedFilter {
+        return TypedFilter(
+            types = COMMON_FEED_TYPES,
+            filter =
+                JsonFilter(
+                    kinds = listOf(ReportEvent.KIND),
+                    authors = listOf(account.userProfile().pubkeyHex),
+                    since =
+                        latestEOSEs.users[account.userProfile()]
+                            ?.followList
+                            ?.get(account.defaultNotificationFollowList.value)
+                            ?.relayList,
+                ),
+        )
+    }
+
+    fun createAccountLastPostsListFilter(): TypedFilter {
+        return TypedFilter(
+            types = COMMON_FEED_TYPES,
+            filter =
+                JsonFilter(
+                    authors = listOf(account.userProfile().pubkeyHex),
+                    limit = 400,
+                ),
+        )
+    }
+
+    fun createNotificationFilter(): TypedFilter {
+        val since =
+            latestEOSEs.users[account.userProfile()]
+                ?.followList
+                ?.get(account.defaultNotificationFollowList.value)
+                ?.relayList
+                ?: account.activeRelays()?.associate { it.url to EOSETime(TimeUtils.oneWeekAgo()) }
+                ?: account.convertLocalRelays().associate { it.url to EOSETime(TimeUtils.oneWeekAgo()) }
+
+        return TypedFilter(
+            types = COMMON_FEED_TYPES,
+            filter =
+                JsonFilter(
+                    kinds =
+                        listOf(
+                            TextNoteEvent.KIND,
+                            PollNoteEvent.KIND,
+                            ReactionEvent.KIND,
+                            RepostEvent.KIND,
+                            GenericRepostEvent.KIND,
+                            ReportEvent.KIND,
+                            LnZapEvent.KIND,
+                            LnZapPaymentResponseEvent.KIND,
+                            ChannelMessageEvent.KIND,
+                            BadgeAwardEvent.KIND,
+                        ),
+                    tags = mapOf("p" to listOf(account.userProfile().pubkeyHex)),
+                    limit = 4000,
+                    since = since,
+                ),
+        )
+    }
+
+    fun createGiftWrapsToMeFilter() =
+        TypedFilter(
+            types = COMMON_FEED_TYPES,
+            filter =
+                JsonFilter(
+                    kinds = listOf(GiftWrapEvent.KIND),
+                    tags = mapOf("p" to listOf(account.userProfile().pubkeyHex)),
+                ),
+        )
+
+    val accountChannel =
+        requestNewChannel { time, relayUrl ->
+            if (hasLoadedTheBasics[account.userProfile()] != null) {
+                latestEOSEs.addOrUpdate(
+                    account.userProfile(),
+                    account.defaultNotificationFollowList.value,
+                    relayUrl,
+                    time,
+                )
+            } else {
+                hasLoadedTheBasics[account.userProfile()] = true
+
+                invalidateFilters()
+            }
+        }
+
+    override fun consume(
+        event: Event,
+        relay: Relay,
+    ) {
+        checkNotInMainThread()
+
+        if (LocalCache.justVerify(event)) {
+            if (event is GiftWrapEvent) {
+                // Avoid decrypting over and over again if the event already exist.
+                val note = LocalCache.getNoteIfExists(event.id)
+                if (note != null && relay.brief in note.relays) return
+
+                event.cachedGift(account.signer) { this.consume(it, relay) }
+            }
+
+            if (event is SealedGossipEvent) {
+                // Avoid decrypting over and over again if the event already exist.
+                val note = LocalCache.getNoteIfExists(event.id)
+                if (note != null && relay.brief in note.relays) return
+
+                event.cachedGossip(account.signer) { LocalCache.justConsume(it, relay) }
+            } else {
+                LocalCache.justConsume(event, relay)
+            }
+        }
+    }
+
+    override fun markAsSeenOnRelay(
+        eventId: String,
+        relay: Relay,
+    ) {
+        checkNotInMainThread()
+
+        super.markAsSeenOnRelay(eventId, relay)
+
+        val note = LocalCache.getNoteIfExists(eventId) ?: return
+        val privKey = account.keyPair.privKey ?: return
+
+        val noteEvent = note.event ?: return
+        markInnerAsSeenOnRelay(noteEvent, privKey, relay)
+    }
+
+    private fun markInnerAsSeenOnRelay(
+        noteEvent: EventInterface,
+        privKey: ByteArray,
+        relay: Relay,
+    ) {
+        LocalCache.getNoteIfExists(noteEvent.id())?.addRelay(relay)
+
+        if (noteEvent is GiftWrapEvent) {
+            noteEvent.cachedGift(account.signer) { gift -> markInnerAsSeenOnRelay(gift, privKey, relay) }
+        } else if (noteEvent is SealedGossipEvent) {
+            noteEvent.cachedGossip(account.signer) { rumor ->
+                markInnerAsSeenOnRelay(rumor, privKey, relay)
+            }
+        }
+    }
+
+    override fun updateChannelFilters() {
+        return if (hasLoadedTheBasics[account.userProfile()] != null) {
+            // gets everything about the user logged in
+            accountChannel.typedFilters =
+                listOfNotNull(
+                    createAccountMetadataFilter(),
+                    createAccountContactListFilter(),
+                    createAccountRelayListFilter(),
+                    createNotificationFilter(),
+                    createGiftWrapsToMeFilter(),
+                    createAccountReportsFilter(),
+                    createAccountAcceptedAwardsFilter(),
+                    createAccountBookmarkListFilter(),
+                    createAccountLastPostsListFilter(),
+                    createOtherAccountsBaseFilter(),
+                )
+                    .ifEmpty { null }
+        } else {
+            // just the basics.
+            accountChannel.typedFilters =
+                listOf(
+                    createAccountMetadataFilter(),
+                    createAccountContactListFilter(),
+                    createAccountRelayListFilter(),
+                    createAccountBookmarkListFilter(),
+                )
+                    .ifEmpty { null }
+        }
+    }
+
+    override fun auth(
+        relay: Relay,
+        challenge: String,
+    ) {
+        super.auth(relay, challenge)
+
+        if (this::account.isInitialized) {
+            account.createAuthEvent(relay, challenge) {
+                Client.send(
+                    it,
+                    relay.url,
+                )
+            }
+        }
+    }
+
+    override fun notify(
+        relay: Relay,
+        description: String,
+    ) {
+        super.notify(relay, description)
+
+        if (this::account.isInitialized) {
+            account.addPaymentRequestIfNew(Account.PaymentRequest(relay.url, description))
+        }
     }
-  }
 }

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

@@ -31,89 +31,89 @@ import com.vitorpamplona.quartz.events.ChannelMessageEvent
 import com.vitorpamplona.quartz.events.LiveActivitiesChatMessageEvent
 
 object NostrChannelDataSource : NostrDataSource("ChatroomFeed") {
-  var account: Account? = null
-  var channel: Channel? = null
+    var account: Account? = null
+    var channel: Channel? = null
 
-  fun loadMessagesBetween(
-    account: Account,
-    channel: Channel,
-  ) {
-    this.account = account
-    this.channel = channel
-    resetFilters()
-  }
-
-  fun clear() {
-    account = null
-    channel = null
-  }
-
-  fun createMessagesByMeToChannelFilter(): TypedFilter? {
-    val myAccount = account ?: return null
-
-    if (channel is PublicChatChannel) {
-      // Brings on messages by the user from all other relays.
-      // Since we ship with write to public, read from private only
-      // this guarantees that messages from the author do not disappear.
-      return TypedFilter(
-        types = setOf(FeedType.FOLLOWS, FeedType.PRIVATE_DMS, FeedType.GLOBAL, FeedType.SEARCH),
-        filter =
-          JsonFilter(
-            kinds = listOf(ChannelMessageEvent.KIND),
-            authors = listOf(myAccount.userProfile().pubkeyHex),
-            limit = 50,
-          ),
-      )
-    } else if (channel is LiveActivitiesChannel) {
-      // Brings on messages by the user from all other relays.
-      // Since we ship with write to public, read from private only
-      // this guarantees that messages from the author do not disappear.
-      return TypedFilter(
-        types = setOf(FeedType.FOLLOWS, FeedType.PRIVATE_DMS, FeedType.GLOBAL, FeedType.SEARCH),
-        filter =
-          JsonFilter(
-            kinds = listOf(LiveActivitiesChatMessageEvent.KIND),
-            authors = listOf(myAccount.userProfile().pubkeyHex),
-            limit = 50,
-          ),
-      )
+    fun loadMessagesBetween(
+        account: Account,
+        channel: Channel,
+    ) {
+        this.account = account
+        this.channel = channel
+        resetFilters()
     }
-    return null
-  }
 
-  fun createMessagesToChannelFilter(): TypedFilter? {
-    if (channel is PublicChatChannel) {
-      return TypedFilter(
-        types = setOf(FeedType.PUBLIC_CHATS),
-        filter =
-          JsonFilter(
-            kinds = listOf(ChannelMessageEvent.KIND),
-            tags = mapOf("e" to listOfNotNull(channel?.idHex)),
-            limit = 200,
-          ),
-      )
-    } else if (channel is LiveActivitiesChannel) {
-      return TypedFilter(
-        types = setOf(FeedType.PUBLIC_CHATS),
-        filter =
-          JsonFilter(
-            kinds = listOf(LiveActivitiesChatMessageEvent.KIND),
-            tags = mapOf("a" to listOfNotNull(channel?.idHex)),
-            limit = 200,
-          ),
-      )
+    fun clear() {
+        account = null
+        channel = null
     }
-    return null
-  }
 
-  val messagesChannel = requestNewChannel()
+    fun createMessagesByMeToChannelFilter(): TypedFilter? {
+        val myAccount = account ?: return null
 
-  override fun updateChannelFilters() {
-    messagesChannel.typedFilters =
-      listOfNotNull(
-          createMessagesToChannelFilter(),
-          createMessagesByMeToChannelFilter(),
-        )
-        .ifEmpty { null }
-  }
+        if (channel is PublicChatChannel) {
+            // Brings on messages by the user from all other relays.
+            // Since we ship with write to public, read from private only
+            // this guarantees that messages from the author do not disappear.
+            return TypedFilter(
+                types = setOf(FeedType.FOLLOWS, FeedType.PRIVATE_DMS, FeedType.GLOBAL, FeedType.SEARCH),
+                filter =
+                    JsonFilter(
+                        kinds = listOf(ChannelMessageEvent.KIND),
+                        authors = listOf(myAccount.userProfile().pubkeyHex),
+                        limit = 50,
+                    ),
+            )
+        } else if (channel is LiveActivitiesChannel) {
+            // Brings on messages by the user from all other relays.
+            // Since we ship with write to public, read from private only
+            // this guarantees that messages from the author do not disappear.
+            return TypedFilter(
+                types = setOf(FeedType.FOLLOWS, FeedType.PRIVATE_DMS, FeedType.GLOBAL, FeedType.SEARCH),
+                filter =
+                    JsonFilter(
+                        kinds = listOf(LiveActivitiesChatMessageEvent.KIND),
+                        authors = listOf(myAccount.userProfile().pubkeyHex),
+                        limit = 50,
+                    ),
+            )
+        }
+        return null
+    }
+
+    fun createMessagesToChannelFilter(): TypedFilter? {
+        if (channel is PublicChatChannel) {
+            return TypedFilter(
+                types = setOf(FeedType.PUBLIC_CHATS),
+                filter =
+                    JsonFilter(
+                        kinds = listOf(ChannelMessageEvent.KIND),
+                        tags = mapOf("e" to listOfNotNull(channel?.idHex)),
+                        limit = 200,
+                    ),
+            )
+        } else if (channel is LiveActivitiesChannel) {
+            return TypedFilter(
+                types = setOf(FeedType.PUBLIC_CHATS),
+                filter =
+                    JsonFilter(
+                        kinds = listOf(LiveActivitiesChatMessageEvent.KIND),
+                        tags = mapOf("a" to listOfNotNull(channel?.idHex)),
+                        limit = 200,
+                    ),
+            )
+        }
+        return null
+    }
+
+    val messagesChannel = requestNewChannel()
+
+    override fun updateChannelFilters() {
+        messagesChannel.typedFilters =
+            listOfNotNull(
+                createMessagesToChannelFilter(),
+                createMessagesByMeToChannelFilter(),
+            )
+                .ifEmpty { null }
+    }
 }

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

@@ -29,80 +29,81 @@ import com.vitorpamplona.quartz.events.ChatroomKey
 import com.vitorpamplona.quartz.events.PrivateDmEvent
 
 object NostrChatroomDataSource : NostrDataSource("ChatroomFeed") {
-  lateinit var account: Account
-  private var withRoom: ChatroomKey? = null
+    lateinit var account: Account
+    private var withRoom: ChatroomKey? = null
 
-  private val latestEOSEs = EOSEAccount()
+    private val latestEOSEs = EOSEAccount()
 
-  fun loadMessagesBetween(
-    accountIn: Account,
-    withRoom: ChatroomKey,
-  ) {
-    this.account = accountIn
-    this.withRoom = withRoom
-    resetFilters()
-  }
-
-  fun createMessagesToMeFilter(): TypedFilter? {
-    val myPeer = withRoom
-
-    return if (myPeer != null) {
-      TypedFilter(
-        types = setOf(FeedType.PRIVATE_DMS),
-        filter =
-          JsonFilter(
-            kinds = listOf(PrivateDmEvent.KIND),
-            authors = myPeer.users.map { it },
-            tags = mapOf("p" to listOf(account.userProfile().pubkeyHex)),
-            since =
-              latestEOSEs.users[account.userProfile()]
-                ?.followList
-                ?.get(withRoom.hashCode().toString())
-                ?.relayList,
-          ),
-      )
-    } else {
-      null
+    fun loadMessagesBetween(
+        accountIn: Account,
+        withRoom: ChatroomKey,
+    ) {
+        this.account = accountIn
+        this.withRoom = withRoom
+        resetFilters()
     }
-  }
 
-  fun createMessagesFromMeFilter(): TypedFilter? {
-    val myPeer = withRoom
+    fun createMessagesToMeFilter(): TypedFilter? {
+        val myPeer = withRoom
 
-    return if (myPeer != null) {
-      TypedFilter(
-        types = setOf(FeedType.PRIVATE_DMS),
-        filter =
-          JsonFilter(
-            kinds = listOf(PrivateDmEvent.KIND),
-            authors = listOf(account.userProfile().pubkeyHex),
-            tags = mapOf("p" to myPeer.users.map { it }),
-            since =
-              latestEOSEs.users[account.userProfile()]
-                ?.followList
-                ?.get(withRoom.hashCode().toString())
-                ?.relayList,
-          ),
-      )
-    } else {
-      null
+        return if (myPeer != null) {
+            TypedFilter(
+                types = setOf(FeedType.PRIVATE_DMS),
+                filter =
+                    JsonFilter(
+                        kinds = listOf(PrivateDmEvent.KIND),
+                        authors = myPeer.users.map { it },
+                        tags = mapOf("p" to listOf(account.userProfile().pubkeyHex)),
+                        since =
+                            latestEOSEs.users[account.userProfile()]
+                                ?.followList
+                                ?.get(withRoom.hashCode().toString())
+                                ?.relayList,
+                    ),
+            )
+        } else {
+            null
+        }
     }
-  }
 
-  fun clearEOSEs(account: Account) {
-    latestEOSEs.removeDataFor(account.userProfile())
-  }
+    fun createMessagesFromMeFilter(): TypedFilter? {
+        val myPeer = withRoom
 
-  val inandoutChannel = requestNewChannel { time, relayUrl ->
-    latestEOSEs.addOrUpdate(account.userProfile(), withRoom.hashCode().toString(), relayUrl, time)
-  }
+        return if (myPeer != null) {
+            TypedFilter(
+                types = setOf(FeedType.PRIVATE_DMS),
+                filter =
+                    JsonFilter(
+                        kinds = listOf(PrivateDmEvent.KIND),
+                        authors = listOf(account.userProfile().pubkeyHex),
+                        tags = mapOf("p" to myPeer.users.map { it }),
+                        since =
+                            latestEOSEs.users[account.userProfile()]
+                                ?.followList
+                                ?.get(withRoom.hashCode().toString())
+                                ?.relayList,
+                    ),
+            )
+        } else {
+            null
+        }
+    }
 
-  override fun updateChannelFilters() {
-    inandoutChannel.typedFilters =
-      listOfNotNull(
-          createMessagesToMeFilter(),
-          createMessagesFromMeFilter(),
-        )
-        .ifEmpty { null }
-  }
+    fun clearEOSEs(account: Account) {
+        latestEOSEs.removeDataFor(account.userProfile())
+    }
+
+    val inandoutChannel =
+        requestNewChannel { time, relayUrl ->
+            latestEOSEs.addOrUpdate(account.userProfile(), withRoom.hashCode().toString(), relayUrl, time)
+        }
+
+    override fun updateChannelFilters() {
+        inandoutChannel.typedFilters =
+            listOfNotNull(
+                createMessagesToMeFilter(),
+                createMessagesFromMeFilter(),
+            )
+                .ifEmpty { null }
+    }
 }

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

@@ -32,124 +32,125 @@ import com.vitorpamplona.quartz.events.ChannelMetadataEvent
 import com.vitorpamplona.quartz.events.PrivateDmEvent
 
 object NostrChatroomListDataSource : NostrDataSource("MailBoxFeed") {
-  lateinit var account: Account
+    lateinit var account: Account
 
-  val latestEOSEs = EOSEAccount()
-  val chatRoomList = "ChatroomList"
+    val latestEOSEs = EOSEAccount()
+    val chatRoomList = "ChatroomList"
 
-  fun createMessagesToMeFilter() =
-    TypedFilter(
-      types = setOf(FeedType.PRIVATE_DMS),
-      filter =
-        JsonFilter(
-          kinds = listOf(PrivateDmEvent.KIND),
-          tags = mapOf("p" to listOf(account.userProfile().pubkeyHex)),
-          since =
-            latestEOSEs.users[account.userProfile()]?.followList?.get(chatRoomList)?.relayList,
-        ),
-    )
-
-  fun createMessagesFromMeFilter() =
-    TypedFilter(
-      types = setOf(FeedType.PRIVATE_DMS),
-      filter =
-        JsonFilter(
-          kinds = listOf(PrivateDmEvent.KIND),
-          authors = listOf(account.userProfile().pubkeyHex),
-          since =
-            latestEOSEs.users[account.userProfile()]?.followList?.get(chatRoomList)?.relayList,
-        ),
-    )
-
-  fun createChannelsCreatedbyMeFilter() =
-    TypedFilter(
-      types = setOf(FeedType.PUBLIC_CHATS),
-      filter =
-        JsonFilter(
-          kinds = listOf(ChannelCreateEvent.KIND, ChannelMetadataEvent.KIND),
-          authors = listOf(account.userProfile().pubkeyHex),
-          since =
-            latestEOSEs.users[account.userProfile()]?.followList?.get(chatRoomList)?.relayList,
-        ),
-    )
-
-  fun createMyChannelsFilter(): TypedFilter? {
-    val followingEvents = account.selectedChatsFollowList()
-
-    if (followingEvents.isEmpty()) return null
-
-    return TypedFilter(
-      // Metadata comes from any relay
-      types = COMMON_FEED_TYPES,
-      filter =
-        JsonFilter(
-          kinds = listOf(ChannelCreateEvent.KIND),
-          ids = followingEvents.toList(),
-          since =
-            latestEOSEs.users[account.userProfile()]?.followList?.get(chatRoomList)?.relayList,
-        ),
-    )
-  }
-
-  fun createLastChannelInfoFilter(): List<TypedFilter>? {
-    val followingEvents = account.selectedChatsFollowList()
-
-    if (followingEvents.isEmpty()) return null
-
-    return followingEvents.map {
-      TypedFilter(
-        // Metadata comes from any relay
-        types = COMMON_FEED_TYPES,
-        filter =
-          JsonFilter(
-            kinds = listOf(ChannelMetadataEvent.KIND),
-            tags = mapOf("e" to listOf(it)),
-            limit = 1,
-          ),
-      )
-    }
-  }
-
-  fun createLastMessageOfEachChannelFilter(): List<TypedFilter>? {
-    val followingEvents = account.selectedChatsFollowList()
-
-    if (followingEvents.isEmpty()) return null
-
-    return followingEvents.map {
-      TypedFilter(
-        types = setOf(FeedType.PUBLIC_CHATS),
-        filter =
-          JsonFilter(
-            kinds = listOf(ChannelMessageEvent.KIND),
-            tags = mapOf("e" to listOf(it)),
-            since =
-              latestEOSEs.users[account.userProfile()]?.followList?.get(chatRoomList)?.relayList,
-            // Remember to consider spam that is being removed from the UI
-            limit = 50,
-          ),
-      )
-    }
-  }
-
-  val chatroomListChannel = requestNewChannel { time, relayUrl ->
-    latestEOSEs.addOrUpdate(account.userProfile(), chatRoomList, relayUrl, time)
-  }
-
-  override fun updateChannelFilters() {
-    val list =
-      listOfNotNull(
-        createMessagesToMeFilter(),
-        createMessagesFromMeFilter(),
-        createMyChannelsFilter(),
-      )
-
-    chatroomListChannel.typedFilters =
-      listOfNotNull(
-          list,
-          createLastChannelInfoFilter(),
-          createLastMessageOfEachChannelFilter(),
+    fun createMessagesToMeFilter() =
+        TypedFilter(
+            types = setOf(FeedType.PRIVATE_DMS),
+            filter =
+                JsonFilter(
+                    kinds = listOf(PrivateDmEvent.KIND),
+                    tags = mapOf("p" to listOf(account.userProfile().pubkeyHex)),
+                    since =
+                        latestEOSEs.users[account.userProfile()]?.followList?.get(chatRoomList)?.relayList,
+                ),
         )
-        .flatten()
-        .ifEmpty { null }
-  }
+
+    fun createMessagesFromMeFilter() =
+        TypedFilter(
+            types = setOf(FeedType.PRIVATE_DMS),
+            filter =
+                JsonFilter(
+                    kinds = listOf(PrivateDmEvent.KIND),
+                    authors = listOf(account.userProfile().pubkeyHex),
+                    since =
+                        latestEOSEs.users[account.userProfile()]?.followList?.get(chatRoomList)?.relayList,
+                ),
+        )
+
+    fun createChannelsCreatedbyMeFilter() =
+        TypedFilter(
+            types = setOf(FeedType.PUBLIC_CHATS),
+            filter =
+                JsonFilter(
+                    kinds = listOf(ChannelCreateEvent.KIND, ChannelMetadataEvent.KIND),
+                    authors = listOf(account.userProfile().pubkeyHex),
+                    since =
+                        latestEOSEs.users[account.userProfile()]?.followList?.get(chatRoomList)?.relayList,
+                ),
+        )
+
+    fun createMyChannelsFilter(): TypedFilter? {
+        val followingEvents = account.selectedChatsFollowList()
+
+        if (followingEvents.isEmpty()) return null
+
+        return TypedFilter(
+            // Metadata comes from any relay
+            types = COMMON_FEED_TYPES,
+            filter =
+                JsonFilter(
+                    kinds = listOf(ChannelCreateEvent.KIND),
+                    ids = followingEvents.toList(),
+                    since =
+                        latestEOSEs.users[account.userProfile()]?.followList?.get(chatRoomList)?.relayList,
+                ),
+        )
+    }
+
+    fun createLastChannelInfoFilter(): List<TypedFilter>? {
+        val followingEvents = account.selectedChatsFollowList()
+
+        if (followingEvents.isEmpty()) return null
+
+        return followingEvents.map {
+            TypedFilter(
+                // Metadata comes from any relay
+                types = COMMON_FEED_TYPES,
+                filter =
+                    JsonFilter(
+                        kinds = listOf(ChannelMetadataEvent.KIND),
+                        tags = mapOf("e" to listOf(it)),
+                        limit = 1,
+                    ),
+            )
+        }
+    }
+
+    fun createLastMessageOfEachChannelFilter(): List<TypedFilter>? {
+        val followingEvents = account.selectedChatsFollowList()
+
+        if (followingEvents.isEmpty()) return null
+
+        return followingEvents.map {
+            TypedFilter(
+                types = setOf(FeedType.PUBLIC_CHATS),
+                filter =
+                    JsonFilter(
+                        kinds = listOf(ChannelMessageEvent.KIND),
+                        tags = mapOf("e" to listOf(it)),
+                        since =
+                            latestEOSEs.users[account.userProfile()]?.followList?.get(chatRoomList)?.relayList,
+                        // Remember to consider spam that is being removed from the UI
+                        limit = 50,
+                    ),
+            )
+        }
+    }
+
+    val chatroomListChannel =
+        requestNewChannel { time, relayUrl ->
+            latestEOSEs.addOrUpdate(account.userProfile(), chatRoomList, relayUrl, time)
+        }
+
+    override fun updateChannelFilters() {
+        val list =
+            listOfNotNull(
+                createMessagesToMeFilter(),
+                createMessagesFromMeFilter(),
+                createMyChannelsFilter(),
+            )
+
+        chatroomListChannel.typedFilters =
+            listOfNotNull(
+                list,
+                createLastChannelInfoFilter(),
+                createLastMessageOfEachChannelFilter(),
+            )
+                .flatten()
+                .ifEmpty { null }
+    }
 }

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

@@ -28,40 +28,40 @@ import com.vitorpamplona.quartz.events.CommunityDefinitionEvent
 import com.vitorpamplona.quartz.events.CommunityPostApprovalEvent
 
 object NostrCommunityDataSource : NostrDataSource("SingleCommunityFeed") {
-  private var communityToWatch: AddressableNote? = null
+    private var communityToWatch: AddressableNote? = null
 
-  private fun createLoadCommunityFilter(): TypedFilter? {
-    val myCommunityToWatch = communityToWatch ?: return null
+    private fun createLoadCommunityFilter(): TypedFilter? {
+        val myCommunityToWatch = communityToWatch ?: return null
 
-    val community = myCommunityToWatch.event as? CommunityDefinitionEvent ?: return null
+        val community = myCommunityToWatch.event as? CommunityDefinitionEvent ?: return null
 
-    return TypedFilter(
-      types = COMMON_FEED_TYPES,
-      filter =
-        JsonFilter(
-          authors =
-            community
-              .moderators()
-              .map { it.key }
-              .plus(listOfNotNull(myCommunityToWatch.author?.pubkeyHex)),
-          tags =
-            mapOf(
-              "a" to listOf(myCommunityToWatch.address.toTag()),
-            ),
-          kinds = listOf(CommunityPostApprovalEvent.KIND),
-          limit = 500,
-        ),
-    )
-  }
+        return TypedFilter(
+            types = COMMON_FEED_TYPES,
+            filter =
+                JsonFilter(
+                    authors =
+                        community
+                            .moderators()
+                            .map { it.key }
+                            .plus(listOfNotNull(myCommunityToWatch.author?.pubkeyHex)),
+                    tags =
+                        mapOf(
+                            "a" to listOf(myCommunityToWatch.address.toTag()),
+                        ),
+                    kinds = listOf(CommunityPostApprovalEvent.KIND),
+                    limit = 500,
+                ),
+        )
+    }
 
-  val loadCommunityChannel = requestNewChannel()
+    val loadCommunityChannel = requestNewChannel()
 
-  override fun updateChannelFilters() {
-    loadCommunityChannel.typedFilters = listOfNotNull(createLoadCommunityFilter()).ifEmpty { null }
-  }
+    override fun updateChannelFilters() {
+        loadCommunityChannel.typedFilters = listOfNotNull(createLoadCommunityFilter()).ifEmpty { null }
+    }
 
-  fun loadCommunity(note: AddressableNote?) {
-    communityToWatch = note
-    invalidateFilters()
-  }
+    fun loadCommunity(note: AddressableNote?) {
+        communityToWatch = note
+        invalidateFilters()
+    }
 }

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

@@ -28,302 +28,302 @@ import com.vitorpamplona.amethyst.service.relays.Subscription
 import com.vitorpamplona.amethyst.ui.components.BundledUpdate
 import com.vitorpamplona.quartz.events.Event
 import com.vitorpamplona.quartz.utils.TimeUtils
-import java.util.UUID
-import java.util.concurrent.atomic.AtomicBoolean
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.launch
+import java.util.UUID
+import java.util.concurrent.atomic.AtomicBoolean
 
 abstract class NostrDataSource(val debugName: String) {
-  private val scope = CoroutineScope(Dispatchers.IO + SupervisorJob())
+    private val scope = CoroutineScope(Dispatchers.IO + SupervisorJob())
 
-  private var subscriptions = mapOf<String, Subscription>()
+    private var subscriptions = mapOf<String, Subscription>()
 
-  data class Counter(var counter: Int)
+    data class Counter(var counter: Int)
 
-  private var eventCounter = mapOf<String, Counter>()
-  var changingFilters = AtomicBoolean()
+    private var eventCounter = mapOf<String, Counter>()
+    var changingFilters = AtomicBoolean()
 
-  private var active: Boolean = false
+    private var active: Boolean = false
 
-  fun printCounter() {
-    eventCounter.forEach {
-      Log.d(
-        "STATE DUMP ${this.javaClass.simpleName}",
-        "Received Events ${it.key}: ${it.value.counter}",
-      )
+    fun printCounter() {
+        eventCounter.forEach {
+            Log.d(
+                "STATE DUMP ${this.javaClass.simpleName}",
+                "Received Events ${it.key}: ${it.value.counter}",
+            )
+        }
     }
-  }
 
-  private val clientListener =
-    object : Client.Listener() {
-      override fun onEvent(
+    private val clientListener =
+        object : Client.Listener() {
+            override fun onEvent(
+                event: Event,
+                subscriptionId: String,
+                relay: Relay,
+                afterEOSE: Boolean,
+            ) {
+                if (subscriptions.containsKey(subscriptionId)) {
+                    val key = "$debugName $subscriptionId ${event.kind}"
+                    val keyValue = eventCounter.get(key)
+                    if (keyValue != null) {
+                        keyValue.counter++
+                    } else {
+                        eventCounter = eventCounter + Pair(key, Counter(1))
+                    }
+
+                    // Log.d(this@NostrDataSource.javaClass.simpleName, "Relay ${relay.url}: ${event.kind}")
+
+                    consume(event, relay)
+                    if (afterEOSE) {
+                        markAsEOSE(subscriptionId, relay)
+                    }
+                }
+            }
+
+            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,
+                subscriptionId: String?,
+            ) {
+                // if (subscriptions.containsKey(subscriptionId)) {
+                //    Log.d(this@NostrDataSource.javaClass.simpleName, "Relay ${relay.url} ${subscriptionId}
+                // ${type.name}")
+                // }
+
+                if (
+                    type == Relay.StateType.EOSE &&
+                    subscriptionId != null &&
+                    subscriptions.containsKey(subscriptionId)
+                ) {
+                    markAsEOSE(subscriptionId, relay)
+                }
+            }
+
+            override fun onSendResponse(
+                eventId: String,
+                success: Boolean,
+                message: String,
+                relay: Relay,
+            ) {
+                if (success) {
+                    markAsSeenOnRelay(eventId, relay)
+                }
+            }
+
+            override fun onAuth(
+                relay: Relay,
+                challenge: String,
+            ) {
+                auth(relay, challenge)
+            }
+
+            override fun onNotify(
+                relay: Relay,
+                description: String,
+            ) {
+                notify(relay, description)
+            }
+        }
+
+    init {
+        Log.d(this.javaClass.simpleName, "${this.javaClass.simpleName} Subscribe")
+        Client.subscribe(clientListener)
+    }
+
+    fun destroy() {
+        // makes sure to run
+        Log.d(this.javaClass.simpleName, "${this.javaClass.simpleName} Unsubscribe")
+        stop()
+        Client.unsubscribe(clientListener)
+        scope.cancel()
+        bundler.cancel()
+    }
+
+    open fun start() {
+        println("DataSource: ${this.javaClass.simpleName} Start")
+        active = true
+        resetFilters()
+    }
+
+    open fun stop() {
+        active = false
+        println("DataSource: ${this.javaClass.simpleName} Stop")
+
+        GlobalScope.launch(Dispatchers.IO) {
+            subscriptions.values.forEach { subscription ->
+                Client.close(subscription.id)
+                subscription.typedFilters = null
+            }
+        }
+    }
+
+    open fun stopSync() {
+        active = false
+        println("DataSource: ${this.javaClass.simpleName} Stop")
+
+        subscriptions.values.forEach { subscription ->
+            Client.close(subscription.id)
+            subscription.typedFilters = null
+        }
+    }
+
+    fun requestNewChannel(onEOSE: ((Long, String) -> Unit)? = null): Subscription {
+        val newSubscription = Subscription(UUID.randomUUID().toString().substring(0, 4), onEOSE)
+        subscriptions = subscriptions + Pair(newSubscription.id, newSubscription)
+        return newSubscription
+    }
+
+    fun dismissChannel(subscription: Subscription) {
+        Client.close(subscription.id)
+        subscriptions = subscriptions.minus(subscription.id)
+    }
+
+    // Refreshes observers in batches.
+    private val bundler = BundledUpdate(300, Dispatchers.IO)
+
+    fun invalidateFilters() {
+        scope.launch(Dispatchers.IO) {
+            bundler.invalidate {
+                // println("DataSource: ${this.javaClass.simpleName} InvalidateFilters")
+
+                // adds the time to perform the refresh into this delay
+                // holding off new updates in case of heavy refresh routines.
+                resetFiltersSuspend()
+            }
+        }
+    }
+
+    fun resetFilters() {
+        scope.launch(Dispatchers.IO) { resetFiltersSuspend() }
+    }
+
+    fun resetFiltersSuspend() {
+        println("DataSource: ${this.javaClass.simpleName} resetFiltersSuspend $active")
+        checkNotInMainThread()
+
+        // saves the channels that are currently active
+        val activeSubscriptions = subscriptions.values.filter { it.typedFilters != null }
+        // saves the current content to only update if it changes
+        val currentFilters = activeSubscriptions.associate { it.id to it.toJson() }
+
+        changingFilters.getAndSet(true)
+
+        updateChannelFilters()
+
+        // Makes sure to only send an updated filter when it actually changes.
+        subscriptions.values.forEach { updatedSubscription ->
+            val updatedSubscriptionNewFilters = updatedSubscription.typedFilters
+
+            val isActive = Client.isActive(updatedSubscription.id)
+
+            if (!isActive && updatedSubscriptionNewFilters != null) {
+                // Filter was removed from the active list
+                if (active) {
+                    Client.sendFilter(updatedSubscription.id, updatedSubscriptionNewFilters)
+                }
+            } else {
+                if (currentFilters.containsKey(updatedSubscription.id)) {
+                    if (updatedSubscriptionNewFilters == null) {
+                        // was active and is not active anymore, just close.
+                        Client.close(updatedSubscription.id)
+                    } else {
+                        // was active and is still active, check if it has changed.
+                        if (updatedSubscription.toJson() != currentFilters[updatedSubscription.id]) {
+                            Client.close(updatedSubscription.id)
+                            if (active) {
+                                Log.d(
+                                    this@NostrDataSource.javaClass.simpleName,
+                                    "Update Filter 1 ${updatedSubscription.id} ${Client.isSubscribed(clientListener)}",
+                                )
+                                Client.sendFilter(updatedSubscription.id, updatedSubscriptionNewFilters)
+                            }
+                        } else {
+                            // hasn't changed, does nothing.
+                            if (active) {
+                                Log.d(
+                                    this@NostrDataSource.javaClass.simpleName,
+                                    "Update Filter 2 ${updatedSubscription.id} ${Client.isSubscribed(clientListener)}",
+                                )
+                                Client.sendFilterOnlyIfDisconnected(
+                                    updatedSubscription.id,
+                                    updatedSubscriptionNewFilters,
+                                )
+                            }
+                        }
+                    }
+                } else {
+                    if (updatedSubscriptionNewFilters == null) {
+                        // was not active and is still not active, does nothing
+                    } else {
+                        // was not active and becomes active, sends the filter.
+                        if (updatedSubscription.toJson() != currentFilters[updatedSubscription.id]) {
+                            if (active) {
+                                Log.d(
+                                    this@NostrDataSource.javaClass.simpleName,
+                                    "Update Filter 3 ${updatedSubscription.id} ${Client.isSubscribed(clientListener)}",
+                                )
+                                Client.sendFilter(updatedSubscription.id, updatedSubscriptionNewFilters)
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        changingFilters.getAndSet(false)
+    }
+
+    open fun consume(
         event: Event,
-        subscriptionId: String,
         relay: Relay,
-        afterEOSE: Boolean,
-      ) {
-        if (subscriptions.containsKey(subscriptionId)) {
-          val key = "$debugName $subscriptionId ${event.kind}"
-          val keyValue = eventCounter.get(key)
-          if (keyValue != null) {
-            keyValue.counter++
-          } else {
-            eventCounter = eventCounter + Pair(key, Counter(1))
-          }
+    ) {
+        LocalCache.verifyAndConsume(event, relay)
+    }
 
-          // Log.d(this@NostrDataSource.javaClass.simpleName, "Relay ${relay.url}: ${event.kind}")
-
-          consume(event, relay)
-          if (afterEOSE) {
-            markAsEOSE(subscriptionId, relay)
-          }
-        }
-      }
-
-      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,
-        subscriptionId: String?,
-      ) {
-        // if (subscriptions.containsKey(subscriptionId)) {
-        //    Log.d(this@NostrDataSource.javaClass.simpleName, "Relay ${relay.url} ${subscriptionId}
-        // ${type.name}")
-        // }
-
-        if (
-          type == Relay.StateType.EOSE &&
-            subscriptionId != null &&
-            subscriptions.containsKey(subscriptionId)
-        ) {
-          markAsEOSE(subscriptionId, relay)
-        }
-      }
-
-      override fun onSendResponse(
+    open fun markAsSeenOnRelay(
         eventId: String,
-        success: Boolean,
-        message: String,
         relay: Relay,
-      ) {
-        if (success) {
-          markAsSeenOnRelay(eventId, relay)
-        }
-      }
+    ) {
+        LocalCache.getNoteIfExists(eventId)?.addRelay(relay)
+    }
 
-      override fun onAuth(
+    open fun markAsEOSE(
+        subscriptionId: String,
+        relay: Relay,
+    ) {
+        subscriptions[subscriptionId]?.updateEOSE(
+            // in case people's clock is slighly off.
+            TimeUtils.oneMinuteAgo(),
+            relay.url,
+        )
+    }
+
+    abstract fun updateChannelFilters()
+
+    open fun auth(
         relay: Relay,
         challenge: String,
-      ) {
-        auth(relay, challenge)
-      }
+    ) = Unit
 
-      override fun onNotify(
+    open fun notify(
         relay: Relay,
         description: String,
-      ) {
-        notify(relay, description)
-      }
-    }
-
-  init {
-    Log.d(this.javaClass.simpleName, "${this.javaClass.simpleName} Subscribe")
-    Client.subscribe(clientListener)
-  }
-
-  fun destroy() {
-    // makes sure to run
-    Log.d(this.javaClass.simpleName, "${this.javaClass.simpleName} Unsubscribe")
-    stop()
-    Client.unsubscribe(clientListener)
-    scope.cancel()
-    bundler.cancel()
-  }
-
-  open fun start() {
-    println("DataSource: ${this.javaClass.simpleName} Start")
-    active = true
-    resetFilters()
-  }
-
-  open fun stop() {
-    active = false
-    println("DataSource: ${this.javaClass.simpleName} Stop")
-
-    GlobalScope.launch(Dispatchers.IO) {
-      subscriptions.values.forEach { subscription ->
-        Client.close(subscription.id)
-        subscription.typedFilters = null
-      }
-    }
-  }
-
-  open fun stopSync() {
-    active = false
-    println("DataSource: ${this.javaClass.simpleName} Stop")
-
-    subscriptions.values.forEach { subscription ->
-      Client.close(subscription.id)
-      subscription.typedFilters = null
-    }
-  }
-
-  fun requestNewChannel(onEOSE: ((Long, String) -> Unit)? = null): Subscription {
-    val newSubscription = Subscription(UUID.randomUUID().toString().substring(0, 4), onEOSE)
-    subscriptions = subscriptions + Pair(newSubscription.id, newSubscription)
-    return newSubscription
-  }
-
-  fun dismissChannel(subscription: Subscription) {
-    Client.close(subscription.id)
-    subscriptions = subscriptions.minus(subscription.id)
-  }
-
-  // Refreshes observers in batches.
-  private val bundler = BundledUpdate(300, Dispatchers.IO)
-
-  fun invalidateFilters() {
-    scope.launch(Dispatchers.IO) {
-      bundler.invalidate {
-        // println("DataSource: ${this.javaClass.simpleName} InvalidateFilters")
-
-        // adds the time to perform the refresh into this delay
-        // holding off new updates in case of heavy refresh routines.
-        resetFiltersSuspend()
-      }
-    }
-  }
-
-  fun resetFilters() {
-    scope.launch(Dispatchers.IO) { resetFiltersSuspend() }
-  }
-
-  fun resetFiltersSuspend() {
-    println("DataSource: ${this.javaClass.simpleName} resetFiltersSuspend $active")
-    checkNotInMainThread()
-
-    // saves the channels that are currently active
-    val activeSubscriptions = subscriptions.values.filter { it.typedFilters != null }
-    // saves the current content to only update if it changes
-    val currentFilters = activeSubscriptions.associate { it.id to it.toJson() }
-
-    changingFilters.getAndSet(true)
-
-    updateChannelFilters()
-
-    // Makes sure to only send an updated filter when it actually changes.
-    subscriptions.values.forEach { updatedSubscription ->
-      val updatedSubscriptionNewFilters = updatedSubscription.typedFilters
-
-      val isActive = Client.isActive(updatedSubscription.id)
-
-      if (!isActive && updatedSubscriptionNewFilters != null) {
-        // Filter was removed from the active list
-        if (active) {
-          Client.sendFilter(updatedSubscription.id, updatedSubscriptionNewFilters)
-        }
-      } else {
-        if (currentFilters.containsKey(updatedSubscription.id)) {
-          if (updatedSubscriptionNewFilters == null) {
-            // was active and is not active anymore, just close.
-            Client.close(updatedSubscription.id)
-          } else {
-            // was active and is still active, check if it has changed.
-            if (updatedSubscription.toJson() != currentFilters[updatedSubscription.id]) {
-              Client.close(updatedSubscription.id)
-              if (active) {
-                Log.d(
-                  this@NostrDataSource.javaClass.simpleName,
-                  "Update Filter 1 ${updatedSubscription.id} ${Client.isSubscribed(clientListener)}",
-                )
-                Client.sendFilter(updatedSubscription.id, updatedSubscriptionNewFilters)
-              }
-            } else {
-              // hasn't changed, does nothing.
-              if (active) {
-                Log.d(
-                  this@NostrDataSource.javaClass.simpleName,
-                  "Update Filter 2 ${updatedSubscription.id} ${Client.isSubscribed(clientListener)}",
-                )
-                Client.sendFilterOnlyIfDisconnected(
-                  updatedSubscription.id,
-                  updatedSubscriptionNewFilters,
-                )
-              }
-            }
-          }
-        } else {
-          if (updatedSubscriptionNewFilters == null) {
-            // was not active and is still not active, does nothing
-          } else {
-            // was not active and becomes active, sends the filter.
-            if (updatedSubscription.toJson() != currentFilters[updatedSubscription.id]) {
-              if (active) {
-                Log.d(
-                  this@NostrDataSource.javaClass.simpleName,
-                  "Update Filter 3 ${updatedSubscription.id} ${Client.isSubscribed(clientListener)}",
-                )
-                Client.sendFilter(updatedSubscription.id, updatedSubscriptionNewFilters)
-              }
-            }
-          }
-        }
-      }
-    }
-
-    changingFilters.getAndSet(false)
-  }
-
-  open fun consume(
-    event: Event,
-    relay: Relay,
-  ) {
-    LocalCache.verifyAndConsume(event, relay)
-  }
-
-  open fun markAsSeenOnRelay(
-    eventId: String,
-    relay: Relay,
-  ) {
-    LocalCache.getNoteIfExists(eventId)?.addRelay(relay)
-  }
-
-  open fun markAsEOSE(
-    subscriptionId: String,
-    relay: Relay,
-  ) {
-    subscriptions[subscriptionId]?.updateEOSE(
-      // in case people's clock is slighly off.
-      TimeUtils.oneMinuteAgo(),
-      relay.url,
-    )
-  }
-
-  abstract fun updateChannelFilters()
-
-  open fun auth(
-    relay: Relay,
-    challenge: String,
-  ) = Unit
-
-  open fun notify(
-    relay: Relay,
-    description: String,
-  ) = Unit
+    ) = Unit
 }

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

@@ -39,384 +39,385 @@ import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
 
 object NostrDiscoveryDataSource : NostrDataSource("DiscoveryFeed") {
-  lateinit var account: Account
+    lateinit var account: Account
 
-  val scope = Amethyst.instance.applicationIOScope
-  val latestEOSEs = EOSEAccount()
+    val scope = Amethyst.instance.applicationIOScope
+    val latestEOSEs = EOSEAccount()
 
-  var job: Job? = null
+    var job: Job? = null
 
-  override fun start() {
-    job?.cancel()
-    job =
-      scope.launch(Dispatchers.IO) {
-        account.liveDiscoveryFollowLists.collect {
-          if (this@NostrDiscoveryDataSource::account.isInitialized) {
-            invalidateFilters()
-          }
+    override fun start() {
+        job?.cancel()
+        job =
+            scope.launch(Dispatchers.IO) {
+                account.liveDiscoveryFollowLists.collect {
+                    if (this@NostrDiscoveryDataSource::account.isInitialized) {
+                        invalidateFilters()
+                    }
+                }
+            }
+        super.start()
+    }
+
+    override fun stop() {
+        super.stop()
+        job?.cancel()
+    }
+
+    fun createMarketplaceFilter(): List<TypedFilter> {
+        val follows = account.liveDiscoveryFollowLists.value?.users?.toList()
+        val hashToLoad = account.liveDiscoveryFollowLists.value?.hashtags?.toList()
+        val geohashToLoad = account.liveDiscoveryFollowLists.value?.geotags?.toList()
+
+        return listOfNotNull(
+            TypedFilter(
+                types = setOf(FeedType.GLOBAL),
+                filter =
+                    JsonFilter(
+                        authors = follows,
+                        kinds = listOf(ClassifiedsEvent.KIND),
+                        limit = 300,
+                        since =
+                            latestEOSEs.users[account.userProfile()]
+                                ?.followList
+                                ?.get(account.defaultDiscoveryFollowList.value)
+                                ?.relayList,
+                    ),
+            ),
+            hashToLoad?.let {
+                TypedFilter(
+                    types = setOf(FeedType.GLOBAL),
+                    filter =
+                        JsonFilter(
+                            kinds = listOf(ClassifiedsEvent.KIND),
+                            tags =
+                                mapOf(
+                                    "t" to
+                                        it
+                                            .map { listOf(it, it.lowercase(), it.uppercase(), it.capitalize()) }
+                                            .flatten(),
+                                ),
+                            limit = 300,
+                            since =
+                                latestEOSEs.users[account.userProfile()]
+                                    ?.followList
+                                    ?.get(account.defaultDiscoveryFollowList.value)
+                                    ?.relayList,
+                        ),
+                )
+            },
+            geohashToLoad?.let {
+                TypedFilter(
+                    types = setOf(FeedType.GLOBAL),
+                    filter =
+                        JsonFilter(
+                            kinds = listOf(ClassifiedsEvent.KIND),
+                            tags =
+                                mapOf(
+                                    "g" to
+                                        it
+                                            .map { listOf(it, it.lowercase(), it.uppercase(), it.capitalize()) }
+                                            .flatten(),
+                                ),
+                            limit = 300,
+                            since =
+                                latestEOSEs.users[account.userProfile()]
+                                    ?.followList
+                                    ?.get(account.defaultDiscoveryFollowList.value)
+                                    ?.relayList,
+                        ),
+                )
+            },
+        )
+    }
+
+    fun createLiveStreamFilter(): List<TypedFilter> {
+        val follows = account.liveDiscoveryFollowLists.value?.users?.toList()
+
+        return listOfNotNull(
+            TypedFilter(
+                types = setOf(FeedType.GLOBAL),
+                filter =
+                    JsonFilter(
+                        authors = follows,
+                        kinds = listOf(LiveActivitiesChatMessageEvent.KIND, LiveActivitiesEvent.KIND),
+                        limit = 300,
+                        since =
+                            latestEOSEs.users[account.userProfile()]
+                                ?.followList
+                                ?.get(account.defaultDiscoveryFollowList.value)
+                                ?.relayList,
+                    ),
+            ),
+            follows?.let {
+                TypedFilter(
+                    types = setOf(FeedType.GLOBAL),
+                    filter =
+                        JsonFilter(
+                            tags = mapOf("p" to it),
+                            kinds = listOf(LiveActivitiesEvent.KIND),
+                            limit = 100,
+                            since =
+                                latestEOSEs.users[account.userProfile()]
+                                    ?.followList
+                                    ?.get(account.defaultDiscoveryFollowList.value)
+                                    ?.relayList,
+                        ),
+                )
+            },
+        )
+    }
+
+    fun createPublicChatFilter(): List<TypedFilter> {
+        val follows = account.liveDiscoveryFollowLists.value?.users?.toList()
+        val followChats = account.selectedChatsFollowList().toList()
+
+        return listOfNotNull(
+            TypedFilter(
+                types = setOf(FeedType.PUBLIC_CHATS),
+                filter =
+                    JsonFilter(
+                        authors = follows,
+                        kinds =
+                            listOf(ChannelCreateEvent.KIND, ChannelMetadataEvent.KIND, ChannelMessageEvent.KIND),
+                        limit = 300,
+                        since =
+                            latestEOSEs.users[account.userProfile()]
+                                ?.followList
+                                ?.get(account.defaultDiscoveryFollowList.value)
+                                ?.relayList,
+                    ),
+            ),
+            if (followChats.isNotEmpty()) {
+                TypedFilter(
+                    types = setOf(FeedType.PUBLIC_CHATS),
+                    filter =
+                        JsonFilter(
+                            ids = followChats,
+                            kinds = listOf(ChannelCreateEvent.KIND),
+                            limit = 300,
+                            since =
+                                latestEOSEs.users[account.userProfile()]
+                                    ?.followList
+                                    ?.get(account.defaultDiscoveryFollowList.value)
+                                    ?.relayList,
+                        ),
+                )
+            } else {
+                null
+            },
+        )
+    }
+
+    fun createCommunitiesFilter(): TypedFilter {
+        val follows = account.liveDiscoveryFollowLists.value?.users?.toList()
+
+        return TypedFilter(
+            types = setOf(FeedType.GLOBAL),
+            filter =
+                JsonFilter(
+                    authors = follows,
+                    kinds = listOf(CommunityDefinitionEvent.KIND, CommunityPostApprovalEvent.KIND),
+                    limit = 300,
+                    since =
+                        latestEOSEs.users[account.userProfile()]
+                            ?.followList
+                            ?.get(account.defaultDiscoveryFollowList.value)
+                            ?.relayList,
+                ),
+        )
+    }
+
+    fun createLiveStreamTagsFilter(): TypedFilter? {
+        val hashToLoad = account.liveDiscoveryFollowLists.value?.hashtags?.toList()
+
+        if (hashToLoad.isNullOrEmpty()) return null
+
+        return TypedFilter(
+            types = setOf(FeedType.GLOBAL),
+            filter =
+                JsonFilter(
+                    kinds = listOf(LiveActivitiesChatMessageEvent.KIND, LiveActivitiesEvent.KIND),
+                    tags =
+                        mapOf(
+                            "t" to
+                                hashToLoad
+                                    .map { listOf(it, it.lowercase(), it.uppercase(), it.capitalize()) }
+                                    .flatten(),
+                        ),
+                    limit = 300,
+                    since =
+                        latestEOSEs.users[account.userProfile()]
+                            ?.followList
+                            ?.get(account.defaultDiscoveryFollowList.value)
+                            ?.relayList,
+                ),
+        )
+    }
+
+    fun createLiveStreamGeohashesFilter(): TypedFilter? {
+        val hashToLoad = account.liveDiscoveryFollowLists.value?.geotags?.toList()
+
+        if (hashToLoad.isNullOrEmpty()) return null
+
+        return TypedFilter(
+            types = setOf(FeedType.GLOBAL),
+            filter =
+                JsonFilter(
+                    kinds = listOf(LiveActivitiesChatMessageEvent.KIND, LiveActivitiesEvent.KIND),
+                    tags =
+                        mapOf(
+                            "g" to
+                                hashToLoad
+                                    .map { listOf(it, it.lowercase(), it.uppercase(), it.capitalize()) }
+                                    .flatten(),
+                        ),
+                    limit = 300,
+                    since =
+                        latestEOSEs.users[account.userProfile()]
+                            ?.followList
+                            ?.get(account.defaultDiscoveryFollowList.value)
+                            ?.relayList,
+                ),
+        )
+    }
+
+    fun createPublicChatsTagsFilter(): TypedFilter? {
+        val hashToLoad = account.liveDiscoveryFollowLists.value?.hashtags?.toList()
+
+        if (hashToLoad.isNullOrEmpty()) return null
+
+        return TypedFilter(
+            types = setOf(FeedType.PUBLIC_CHATS),
+            filter =
+                JsonFilter(
+                    kinds =
+                        listOf(ChannelCreateEvent.KIND, ChannelMetadataEvent.KIND, ChannelMessageEvent.KIND),
+                    tags =
+                        mapOf(
+                            "t" to
+                                hashToLoad
+                                    .map { listOf(it, it.lowercase(), it.uppercase(), it.capitalize()) }
+                                    .flatten(),
+                        ),
+                    limit = 300,
+                    since =
+                        latestEOSEs.users[account.userProfile()]
+                            ?.followList
+                            ?.get(account.defaultDiscoveryFollowList.value)
+                            ?.relayList,
+                ),
+        )
+    }
+
+    fun createPublicChatsGeohashesFilter(): TypedFilter? {
+        val hashToLoad = account.liveDiscoveryFollowLists.value?.geotags?.toList()
+
+        if (hashToLoad.isNullOrEmpty()) return null
+
+        return TypedFilter(
+            types = setOf(FeedType.PUBLIC_CHATS),
+            filter =
+                JsonFilter(
+                    kinds =
+                        listOf(ChannelCreateEvent.KIND, ChannelMetadataEvent.KIND, ChannelMessageEvent.KIND),
+                    tags =
+                        mapOf(
+                            "g" to
+                                hashToLoad
+                                    .map { listOf(it, it.lowercase(), it.uppercase(), it.capitalize()) }
+                                    .flatten(),
+                        ),
+                    limit = 300,
+                    since =
+                        latestEOSEs.users[account.userProfile()]
+                            ?.followList
+                            ?.get(account.defaultDiscoveryFollowList.value)
+                            ?.relayList,
+                ),
+        )
+    }
+
+    fun createCommunitiesTagsFilter(): TypedFilter? {
+        val hashToLoad = account.liveDiscoveryFollowLists.value?.hashtags?.toList()
+
+        if (hashToLoad.isNullOrEmpty()) return null
+
+        return TypedFilter(
+            types = setOf(FeedType.GLOBAL),
+            filter =
+                JsonFilter(
+                    kinds = listOf(CommunityDefinitionEvent.KIND, CommunityPostApprovalEvent.KIND),
+                    tags =
+                        mapOf(
+                            "t" to
+                                hashToLoad
+                                    .map { listOf(it, it.lowercase(), it.uppercase(), it.capitalize()) }
+                                    .flatten(),
+                        ),
+                    limit = 300,
+                    since =
+                        latestEOSEs.users[account.userProfile()]
+                            ?.followList
+                            ?.get(account.defaultDiscoveryFollowList.value)
+                            ?.relayList,
+                ),
+        )
+    }
+
+    fun createCommunitiesGeohashesFilter(): TypedFilter? {
+        val hashToLoad = account.liveDiscoveryFollowLists.value?.geotags?.toList()
+
+        if (hashToLoad.isNullOrEmpty()) return null
+
+        return TypedFilter(
+            types = setOf(FeedType.GLOBAL),
+            filter =
+                JsonFilter(
+                    kinds = listOf(CommunityDefinitionEvent.KIND, CommunityPostApprovalEvent.KIND),
+                    tags =
+                        mapOf(
+                            "g" to
+                                hashToLoad
+                                    .map { listOf(it, it.lowercase(), it.uppercase(), it.capitalize()) }
+                                    .flatten(),
+                        ),
+                    limit = 300,
+                    since =
+                        latestEOSEs.users[account.userProfile()]
+                            ?.followList
+                            ?.get(account.defaultDiscoveryFollowList.value)
+                            ?.relayList,
+                ),
+        )
+    }
+
+    val discoveryFeedChannel =
+        requestNewChannel { time, relayUrl ->
+            latestEOSEs.addOrUpdate(
+                account.userProfile(),
+                account.defaultDiscoveryFollowList.value,
+                relayUrl,
+                time,
+            )
         }
-      }
-    super.start()
-  }
 
-  override fun stop() {
-    super.stop()
-    job?.cancel()
-  }
-
-  fun createMarketplaceFilter(): List<TypedFilter> {
-    val follows = account.liveDiscoveryFollowLists.value?.users?.toList()
-    val hashToLoad = account.liveDiscoveryFollowLists.value?.hashtags?.toList()
-    val geohashToLoad = account.liveDiscoveryFollowLists.value?.geotags?.toList()
-
-    return listOfNotNull(
-      TypedFilter(
-        types = setOf(FeedType.GLOBAL),
-        filter =
-          JsonFilter(
-            authors = follows,
-            kinds = listOf(ClassifiedsEvent.KIND),
-            limit = 300,
-            since =
-              latestEOSEs.users[account.userProfile()]
-                ?.followList
-                ?.get(account.defaultDiscoveryFollowList.value)
-                ?.relayList,
-          ),
-      ),
-      hashToLoad?.let {
-        TypedFilter(
-          types = setOf(FeedType.GLOBAL),
-          filter =
-            JsonFilter(
-              kinds = listOf(ClassifiedsEvent.KIND),
-              tags =
-                mapOf(
-                  "t" to
-                    it
-                      .map { listOf(it, it.lowercase(), it.uppercase(), it.capitalize()) }
-                      .flatten(),
-                ),
-              limit = 300,
-              since =
-                latestEOSEs.users[account.userProfile()]
-                  ?.followList
-                  ?.get(account.defaultDiscoveryFollowList.value)
-                  ?.relayList,
-            ),
-        )
-      },
-      geohashToLoad?.let {
-        TypedFilter(
-          types = setOf(FeedType.GLOBAL),
-          filter =
-            JsonFilter(
-              kinds = listOf(ClassifiedsEvent.KIND),
-              tags =
-                mapOf(
-                  "g" to
-                    it
-                      .map { listOf(it, it.lowercase(), it.uppercase(), it.capitalize()) }
-                      .flatten(),
-                ),
-              limit = 300,
-              since =
-                latestEOSEs.users[account.userProfile()]
-                  ?.followList
-                  ?.get(account.defaultDiscoveryFollowList.value)
-                  ?.relayList,
-            ),
-        )
-      },
-    )
-  }
-
-  fun createLiveStreamFilter(): List<TypedFilter> {
-    val follows = account.liveDiscoveryFollowLists.value?.users?.toList()
-
-    return listOfNotNull(
-      TypedFilter(
-        types = setOf(FeedType.GLOBAL),
-        filter =
-          JsonFilter(
-            authors = follows,
-            kinds = listOf(LiveActivitiesChatMessageEvent.KIND, LiveActivitiesEvent.KIND),
-            limit = 300,
-            since =
-              latestEOSEs.users[account.userProfile()]
-                ?.followList
-                ?.get(account.defaultDiscoveryFollowList.value)
-                ?.relayList,
-          ),
-      ),
-      follows?.let {
-        TypedFilter(
-          types = setOf(FeedType.GLOBAL),
-          filter =
-            JsonFilter(
-              tags = mapOf("p" to it),
-              kinds = listOf(LiveActivitiesEvent.KIND),
-              limit = 100,
-              since =
-                latestEOSEs.users[account.userProfile()]
-                  ?.followList
-                  ?.get(account.defaultDiscoveryFollowList.value)
-                  ?.relayList,
-            ),
-        )
-      },
-    )
-  }
-
-  fun createPublicChatFilter(): List<TypedFilter> {
-    val follows = account.liveDiscoveryFollowLists.value?.users?.toList()
-    val followChats = account.selectedChatsFollowList().toList()
-
-    return listOfNotNull(
-      TypedFilter(
-        types = setOf(FeedType.PUBLIC_CHATS),
-        filter =
-          JsonFilter(
-            authors = follows,
-            kinds =
-              listOf(ChannelCreateEvent.KIND, ChannelMetadataEvent.KIND, ChannelMessageEvent.KIND),
-            limit = 300,
-            since =
-              latestEOSEs.users[account.userProfile()]
-                ?.followList
-                ?.get(account.defaultDiscoveryFollowList.value)
-                ?.relayList,
-          ),
-      ),
-      if (followChats.isNotEmpty()) {
-        TypedFilter(
-          types = setOf(FeedType.PUBLIC_CHATS),
-          filter =
-            JsonFilter(
-              ids = followChats,
-              kinds = listOf(ChannelCreateEvent.KIND),
-              limit = 300,
-              since =
-                latestEOSEs.users[account.userProfile()]
-                  ?.followList
-                  ?.get(account.defaultDiscoveryFollowList.value)
-                  ?.relayList,
-            ),
-        )
-      } else {
-        null
-      },
-    )
-  }
-
-  fun createCommunitiesFilter(): TypedFilter {
-    val follows = account.liveDiscoveryFollowLists.value?.users?.toList()
-
-    return TypedFilter(
-      types = setOf(FeedType.GLOBAL),
-      filter =
-        JsonFilter(
-          authors = follows,
-          kinds = listOf(CommunityDefinitionEvent.KIND, CommunityPostApprovalEvent.KIND),
-          limit = 300,
-          since =
-            latestEOSEs.users[account.userProfile()]
-              ?.followList
-              ?.get(account.defaultDiscoveryFollowList.value)
-              ?.relayList,
-        ),
-    )
-  }
-
-  fun createLiveStreamTagsFilter(): TypedFilter? {
-    val hashToLoad = account.liveDiscoveryFollowLists.value?.hashtags?.toList()
-
-    if (hashToLoad.isNullOrEmpty()) return null
-
-    return TypedFilter(
-      types = setOf(FeedType.GLOBAL),
-      filter =
-        JsonFilter(
-          kinds = listOf(LiveActivitiesChatMessageEvent.KIND, LiveActivitiesEvent.KIND),
-          tags =
-            mapOf(
-              "t" to
-                hashToLoad
-                  .map { listOf(it, it.lowercase(), it.uppercase(), it.capitalize()) }
-                  .flatten(),
-            ),
-          limit = 300,
-          since =
-            latestEOSEs.users[account.userProfile()]
-              ?.followList
-              ?.get(account.defaultDiscoveryFollowList.value)
-              ?.relayList,
-        ),
-    )
-  }
-
-  fun createLiveStreamGeohashesFilter(): TypedFilter? {
-    val hashToLoad = account.liveDiscoveryFollowLists.value?.geotags?.toList()
-
-    if (hashToLoad.isNullOrEmpty()) return null
-
-    return TypedFilter(
-      types = setOf(FeedType.GLOBAL),
-      filter =
-        JsonFilter(
-          kinds = listOf(LiveActivitiesChatMessageEvent.KIND, LiveActivitiesEvent.KIND),
-          tags =
-            mapOf(
-              "g" to
-                hashToLoad
-                  .map { listOf(it, it.lowercase(), it.uppercase(), it.capitalize()) }
-                  .flatten(),
-            ),
-          limit = 300,
-          since =
-            latestEOSEs.users[account.userProfile()]
-              ?.followList
-              ?.get(account.defaultDiscoveryFollowList.value)
-              ?.relayList,
-        ),
-    )
-  }
-
-  fun createPublicChatsTagsFilter(): TypedFilter? {
-    val hashToLoad = account.liveDiscoveryFollowLists.value?.hashtags?.toList()
-
-    if (hashToLoad.isNullOrEmpty()) return null
-
-    return TypedFilter(
-      types = setOf(FeedType.PUBLIC_CHATS),
-      filter =
-        JsonFilter(
-          kinds =
-            listOf(ChannelCreateEvent.KIND, ChannelMetadataEvent.KIND, ChannelMessageEvent.KIND),
-          tags =
-            mapOf(
-              "t" to
-                hashToLoad
-                  .map { listOf(it, it.lowercase(), it.uppercase(), it.capitalize()) }
-                  .flatten(),
-            ),
-          limit = 300,
-          since =
-            latestEOSEs.users[account.userProfile()]
-              ?.followList
-              ?.get(account.defaultDiscoveryFollowList.value)
-              ?.relayList,
-        ),
-    )
-  }
-
-  fun createPublicChatsGeohashesFilter(): TypedFilter? {
-    val hashToLoad = account.liveDiscoveryFollowLists.value?.geotags?.toList()
-
-    if (hashToLoad.isNullOrEmpty()) return null
-
-    return TypedFilter(
-      types = setOf(FeedType.PUBLIC_CHATS),
-      filter =
-        JsonFilter(
-          kinds =
-            listOf(ChannelCreateEvent.KIND, ChannelMetadataEvent.KIND, ChannelMessageEvent.KIND),
-          tags =
-            mapOf(
-              "g" to
-                hashToLoad
-                  .map { listOf(it, it.lowercase(), it.uppercase(), it.capitalize()) }
-                  .flatten(),
-            ),
-          limit = 300,
-          since =
-            latestEOSEs.users[account.userProfile()]
-              ?.followList
-              ?.get(account.defaultDiscoveryFollowList.value)
-              ?.relayList,
-        ),
-    )
-  }
-
-  fun createCommunitiesTagsFilter(): TypedFilter? {
-    val hashToLoad = account.liveDiscoveryFollowLists.value?.hashtags?.toList()
-
-    if (hashToLoad.isNullOrEmpty()) return null
-
-    return TypedFilter(
-      types = setOf(FeedType.GLOBAL),
-      filter =
-        JsonFilter(
-          kinds = listOf(CommunityDefinitionEvent.KIND, CommunityPostApprovalEvent.KIND),
-          tags =
-            mapOf(
-              "t" to
-                hashToLoad
-                  .map { listOf(it, it.lowercase(), it.uppercase(), it.capitalize()) }
-                  .flatten(),
-            ),
-          limit = 300,
-          since =
-            latestEOSEs.users[account.userProfile()]
-              ?.followList
-              ?.get(account.defaultDiscoveryFollowList.value)
-              ?.relayList,
-        ),
-    )
-  }
-
-  fun createCommunitiesGeohashesFilter(): TypedFilter? {
-    val hashToLoad = account.liveDiscoveryFollowLists.value?.geotags?.toList()
-
-    if (hashToLoad.isNullOrEmpty()) return null
-
-    return TypedFilter(
-      types = setOf(FeedType.GLOBAL),
-      filter =
-        JsonFilter(
-          kinds = listOf(CommunityDefinitionEvent.KIND, CommunityPostApprovalEvent.KIND),
-          tags =
-            mapOf(
-              "g" to
-                hashToLoad
-                  .map { listOf(it, it.lowercase(), it.uppercase(), it.capitalize()) }
-                  .flatten(),
-            ),
-          limit = 300,
-          since =
-            latestEOSEs.users[account.userProfile()]
-              ?.followList
-              ?.get(account.defaultDiscoveryFollowList.value)
-              ?.relayList,
-        ),
-    )
-  }
-
-  val discoveryFeedChannel = requestNewChannel { time, relayUrl ->
-    latestEOSEs.addOrUpdate(
-      account.userProfile(),
-      account.defaultDiscoveryFollowList.value,
-      relayUrl,
-      time,
-    )
-  }
-
-  override fun updateChannelFilters() {
-    discoveryFeedChannel.typedFilters =
-      createLiveStreamFilter()
-        .plus(createPublicChatFilter())
-        .plus(createMarketplaceFilter())
-        .plus(
-          listOfNotNull(
-            createLiveStreamTagsFilter(),
-            createLiveStreamGeohashesFilter(),
-            createCommunitiesFilter(),
-            createCommunitiesTagsFilter(),
-            createCommunitiesGeohashesFilter(),
-            createPublicChatsTagsFilter(),
-            createPublicChatsGeohashesFilter(),
-          ),
-        )
-        .ifEmpty { null }
-  }
+    override fun updateChannelFilters() {
+        discoveryFeedChannel.typedFilters =
+            createLiveStreamFilter()
+                .plus(createPublicChatFilter())
+                .plus(createMarketplaceFilter())
+                .plus(
+                    listOfNotNull(
+                        createLiveStreamTagsFilter(),
+                        createLiveStreamGeohashesFilter(),
+                        createCommunitiesFilter(),
+                        createCommunitiesTagsFilter(),
+                        createCommunitiesGeohashesFilter(),
+                        createPublicChatsTagsFilter(),
+                        createPublicChatsGeohashesFilter(),
+                    ),
+                )
+                .ifEmpty { null }
+    }
 }

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

@@ -34,48 +34,48 @@ import com.vitorpamplona.quartz.events.PollNoteEvent
 import com.vitorpamplona.quartz.events.TextNoteEvent
 
 object NostrGeohashDataSource : NostrDataSource("SingleGeoHashFeed") {
-  private var geohashToWatch: String? = null
+    private var geohashToWatch: String? = null
 
-  fun createLoadHashtagFilter(): TypedFilter? {
-    val hashToLoad = geohashToWatch ?: return null
+    fun createLoadHashtagFilter(): TypedFilter? {
+        val hashToLoad = geohashToWatch ?: return null
 
-    return TypedFilter(
-      types = COMMON_FEED_TYPES,
-      filter =
-        JsonFilter(
-          tags =
-            mapOf(
-              "g" to
-                listOf(
-                  hashToLoad,
+        return TypedFilter(
+            types = COMMON_FEED_TYPES,
+            filter =
+                JsonFilter(
+                    tags =
+                        mapOf(
+                            "g" to
+                                listOf(
+                                    hashToLoad,
+                                ),
+                        ),
+                    kinds =
+                        listOf(
+                            TextNoteEvent.KIND,
+                            ChannelMessageEvent.KIND,
+                            LongTextNoteEvent.KIND,
+                            PollNoteEvent.KIND,
+                            LiveActivitiesChatMessageEvent.KIND,
+                            ClassifiedsEvent.KIND,
+                            HighlightEvent.KIND,
+                            AudioTrackEvent.KIND,
+                            AudioHeaderEvent.KIND,
+                        ),
+                    limit = 200,
                 ),
-            ),
-          kinds =
-            listOf(
-              TextNoteEvent.KIND,
-              ChannelMessageEvent.KIND,
-              LongTextNoteEvent.KIND,
-              PollNoteEvent.KIND,
-              LiveActivitiesChatMessageEvent.KIND,
-              ClassifiedsEvent.KIND,
-              HighlightEvent.KIND,
-              AudioTrackEvent.KIND,
-              AudioHeaderEvent.KIND,
-            ),
-          limit = 200,
-        ),
-    )
-  }
+        )
+    }
 
-  val loadGeohashChannel = requestNewChannel()
+    val loadGeohashChannel = requestNewChannel()
 
-  override fun updateChannelFilters() {
-    loadGeohashChannel.typedFilters = listOfNotNull(createLoadHashtagFilter()).ifEmpty { null }
-  }
+    override fun updateChannelFilters() {
+        loadGeohashChannel.typedFilters = listOfNotNull(createLoadHashtagFilter()).ifEmpty { null }
+    }
 
-  fun loadHashtag(tag: String?) {
-    geohashToWatch = tag
+    fun loadHashtag(tag: String?) {
+        geohashToWatch = tag
 
-    invalidateFilters()
-  }
+        invalidateFilters()
+    }
 }

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

@@ -34,51 +34,51 @@ import com.vitorpamplona.quartz.events.PollNoteEvent
 import com.vitorpamplona.quartz.events.TextNoteEvent
 
 object NostrHashtagDataSource : NostrDataSource("SingleHashtagFeed") {
-  private var hashtagToWatch: String? = null
+    private var hashtagToWatch: String? = null
 
-  fun createLoadHashtagFilter(): TypedFilter? {
-    val hashToLoad = hashtagToWatch ?: return null
+    fun createLoadHashtagFilter(): TypedFilter? {
+        val hashToLoad = hashtagToWatch ?: return null
 
-    return TypedFilter(
-      types = COMMON_FEED_TYPES,
-      filter =
-        JsonFilter(
-          tags =
-            mapOf(
-              "t" to
-                listOf(
-                  hashToLoad,
-                  hashToLoad.lowercase(),
-                  hashToLoad.uppercase(),
-                  hashToLoad.capitalize(),
+        return TypedFilter(
+            types = COMMON_FEED_TYPES,
+            filter =
+                JsonFilter(
+                    tags =
+                        mapOf(
+                            "t" to
+                                listOf(
+                                    hashToLoad,
+                                    hashToLoad.lowercase(),
+                                    hashToLoad.uppercase(),
+                                    hashToLoad.capitalize(),
+                                ),
+                        ),
+                    kinds =
+                        listOf(
+                            TextNoteEvent.KIND,
+                            ChannelMessageEvent.KIND,
+                            LongTextNoteEvent.KIND,
+                            PollNoteEvent.KIND,
+                            LiveActivitiesChatMessageEvent.KIND,
+                            ClassifiedsEvent.KIND,
+                            HighlightEvent.KIND,
+                            AudioTrackEvent.KIND,
+                            AudioHeaderEvent.KIND,
+                        ),
+                    limit = 200,
                 ),
-            ),
-          kinds =
-            listOf(
-              TextNoteEvent.KIND,
-              ChannelMessageEvent.KIND,
-              LongTextNoteEvent.KIND,
-              PollNoteEvent.KIND,
-              LiveActivitiesChatMessageEvent.KIND,
-              ClassifiedsEvent.KIND,
-              HighlightEvent.KIND,
-              AudioTrackEvent.KIND,
-              AudioHeaderEvent.KIND,
-            ),
-          limit = 200,
-        ),
-    )
-  }
+        )
+    }
 
-  val loadHashtagChannel = requestNewChannel()
+    val loadHashtagChannel = requestNewChannel()
 
-  override fun updateChannelFilters() {
-    loadHashtagChannel.typedFilters = listOfNotNull(createLoadHashtagFilter()).ifEmpty { null }
-  }
+    override fun updateChannelFilters() {
+        loadHashtagChannel.typedFilters = listOfNotNull(createLoadHashtagFilter()).ifEmpty { null }
+    }
 
-  fun loadHashtag(tag: String?) {
-    hashtagToWatch = tag
+    fun loadHashtag(tag: String?) {
+        hashtagToWatch = tag
 
-    invalidateFilters()
-  }
+        invalidateFilters()
+    }
 }

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

@@ -45,190 +45,191 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 
 object NostrHomeDataSource : NostrDataSource("HomeFeed") {
-  lateinit var account: Account
+    lateinit var account: Account
 
-  val scope = Amethyst.instance.applicationIOScope
-  val latestEOSEs = EOSEAccount()
+    val scope = Amethyst.instance.applicationIOScope
+    val latestEOSEs = EOSEAccount()
 
-  var job: Job? = null
+    var job: Job? = null
 
-  override fun start() {
-    job?.cancel()
-    job =
-      scope.launch(Dispatchers.IO) {
-        // creates cache on main
-        withContext(Dispatchers.Main) { account.userProfile().live() }
-        account.liveHomeFollowLists.collect {
-          if (this@NostrHomeDataSource::account.isInitialized) {
-            invalidateFilters()
-          }
-        }
-      }
-    super.start()
-  }
+    override fun start() {
+        job?.cancel()
+        job =
+            scope.launch(Dispatchers.IO) {
+                // creates cache on main
+                withContext(Dispatchers.Main) { account.userProfile().live() }
+                account.liveHomeFollowLists.collect {
+                    if (this@NostrHomeDataSource::account.isInitialized) {
+                        invalidateFilters()
+                    }
+                }
+            }
+        super.start()
+    }
 
-  override fun stop() {
-    super.stop()
-    job?.cancel()
-  }
+    override fun stop() {
+        super.stop()
+        job?.cancel()
+    }
 
-  fun createFollowAccountsFilter(): TypedFilter {
-    val follows = account.liveHomeFollowLists.value?.users
-    val followSet = follows?.plus(account.userProfile().pubkeyHex)?.toList()?.ifEmpty { null }
+    fun createFollowAccountsFilter(): TypedFilter {
+        val follows = account.liveHomeFollowLists.value?.users
+        val followSet = follows?.plus(account.userProfile().pubkeyHex)?.toList()?.ifEmpty { null }
 
-    return TypedFilter(
-      types = setOf(FeedType.FOLLOWS),
-      filter =
-        JsonFilter(
-          kinds =
-            listOf(
-              TextNoteEvent.KIND,
-              RepostEvent.KIND,
-              GenericRepostEvent.KIND,
-              ClassifiedsEvent.KIND,
-              LongTextNoteEvent.KIND,
-              PollNoteEvent.KIND,
-              HighlightEvent.KIND,
-              AudioTrackEvent.KIND,
-              AudioHeaderEvent.KIND,
-              PinListEvent.KIND,
-              LiveActivitiesChatMessageEvent.KIND,
-              LiveActivitiesEvent.KIND,
-            ),
-          authors = followSet,
-          limit = 400,
-          since =
-            latestEOSEs.users[account.userProfile()]
-              ?.followList
-              ?.get(account.defaultHomeFollowList.value)
-              ?.relayList,
-        ),
-    )
-  }
-
-  fun createFollowTagsFilter(): TypedFilter? {
-    val hashToLoad = account.liveHomeFollowLists.value?.hashtags ?: return null
-
-    if (hashToLoad.isEmpty()) return null
-
-    return TypedFilter(
-      types = setOf(FeedType.FOLLOWS),
-      filter =
-        JsonFilter(
-          kinds =
-            listOf(
-              TextNoteEvent.KIND,
-              LongTextNoteEvent.KIND,
-              ClassifiedsEvent.KIND,
-              HighlightEvent.KIND,
-              AudioHeaderEvent.KIND,
-              AudioTrackEvent.KIND,
-              PinListEvent.KIND,
-            ),
-          tags =
-            mapOf(
-              "t" to
-                hashToLoad
-                  .map { listOf(it, it.lowercase(), it.uppercase(), it.capitalize()) }
-                  .flatten(),
-            ),
-          limit = 100,
-          since =
-            latestEOSEs.users[account.userProfile()]
-              ?.followList
-              ?.get(account.defaultHomeFollowList.value)
-              ?.relayList,
-        ),
-    )
-  }
-
-  fun createFollowGeohashesFilter(): TypedFilter? {
-    val hashToLoad = account.liveHomeFollowLists.value?.geotags ?: return null
-
-    if (hashToLoad.isEmpty()) return null
-
-    return TypedFilter(
-      types = setOf(FeedType.FOLLOWS),
-      filter =
-        JsonFilter(
-          kinds =
-            listOf(
-              TextNoteEvent.KIND,
-              LongTextNoteEvent.KIND,
-              ClassifiedsEvent.KIND,
-              HighlightEvent.KIND,
-              AudioHeaderEvent.KIND,
-              AudioTrackEvent.KIND,
-              PinListEvent.KIND,
-            ),
-          tags =
-            mapOf(
-              "g" to
-                hashToLoad
-                  .map { listOf(it, it.lowercase(), it.uppercase(), it.capitalize()) }
-                  .flatten(),
-            ),
-          limit = 100,
-          since =
-            latestEOSEs.users[account.userProfile()]
-              ?.followList
-              ?.get(account.defaultHomeFollowList.value)
-              ?.relayList,
-        ),
-    )
-  }
-
-  fun createFollowCommunitiesFilter(): TypedFilter? {
-    val communitiesToLoad = account.liveHomeFollowLists.value?.communities ?: return null
-
-    if (communitiesToLoad.isEmpty()) return null
-
-    return TypedFilter(
-      types = setOf(FeedType.FOLLOWS),
-      filter =
-        JsonFilter(
-          kinds =
-            listOf(
-              TextNoteEvent.KIND,
-              LongTextNoteEvent.KIND,
-              ClassifiedsEvent.KIND,
-              HighlightEvent.KIND,
-              AudioHeaderEvent.KIND,
-              AudioTrackEvent.KIND,
-              PinListEvent.KIND,
-              CommunityPostApprovalEvent.KIND,
-            ),
-          tags =
-            mapOf(
-              "a" to communitiesToLoad.toList(),
-            ),
-          limit = 100,
-          since =
-            latestEOSEs.users[account.userProfile()]
-              ?.followList
-              ?.get(account.defaultHomeFollowList.value)
-              ?.relayList,
-        ),
-    )
-  }
-
-  val followAccountChannel = requestNewChannel { time, relayUrl ->
-    latestEOSEs.addOrUpdate(
-      account.userProfile(),
-      account.defaultHomeFollowList.value,
-      relayUrl,
-      time,
-    )
-  }
-
-  override fun updateChannelFilters() {
-    followAccountChannel.typedFilters =
-      listOfNotNull(
-          createFollowAccountsFilter(),
-          createFollowCommunitiesFilter(),
-          createFollowTagsFilter(),
-          createFollowGeohashesFilter(),
+        return TypedFilter(
+            types = setOf(FeedType.FOLLOWS),
+            filter =
+                JsonFilter(
+                    kinds =
+                        listOf(
+                            TextNoteEvent.KIND,
+                            RepostEvent.KIND,
+                            GenericRepostEvent.KIND,
+                            ClassifiedsEvent.KIND,
+                            LongTextNoteEvent.KIND,
+                            PollNoteEvent.KIND,
+                            HighlightEvent.KIND,
+                            AudioTrackEvent.KIND,
+                            AudioHeaderEvent.KIND,
+                            PinListEvent.KIND,
+                            LiveActivitiesChatMessageEvent.KIND,
+                            LiveActivitiesEvent.KIND,
+                        ),
+                    authors = followSet,
+                    limit = 400,
+                    since =
+                        latestEOSEs.users[account.userProfile()]
+                            ?.followList
+                            ?.get(account.defaultHomeFollowList.value)
+                            ?.relayList,
+                ),
         )
-        .ifEmpty { null }
-  }
+    }
+
+    fun createFollowTagsFilter(): TypedFilter? {
+        val hashToLoad = account.liveHomeFollowLists.value?.hashtags ?: return null
+
+        if (hashToLoad.isEmpty()) return null
+
+        return TypedFilter(
+            types = setOf(FeedType.FOLLOWS),
+            filter =
+                JsonFilter(
+                    kinds =
+                        listOf(
+                            TextNoteEvent.KIND,
+                            LongTextNoteEvent.KIND,
+                            ClassifiedsEvent.KIND,
+                            HighlightEvent.KIND,
+                            AudioHeaderEvent.KIND,
+                            AudioTrackEvent.KIND,
+                            PinListEvent.KIND,
+                        ),
+                    tags =
+                        mapOf(
+                            "t" to
+                                hashToLoad
+                                    .map { listOf(it, it.lowercase(), it.uppercase(), it.capitalize()) }
+                                    .flatten(),
+                        ),
+                    limit = 100,
+                    since =
+                        latestEOSEs.users[account.userProfile()]
+                            ?.followList
+                            ?.get(account.defaultHomeFollowList.value)
+                            ?.relayList,
+                ),
+        )
+    }
+
+    fun createFollowGeohashesFilter(): TypedFilter? {
+        val hashToLoad = account.liveHomeFollowLists.value?.geotags ?: return null
+
+        if (hashToLoad.isEmpty()) return null
+
+        return TypedFilter(
+            types = setOf(FeedType.FOLLOWS),
+            filter =
+                JsonFilter(
+                    kinds =
+                        listOf(
+                            TextNoteEvent.KIND,
+                            LongTextNoteEvent.KIND,
+                            ClassifiedsEvent.KIND,
+                            HighlightEvent.KIND,
+                            AudioHeaderEvent.KIND,
+                            AudioTrackEvent.KIND,
+                            PinListEvent.KIND,
+                        ),
+                    tags =
+                        mapOf(
+                            "g" to
+                                hashToLoad
+                                    .map { listOf(it, it.lowercase(), it.uppercase(), it.capitalize()) }
+                                    .flatten(),
+                        ),
+                    limit = 100,
+                    since =
+                        latestEOSEs.users[account.userProfile()]
+                            ?.followList
+                            ?.get(account.defaultHomeFollowList.value)
+                            ?.relayList,
+                ),
+        )
+    }
+
+    fun createFollowCommunitiesFilter(): TypedFilter? {
+        val communitiesToLoad = account.liveHomeFollowLists.value?.communities ?: return null
+
+        if (communitiesToLoad.isEmpty()) return null
+
+        return TypedFilter(
+            types = setOf(FeedType.FOLLOWS),
+            filter =
+                JsonFilter(
+                    kinds =
+                        listOf(
+                            TextNoteEvent.KIND,
+                            LongTextNoteEvent.KIND,
+                            ClassifiedsEvent.KIND,
+                            HighlightEvent.KIND,
+                            AudioHeaderEvent.KIND,
+                            AudioTrackEvent.KIND,
+                            PinListEvent.KIND,
+                            CommunityPostApprovalEvent.KIND,
+                        ),
+                    tags =
+                        mapOf(
+                            "a" to communitiesToLoad.toList(),
+                        ),
+                    limit = 100,
+                    since =
+                        latestEOSEs.users[account.userProfile()]
+                            ?.followList
+                            ?.get(account.defaultHomeFollowList.value)
+                            ?.relayList,
+                ),
+        )
+    }
+
+    val followAccountChannel =
+        requestNewChannel { time, relayUrl ->
+            latestEOSEs.addOrUpdate(
+                account.userProfile(),
+                account.defaultHomeFollowList.value,
+                relayUrl,
+                time,
+            )
+        }
+
+    override fun updateChannelFilters() {
+        followAccountChannel.typedFilters =
+            listOfNotNull(
+                createFollowAccountsFilter(),
+                createFollowCommunitiesFilter(),
+                createFollowTagsFilter(),
+                createFollowGeohashesFilter(),
+            )
+                .ifEmpty { null }
+    }
 }

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

@@ -30,50 +30,50 @@ import com.vitorpamplona.quartz.events.RelayAuthEvent
 import com.vitorpamplona.quartz.signers.NostrSigner
 
 class NostrLnZapPaymentResponseDataSource(
-  private val fromServiceHex: String,
-  private val toUserHex: String,
-  private val replyingToHex: String,
-  private val authSigner: NostrSigner,
+    private val fromServiceHex: String,
+    private val toUserHex: String,
+    private val replyingToHex: String,
+    private val authSigner: NostrSigner,
 ) : NostrDataSource("LnZapPaymentResponseFeed") {
-  val feedTypes = setOf(FeedType.WALLET_CONNECT)
+    val feedTypes = setOf(FeedType.WALLET_CONNECT)
 
-  private fun createWalletConnectServiceWatcher(): TypedFilter {
-    // downloads all the reactions to a given event.
-    return TypedFilter(
-      types = feedTypes,
-      filter =
-        JsonFilter(
-          kinds = listOf(LnZapPaymentResponseEvent.KIND),
-          authors = listOf(fromServiceHex),
-          tags =
-            mapOf(
-              "e" to listOf(replyingToHex),
-              "p" to listOf(toUserHex),
-            ),
-          limit = 1,
-        ),
-    )
-  }
-
-  val channel = requestNewChannel()
-
-  override fun updateChannelFilters() {
-    val wc = createWalletConnectServiceWatcher()
-
-    channel.typedFilters = listOfNotNull(wc).ifEmpty { null }
-  }
-
-  override fun auth(
-    relay: Relay,
-    challenge: String,
-  ) {
-    super.auth(relay, challenge)
-
-    RelayAuthEvent.create(relay.url, challenge, authSigner) {
-      Client.send(
-        it,
-        relay.url,
-      )
+    private fun createWalletConnectServiceWatcher(): TypedFilter {
+        // downloads all the reactions to a given event.
+        return TypedFilter(
+            types = feedTypes,
+            filter =
+                JsonFilter(
+                    kinds = listOf(LnZapPaymentResponseEvent.KIND),
+                    authors = listOf(fromServiceHex),
+                    tags =
+                        mapOf(
+                            "e" to listOf(replyingToHex),
+                            "p" to listOf(toUserHex),
+                        ),
+                    limit = 1,
+                ),
+        )
+    }
+
+    val channel = requestNewChannel()
+
+    override fun updateChannelFilters() {
+        val wc = createWalletConnectServiceWatcher()
+
+        channel.typedFilters = listOfNotNull(wc).ifEmpty { null }
+    }
+
+    override fun auth(
+        relay: Relay,
+        challenge: String,
+    ) {
+        super.auth(relay, challenge)
+
+        RelayAuthEvent.create(relay.url, challenge, authSigner) {
+            Client.send(
+                it,
+                relay.url,
+            )
+        }
     }
-  }
 }

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

@@ -48,120 +48,120 @@ import com.vitorpamplona.quartz.events.PollNoteEvent
 import com.vitorpamplona.quartz.events.TextNoteEvent
 
 object NostrSearchEventOrUserDataSource : NostrDataSource("SearchEventFeed") {
-  private var searchString: String? = null
+    private var searchString: String? = null
 
-  private fun createAnythingWithIDFilter(): List<TypedFilter>? {
-    val mySearchString = searchString
-    if (mySearchString.isNullOrBlank()) {
-      return null
-    }
+    private fun createAnythingWithIDFilter(): List<TypedFilter>? {
+        val mySearchString = searchString
+        if (mySearchString.isNullOrBlank()) {
+            return null
+        }
 
-    val hexToWatch =
-      try {
-        val isAStraightHex =
-          if (HexValidator.isHex(mySearchString)) {
-            Hex.decode(mySearchString).toHexKey()
-          } else {
-            null
-          }
+        val hexToWatch =
+            try {
+                val isAStraightHex =
+                    if (HexValidator.isHex(mySearchString)) {
+                        Hex.decode(mySearchString).toHexKey()
+                    } else {
+                        null
+                    }
 
-        Nip19.uriToRoute(mySearchString)?.hex ?: isAStraightHex
-      } catch (e: Exception) {
-        null
-      }
+                Nip19.uriToRoute(mySearchString)?.hex ?: isAStraightHex
+            } catch (e: Exception) {
+                null
+            }
 
-    // downloads all the reactions to a given event.
-    return listOfNotNull(
-      hexToWatch?.let {
-        TypedFilter(
-          types = COMMON_FEED_TYPES,
-          filter =
-            JsonFilter(
-              ids = listOfNotNull(hexToWatch),
+        // downloads all the reactions to a given event.
+        return listOfNotNull(
+            hexToWatch?.let {
+                TypedFilter(
+                    types = COMMON_FEED_TYPES,
+                    filter =
+                        JsonFilter(
+                            ids = listOfNotNull(hexToWatch),
+                        ),
+                )
+            },
+            hexToWatch?.let {
+                TypedFilter(
+                    types = COMMON_FEED_TYPES,
+                    filter =
+                        JsonFilter(
+                            kinds = listOf(MetadataEvent.KIND),
+                            authors = listOfNotNull(hexToWatch),
+                        ),
+                )
+            },
+            TypedFilter(
+                types = setOf(FeedType.SEARCH),
+                filter =
+                    JsonFilter(
+                        kinds = listOf(MetadataEvent.KIND),
+                        search = mySearchString,
+                        limit = 100,
+                    ),
+            ),
+            TypedFilter(
+                types = setOf(FeedType.SEARCH),
+                filter =
+                    JsonFilter(
+                        kinds =
+                            listOf(
+                                TextNoteEvent.KIND,
+                                LongTextNoteEvent.KIND,
+                                BadgeDefinitionEvent.KIND,
+                                PeopleListEvent.KIND,
+                                BookmarkListEvent.KIND,
+                                AudioHeaderEvent.KIND,
+                                AudioTrackEvent.KIND,
+                                PinListEvent.KIND,
+                                PollNoteEvent.KIND,
+                                ChannelCreateEvent.KIND,
+                            ),
+                        search = mySearchString,
+                        limit = 100,
+                    ),
+            ),
+            TypedFilter(
+                types = setOf(FeedType.SEARCH),
+                filter =
+                    JsonFilter(
+                        kinds =
+                            listOf(
+                                ChannelMetadataEvent.KIND,
+                                ClassifiedsEvent.KIND,
+                                CommunityDefinitionEvent.KIND,
+                                EmojiPackEvent.KIND,
+                                HighlightEvent.KIND,
+                                LiveActivitiesEvent.KIND,
+                                PollNoteEvent.KIND,
+                                NNSEvent.KIND,
+                            ),
+                        search = mySearchString,
+                        limit = 100,
+                    ),
             ),
         )
-      },
-      hexToWatch?.let {
-        TypedFilter(
-          types = COMMON_FEED_TYPES,
-          filter =
-            JsonFilter(
-              kinds = listOf(MetadataEvent.KIND),
-              authors = listOfNotNull(hexToWatch),
-            ),
-        )
-      },
-      TypedFilter(
-        types = setOf(FeedType.SEARCH),
-        filter =
-          JsonFilter(
-            kinds = listOf(MetadataEvent.KIND),
-            search = mySearchString,
-            limit = 100,
-          ),
-      ),
-      TypedFilter(
-        types = setOf(FeedType.SEARCH),
-        filter =
-          JsonFilter(
-            kinds =
-              listOf(
-                TextNoteEvent.KIND,
-                LongTextNoteEvent.KIND,
-                BadgeDefinitionEvent.KIND,
-                PeopleListEvent.KIND,
-                BookmarkListEvent.KIND,
-                AudioHeaderEvent.KIND,
-                AudioTrackEvent.KIND,
-                PinListEvent.KIND,
-                PollNoteEvent.KIND,
-                ChannelCreateEvent.KIND,
-              ),
-            search = mySearchString,
-            limit = 100,
-          ),
-      ),
-      TypedFilter(
-        types = setOf(FeedType.SEARCH),
-        filter =
-          JsonFilter(
-            kinds =
-              listOf(
-                ChannelMetadataEvent.KIND,
-                ClassifiedsEvent.KIND,
-                CommunityDefinitionEvent.KIND,
-                EmojiPackEvent.KIND,
-                HighlightEvent.KIND,
-                LiveActivitiesEvent.KIND,
-                PollNoteEvent.KIND,
-                NNSEvent.KIND,
-              ),
-            search = mySearchString,
-            limit = 100,
-          ),
-      ),
-    )
-  }
-
-  val searchChannel = requestNewChannel()
-
-  override fun updateChannelFilters() {
-    searchChannel.typedFilters = createAnythingWithIDFilter()
-  }
-
-  fun search(searchString: String) {
-    if (this.searchString != searchString) {
-      println("DataSource: ${this.javaClass.simpleName} Search for $searchString")
-      this.searchString = searchString
-      invalidateFilters()
     }
-  }
 
-  fun clear() {
-    if (searchString != null) {
-      println("DataSource: ${this.javaClass.simpleName} Clear")
-      searchString = null
-      invalidateFilters()
+    val searchChannel = requestNewChannel()
+
+    override fun updateChannelFilters() {
+        searchChannel.typedFilters = createAnythingWithIDFilter()
+    }
+
+    fun search(searchString: String) {
+        if (this.searchString != searchString) {
+            println("DataSource: ${this.javaClass.simpleName} Search for $searchString")
+            this.searchString = searchString
+            invalidateFilters()
+        }
+    }
+
+    fun clear() {
+        if (searchString != null) {
+            println("DataSource: ${this.javaClass.simpleName} Clear")
+            searchString = null
+            invalidateFilters()
+        }
     }
-  }
 }

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

@@ -31,95 +31,95 @@ import com.vitorpamplona.quartz.events.ChannelCreateEvent
 import com.vitorpamplona.quartz.events.ChannelMetadataEvent
 
 object NostrSingleChannelDataSource : NostrDataSource("SingleChannelFeed") {
-  private var channelsToWatch = setOf<Channel>()
+    private var channelsToWatch = setOf<Channel>()
 
-  private fun createMetadataChangeFilter(): TypedFilter? {
-    val reactionsToWatch = channelsToWatch.filter { it is PublicChatChannel }.map { it.idHex }
+    private fun createMetadataChangeFilter(): TypedFilter? {
+        val reactionsToWatch = channelsToWatch.filter { it is PublicChatChannel }.map { it.idHex }
 
-    if (reactionsToWatch.isEmpty()) {
-      return null
-    }
+        if (reactionsToWatch.isEmpty()) {
+            return null
+        }
 
-    // downloads all the reactions to a given event.
-    return TypedFilter(
-      types = setOf(FeedType.PUBLIC_CHATS),
-      filter =
-        JsonFilter(
-          kinds = listOf(ChannelMetadataEvent.KIND),
-          tags = mapOf("e" to reactionsToWatch),
-        ),
-    )
-  }
-
-  fun createLoadEventsIfNotLoadedFilter(): TypedFilter? {
-    val directEventsToLoad =
-      channelsToWatch.filter { it.notes.isEmpty() && it is PublicChatChannel }
-
-    val interestedEvents = (directEventsToLoad).map { it.idHex }.toSet()
-
-    if (interestedEvents.isEmpty()) {
-      return null
-    }
-
-    // downloads linked events to this event.
-    return TypedFilter(
-      types = COMMON_FEED_TYPES,
-      filter =
-        JsonFilter(
-          kinds = listOf(ChannelCreateEvent.KIND),
-          ids = interestedEvents.toList(),
-        ),
-    )
-  }
-
-  fun createLoadStreamingIfNotLoadedFilter(): List<TypedFilter>? {
-    val directEventsToLoad =
-      channelsToWatch.filterIsInstance<LiveActivitiesChannel>().filter { it.info == null }
-
-    val interestedEvents = (directEventsToLoad).map { it.idHex }.toSet()
-
-    if (interestedEvents.isEmpty()) {
-      return null
-    }
-
-    // downloads linked events to this event.
-    return directEventsToLoad.map {
-      it.address().let { aTag ->
-        TypedFilter(
-          types = COMMON_FEED_TYPES,
-          filter =
-            JsonFilter(
-              kinds = listOf(aTag.kind),
-              tags = mapOf("d" to listOf(aTag.dTag)),
-              authors = listOf(aTag.pubKeyHex),
-            ),
+        // downloads all the reactions to a given event.
+        return TypedFilter(
+            types = setOf(FeedType.PUBLIC_CHATS),
+            filter =
+                JsonFilter(
+                    kinds = listOf(ChannelMetadataEvent.KIND),
+                    tags = mapOf("e" to reactionsToWatch),
+                ),
         )
-      }
     }
-  }
 
-  val singleChannelChannel = requestNewChannel()
+    fun createLoadEventsIfNotLoadedFilter(): TypedFilter? {
+        val directEventsToLoad =
+            channelsToWatch.filter { it.notes.isEmpty() && it is PublicChatChannel }
 
-  override fun updateChannelFilters() {
-    val reactions = createMetadataChangeFilter()
-    val missing = createLoadEventsIfNotLoadedFilter()
-    val missingStreaming = createLoadStreamingIfNotLoadedFilter()
+        val interestedEvents = (directEventsToLoad).map { it.idHex }.toSet()
 
-    singleChannelChannel.typedFilters =
-      ((listOfNotNull(reactions, missing)) + (missingStreaming ?: emptyList())).ifEmpty { null }
-  }
+        if (interestedEvents.isEmpty()) {
+            return null
+        }
 
-  fun add(eventId: Channel) {
-    if (eventId !in channelsToWatch) {
-      channelsToWatch = channelsToWatch.plus(eventId)
-      invalidateFilters()
+        // downloads linked events to this event.
+        return TypedFilter(
+            types = COMMON_FEED_TYPES,
+            filter =
+                JsonFilter(
+                    kinds = listOf(ChannelCreateEvent.KIND),
+                    ids = interestedEvents.toList(),
+                ),
+        )
     }
-  }
 
-  fun remove(eventId: Channel) {
-    if (eventId in channelsToWatch) {
-      channelsToWatch = channelsToWatch.minus(eventId)
-      invalidateFilters()
+    fun createLoadStreamingIfNotLoadedFilter(): List<TypedFilter>? {
+        val directEventsToLoad =
+            channelsToWatch.filterIsInstance<LiveActivitiesChannel>().filter { it.info == null }
+
+        val interestedEvents = (directEventsToLoad).map { it.idHex }.toSet()
+
+        if (interestedEvents.isEmpty()) {
+            return null
+        }
+
+        // downloads linked events to this event.
+        return directEventsToLoad.map {
+            it.address().let { aTag ->
+                TypedFilter(
+                    types = COMMON_FEED_TYPES,
+                    filter =
+                        JsonFilter(
+                            kinds = listOf(aTag.kind),
+                            tags = mapOf("d" to listOf(aTag.dTag)),
+                            authors = listOf(aTag.pubKeyHex),
+                        ),
+                )
+            }
+        }
+    }
+
+    val singleChannelChannel = requestNewChannel()
+
+    override fun updateChannelFilters() {
+        val reactions = createMetadataChangeFilter()
+        val missing = createLoadEventsIfNotLoadedFilter()
+        val missingStreaming = createLoadStreamingIfNotLoadedFilter()
+
+        singleChannelChannel.typedFilters =
+            ((listOfNotNull(reactions, missing)) + (missingStreaming ?: emptyList())).ifEmpty { null }
+    }
+
+    fun add(eventId: Channel) {
+        if (eventId !in channelsToWatch) {
+            channelsToWatch = channelsToWatch.plus(eventId)
+            invalidateFilters()
+        }
+    }
+
+    fun remove(eventId: Channel) {
+        if (eventId in channelsToWatch) {
+            channelsToWatch = channelsToWatch.minus(eventId)
+            invalidateFilters()
+        }
     }
-  }
 }

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

@@ -38,242 +38,245 @@ import com.vitorpamplona.quartz.events.RepostEvent
 import com.vitorpamplona.quartz.events.TextNoteEvent
 
 object NostrSingleEventDataSource : NostrDataSource("SingleEventFeed") {
-  private var eventsToWatch = setOf<Note>()
-  private var addressesToWatch = setOf<Note>()
+    private var eventsToWatch = setOf<Note>()
+    private var addressesToWatch = setOf<Note>()
 
-  private fun createReactionsToWatchInAddressFilter(): List<TypedFilter>? {
-    val addressesToWatch =
-      (eventsToWatch.filter { it.address() != null } +
-          addressesToWatch.filter { it.address() != null })
-        .toSet()
+    private fun createReactionsToWatchInAddressFilter(): List<TypedFilter>? {
+        val addressesToWatch =
+            (
+                eventsToWatch.filter { it.address() != null } +
+                    addressesToWatch.filter { it.address() != null }
+            )
+                .toSet()
 
-    if (addressesToWatch.isEmpty()) {
-      return null
-    }
-
-    return groupByEOSEPresence(addressesToWatch).map {
-      TypedFilter(
-        types = COMMON_FEED_TYPES,
-        filter =
-          JsonFilter(
-            kinds =
-              listOf(
-                TextNoteEvent.KIND,
-                ReactionEvent.KIND,
-                RepostEvent.KIND,
-                GenericRepostEvent.KIND,
-                ReportEvent.KIND,
-                LnZapEvent.KIND,
-                PollNoteEvent.KIND,
-                CommunityPostApprovalEvent.KIND,
-                LiveActivitiesChatMessageEvent.KIND,
-              ),
-            tags = mapOf("a" to it.mapNotNull { it.address()?.toTag() }),
-            since = findMinimumEOSEs(it),
-            // Max amount of "replies" to download on a specific event.
-            limit = 1000,
-          ),
-      )
-    }
-  }
-
-  private fun createAddressFilter(): List<TypedFilter>? {
-    val addressesToWatch = addressesToWatch.filter { it.event == null }
-
-    if (addressesToWatch.isEmpty()) {
-      return null
-    }
-
-    return addressesToWatch.mapNotNull {
-      it.address()?.let { aTag ->
-        if (aTag.kind < 25000 && aTag.dTag.isBlank()) {
-          TypedFilter(
-            types = COMMON_FEED_TYPES,
-            filter =
-              JsonFilter(
-                kinds = listOf(aTag.kind),
-                authors = listOf(aTag.pubKeyHex),
-                limit = 5,
-              ),
-          )
-        } else {
-          TypedFilter(
-            types = COMMON_FEED_TYPES,
-            filter =
-              JsonFilter(
-                kinds = listOf(aTag.kind),
-                tags = mapOf("d" to listOf(aTag.dTag)),
-                authors = listOf(aTag.pubKeyHex),
-                limit = 5,
-              ),
-          )
+        if (addressesToWatch.isEmpty()) {
+            return null
         }
-      }
-    }
-  }
 
-  private fun createRepliesAndReactionsFilter(): List<TypedFilter>? {
-    if (eventsToWatch.isEmpty()) {
-      return null
+        return groupByEOSEPresence(addressesToWatch).map {
+            TypedFilter(
+                types = COMMON_FEED_TYPES,
+                filter =
+                    JsonFilter(
+                        kinds =
+                            listOf(
+                                TextNoteEvent.KIND,
+                                ReactionEvent.KIND,
+                                RepostEvent.KIND,
+                                GenericRepostEvent.KIND,
+                                ReportEvent.KIND,
+                                LnZapEvent.KIND,
+                                PollNoteEvent.KIND,
+                                CommunityPostApprovalEvent.KIND,
+                                LiveActivitiesChatMessageEvent.KIND,
+                            ),
+                        tags = mapOf("a" to it.mapNotNull { it.address()?.toTag() }),
+                        since = findMinimumEOSEs(it),
+                        // Max amount of "replies" to download on a specific event.
+                        limit = 1000,
+                    ),
+            )
+        }
     }
 
-    return groupByEOSEPresence(eventsToWatch).map {
-      TypedFilter(
-        types = COMMON_FEED_TYPES,
-        filter =
-          JsonFilter(
-            kinds =
-              listOf(
-                TextNoteEvent.KIND,
-                ReactionEvent.KIND,
-                RepostEvent.KIND,
-                GenericRepostEvent.KIND,
-                ReportEvent.KIND,
-                LnZapEvent.KIND,
-                PollNoteEvent.KIND,
-              ),
-            tags = mapOf("e" to it.map { it.idHex }),
-            since = findMinimumEOSEs(it),
-            // Max amount of "replies" to download on a specific event.
-            limit = 1000,
-          ),
-      )
-    }
-  }
+    private fun createAddressFilter(): List<TypedFilter>? {
+        val addressesToWatch = addressesToWatch.filter { it.event == null }
 
-  fun createLoadEventsIfNotLoadedFilter(): List<TypedFilter>? {
-    val directEventsToLoad = eventsToWatch.filter { it.event == null }
+        if (addressesToWatch.isEmpty()) {
+            return null
+        }
 
-    val threadingEventsToLoad =
-      eventsToWatch
-        .mapNotNull { it.replyTo }
-        .flatten()
-        .filter { it !is AddressableNote && it.event == null }
-
-    val interestedEvents = (directEventsToLoad + threadingEventsToLoad).map { it.idHex }.toSet()
-
-    if (interestedEvents.isEmpty()) {
-      return null
+        return addressesToWatch.mapNotNull {
+            it.address()?.let { aTag ->
+                if (aTag.kind < 25000 && aTag.dTag.isBlank()) {
+                    TypedFilter(
+                        types = COMMON_FEED_TYPES,
+                        filter =
+                            JsonFilter(
+                                kinds = listOf(aTag.kind),
+                                authors = listOf(aTag.pubKeyHex),
+                                limit = 5,
+                            ),
+                    )
+                } else {
+                    TypedFilter(
+                        types = COMMON_FEED_TYPES,
+                        filter =
+                            JsonFilter(
+                                kinds = listOf(aTag.kind),
+                                tags = mapOf("d" to listOf(aTag.dTag)),
+                                authors = listOf(aTag.pubKeyHex),
+                                limit = 5,
+                            ),
+                    )
+                }
+            }
+        }
     }
 
-    // downloads linked events to this event.
-    return listOf(
-      TypedFilter(
-        types = COMMON_FEED_TYPES,
-        filter =
-          JsonFilter(
-            ids = interestedEvents.toList(),
-          ),
-      ),
-    )
-  }
+    private fun createRepliesAndReactionsFilter(): List<TypedFilter>? {
+        if (eventsToWatch.isEmpty()) {
+            return null
+        }
 
-  val singleEventChannel = requestNewChannel { time, relayUrl ->
-    // Ignores EOSE if it is in the middle of a filter change.
-    if (changingFilters.get()) return@requestNewChannel
-
-    checkNotInMainThread()
-
-    eventsToWatch.forEach {
-      val eose = it.lastReactionsDownloadTime[relayUrl]
-      if (eose == null) {
-        it.lastReactionsDownloadTime = it.lastReactionsDownloadTime + Pair(relayUrl, EOSETime(time))
-      } else {
-        eose.time = time
-      }
+        return groupByEOSEPresence(eventsToWatch).map {
+            TypedFilter(
+                types = COMMON_FEED_TYPES,
+                filter =
+                    JsonFilter(
+                        kinds =
+                            listOf(
+                                TextNoteEvent.KIND,
+                                ReactionEvent.KIND,
+                                RepostEvent.KIND,
+                                GenericRepostEvent.KIND,
+                                ReportEvent.KIND,
+                                LnZapEvent.KIND,
+                                PollNoteEvent.KIND,
+                            ),
+                        tags = mapOf("e" to it.map { it.idHex }),
+                        since = findMinimumEOSEs(it),
+                        // Max amount of "replies" to download on a specific event.
+                        limit = 1000,
+                    ),
+            )
+        }
     }
 
-    addressesToWatch.forEach {
-      val eose = it.lastReactionsDownloadTime[relayUrl]
-      if (eose == null) {
-        it.lastReactionsDownloadTime = it.lastReactionsDownloadTime + Pair(relayUrl, EOSETime(time))
-      } else {
-        eose.time = time
-      }
+    fun createLoadEventsIfNotLoadedFilter(): List<TypedFilter>? {
+        val directEventsToLoad = eventsToWatch.filter { it.event == null }
+
+        val threadingEventsToLoad =
+            eventsToWatch
+                .mapNotNull { it.replyTo }
+                .flatten()
+                .filter { it !is AddressableNote && it.event == null }
+
+        val interestedEvents = (directEventsToLoad + threadingEventsToLoad).map { it.idHex }.toSet()
+
+        if (interestedEvents.isEmpty()) {
+            return null
+        }
+
+        // downloads linked events to this event.
+        return listOf(
+            TypedFilter(
+                types = COMMON_FEED_TYPES,
+                filter =
+                    JsonFilter(
+                        ids = interestedEvents.toList(),
+                    ),
+            ),
+        )
     }
 
-    // Many relays operate with limits in the amount of filters.
-    // As information comes, the filters will be rotated to get more data.
-    invalidateFilters()
-  }
+    val singleEventChannel =
+        requestNewChannel { time, relayUrl ->
+            // Ignores EOSE if it is in the middle of a filter change.
+            if (changingFilters.get()) return@requestNewChannel
 
-  override fun updateChannelFilters() {
-    val reactions = createRepliesAndReactionsFilter()
-    val missing = createLoadEventsIfNotLoadedFilter()
-    val addresses = createAddressFilter()
-    val addressReactions = createReactionsToWatchInAddressFilter()
+            checkNotInMainThread()
 
-    singleEventChannel.typedFilters =
-      listOfNotNull(missing, addresses, reactions, addressReactions).flatten().ifEmpty { null }
-  }
+            eventsToWatch.forEach {
+                val eose = it.lastReactionsDownloadTime[relayUrl]
+                if (eose == null) {
+                    it.lastReactionsDownloadTime = it.lastReactionsDownloadTime + Pair(relayUrl, EOSETime(time))
+                } else {
+                    eose.time = time
+                }
+            }
 
-  fun add(eventId: Note) {
-    if (!eventsToWatch.contains(eventId)) {
-      eventsToWatch = eventsToWatch.plus(eventId)
-      invalidateFilters()
+            addressesToWatch.forEach {
+                val eose = it.lastReactionsDownloadTime[relayUrl]
+                if (eose == null) {
+                    it.lastReactionsDownloadTime = it.lastReactionsDownloadTime + Pair(relayUrl, EOSETime(time))
+                } else {
+                    eose.time = time
+                }
+            }
+
+            // Many relays operate with limits in the amount of filters.
+            // As information comes, the filters will be rotated to get more data.
+            invalidateFilters()
+        }
+
+    override fun updateChannelFilters() {
+        val reactions = createRepliesAndReactionsFilter()
+        val missing = createLoadEventsIfNotLoadedFilter()
+        val addresses = createAddressFilter()
+        val addressReactions = createReactionsToWatchInAddressFilter()
+
+        singleEventChannel.typedFilters =
+            listOfNotNull(missing, addresses, reactions, addressReactions).flatten().ifEmpty { null }
     }
-  }
 
-  fun remove(eventId: Note) {
-    if (eventsToWatch.contains(eventId)) {
-      eventsToWatch = eventsToWatch.minus(eventId)
-      invalidateFilters()
+    fun add(eventId: Note) {
+        if (!eventsToWatch.contains(eventId)) {
+            eventsToWatch = eventsToWatch.plus(eventId)
+            invalidateFilters()
+        }
     }
-  }
 
-  fun addAddress(addressableNote: Note) {
-    if (!addressesToWatch.contains(addressableNote)) {
-      addressesToWatch = addressesToWatch.plus(addressableNote)
-      invalidateFilters()
+    fun remove(eventId: Note) {
+        if (eventsToWatch.contains(eventId)) {
+            eventsToWatch = eventsToWatch.minus(eventId)
+            invalidateFilters()
+        }
     }
-  }
 
-  fun removeAddress(addressableNote: Note) {
-    if (addressesToWatch.contains(addressableNote)) {
-      addressesToWatch = addressesToWatch.minus(addressableNote)
-      invalidateFilters()
+    fun addAddress(addressableNote: Note) {
+        if (!addressesToWatch.contains(addressableNote)) {
+            addressesToWatch = addressesToWatch.plus(addressableNote)
+            invalidateFilters()
+        }
+    }
+
+    fun removeAddress(addressableNote: Note) {
+        if (addressesToWatch.contains(addressableNote)) {
+            addressesToWatch = addressesToWatch.minus(addressableNote)
+            invalidateFilters()
+        }
     }
-  }
 }
 
 fun groupByEOSEPresence(notes: Set<Note>): Collection<List<Note>> {
-  return notes.groupBy { it.lastReactionsDownloadTime.keys.sorted().joinToString(",") }.values
+    return notes.groupBy { it.lastReactionsDownloadTime.keys.sorted().joinToString(",") }.values
 }
 
 fun groupByEOSEPresence(users: Iterable<User>): Collection<List<User>> {
-  return users.groupBy { it.latestEOSEs.keys.sorted().joinToString(",") }.values
+    return users.groupBy { it.latestEOSEs.keys.sorted().joinToString(",") }.values
 }
 
 fun findMinimumEOSEs(notes: List<Note>): Map<String, EOSETime> {
-  val minLatestEOSEs = mutableMapOf<String, EOSETime>()
+    val minLatestEOSEs = mutableMapOf<String, EOSETime>()
 
-  notes.forEach {
-    it.lastReactionsDownloadTime.forEach {
-      val minEose = minLatestEOSEs[it.key]
-      if (minEose == null) {
-        minLatestEOSEs.put(it.key, EOSETime(it.value.time))
-      } else if (it.value.time < minEose.time) {
-        minEose.time = it.value.time
-      }
+    notes.forEach {
+        it.lastReactionsDownloadTime.forEach {
+            val minEose = minLatestEOSEs[it.key]
+            if (minEose == null) {
+                minLatestEOSEs.put(it.key, EOSETime(it.value.time))
+            } else if (it.value.time < minEose.time) {
+                minEose.time = it.value.time
+            }
+        }
     }
-  }
 
-  return minLatestEOSEs
+    return minLatestEOSEs
 }
 
 fun findMinimumEOSEsForUsers(users: List<User>): Map<String, EOSETime> {
-  val minLatestEOSEs = mutableMapOf<String, EOSETime>()
+    val minLatestEOSEs = mutableMapOf<String, EOSETime>()
 
-  users.forEach {
-    it.latestEOSEs.forEach {
-      val minEose = minLatestEOSEs[it.key]
-      if (minEose == null) {
-        minLatestEOSEs.put(it.key, EOSETime(it.value.time))
-      } else if (it.value.time < minEose.time) {
-        minEose.time = it.value.time
-      }
+    users.forEach {
+        it.latestEOSEs.forEach {
+            val minEose = minLatestEOSEs[it.key]
+            if (minEose == null) {
+                minLatestEOSEs.put(it.key, EOSETime(it.value.time))
+            } else if (it.value.time < minEose.time) {
+                minEose.time = it.value.time
+            }
+        }
     }
-  }
 
-  return minLatestEOSEs
+    return minLatestEOSEs
 }

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

@@ -30,100 +30,101 @@ import com.vitorpamplona.quartz.events.ReportEvent
 import com.vitorpamplona.quartz.events.StatusEvent
 
 object NostrSingleUserDataSource : NostrDataSource("SingleUserFeed") {
-  var usersToWatch = setOf<User>()
+    var usersToWatch = setOf<User>()
 
-  fun createUserMetadataFilter(): List<TypedFilter>? {
-    if (usersToWatch.isEmpty()) return null
+    fun createUserMetadataFilter(): List<TypedFilter>? {
+        if (usersToWatch.isEmpty()) return null
 
-    val firstTimers = usersToWatch.filter { it.info?.latestMetadata == null }.map { it.pubkeyHex }
+        val firstTimers = usersToWatch.filter { it.info?.latestMetadata == null }.map { it.pubkeyHex }
 
-    if (firstTimers.isEmpty()) return null
+        if (firstTimers.isEmpty()) return null
 
-    return listOf(
-      TypedFilter(
-        types = COMMON_FEED_TYPES,
-        filter =
-          JsonFilter(
-            kinds = listOf(MetadataEvent.KIND),
-            authors = firstTimers,
-          ),
-      ),
-    )
-  }
-
-  fun createUserMetadataStatusReportFilter(): List<TypedFilter>? {
-    if (usersToWatch.isEmpty()) return null
-
-    val secondTimers = usersToWatch.filter { it.info?.latestMetadata != null }
-
-    if (secondTimers.isEmpty()) return null
-
-    return groupByEOSEPresence(secondTimers)
-      .map { group ->
-        val groupIds = group.map { it.pubkeyHex }
-        val minEOSEs = findMinimumEOSEsForUsers(group)
-        listOf(
-          TypedFilter(
-            types = COMMON_FEED_TYPES,
-            filter =
-              JsonFilter(
-                kinds = listOf(MetadataEvent.KIND, StatusEvent.KIND),
-                authors = groupIds,
-                since = minEOSEs,
-              ),
-          ),
-          TypedFilter(
-            types = COMMON_FEED_TYPES,
-            filter =
-              JsonFilter(
-                kinds = listOf(ReportEvent.KIND),
-                tags = mapOf("p" to groupIds),
-                since = minEOSEs,
-              ),
-          ),
+        return listOf(
+            TypedFilter(
+                types = COMMON_FEED_TYPES,
+                filter =
+                    JsonFilter(
+                        kinds = listOf(MetadataEvent.KIND),
+                        authors = firstTimers,
+                    ),
+            ),
         )
-      }
-      .flatten()
-  }
+    }
 
-  val userChannel = requestNewChannel { time, relayUrl ->
-    checkNotInMainThread()
+    fun createUserMetadataStatusReportFilter(): List<TypedFilter>? {
+        if (usersToWatch.isEmpty()) return null
 
-    usersToWatch.forEach {
-      if (it.info?.latestMetadata != null) {
-        val eose = it.latestEOSEs[relayUrl]
-        if (eose == null) {
-          it.latestEOSEs = it.latestEOSEs + Pair(relayUrl, EOSETime(time))
-        } else {
-          eose.time = time
+        val secondTimers = usersToWatch.filter { it.info?.latestMetadata != null }
+
+        if (secondTimers.isEmpty()) return null
+
+        return groupByEOSEPresence(secondTimers)
+            .map { group ->
+                val groupIds = group.map { it.pubkeyHex }
+                val minEOSEs = findMinimumEOSEsForUsers(group)
+                listOf(
+                    TypedFilter(
+                        types = COMMON_FEED_TYPES,
+                        filter =
+                            JsonFilter(
+                                kinds = listOf(MetadataEvent.KIND, StatusEvent.KIND),
+                                authors = groupIds,
+                                since = minEOSEs,
+                            ),
+                    ),
+                    TypedFilter(
+                        types = COMMON_FEED_TYPES,
+                        filter =
+                            JsonFilter(
+                                kinds = listOf(ReportEvent.KIND),
+                                tags = mapOf("p" to groupIds),
+                                since = minEOSEs,
+                            ),
+                    ),
+                )
+            }
+            .flatten()
+    }
+
+    val userChannel =
+        requestNewChannel { time, relayUrl ->
+            checkNotInMainThread()
+
+            usersToWatch.forEach {
+                if (it.info?.latestMetadata != null) {
+                    val eose = it.latestEOSEs[relayUrl]
+                    if (eose == null) {
+                        it.latestEOSEs = it.latestEOSEs + Pair(relayUrl, EOSETime(time))
+                    } else {
+                        eose.time = time
+                    }
+                }
+            }
         }
-      }
+
+    override fun updateChannelFilters() {
+        checkNotInMainThread()
+
+        userChannel.typedFilters =
+            listOfNotNull(
+                createUserMetadataFilter(),
+                createUserMetadataStatusReportFilter(),
+            )
+                .flatten()
+                .ifEmpty { null }
     }
-  }
 
-  override fun updateChannelFilters() {
-    checkNotInMainThread()
-
-    userChannel.typedFilters =
-      listOfNotNull(
-          createUserMetadataFilter(),
-          createUserMetadataStatusReportFilter(),
-        )
-        .flatten()
-        .ifEmpty { null }
-  }
-
-  fun add(user: User) {
-    if (!usersToWatch.contains(user)) {
-      usersToWatch = usersToWatch.plus(user)
-      invalidateFilters()
+    fun add(user: User) {
+        if (!usersToWatch.contains(user)) {
+            usersToWatch = usersToWatch.plus(user)
+            invalidateFilters()
+        }
     }
-  }
 
-  fun remove(user: User) {
-    if (usersToWatch.contains(user)) {
-      usersToWatch = usersToWatch.minus(user)
-      invalidateFilters()
+    fun remove(user: User) {
+        if (usersToWatch.contains(user)) {
+            usersToWatch = usersToWatch.minus(user)
+            invalidateFilters()
+        }
     }
-  }
 }

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

@@ -26,47 +26,48 @@ import com.vitorpamplona.amethyst.service.relays.JsonFilter
 import com.vitorpamplona.amethyst.service.relays.TypedFilter
 
 object NostrThreadDataSource : NostrDataSource("SingleThreadFeed") {
-  private var eventToWatch: String? = null
+    private var eventToWatch: String? = null
 
-  fun createLoadEventsIfNotLoadedFilter(): TypedFilter? {
-    val threadToLoad = eventToWatch ?: return null
+    fun createLoadEventsIfNotLoadedFilter(): TypedFilter? {
+        val threadToLoad = eventToWatch ?: return null
 
-    val eventsToLoad =
-      ThreadAssembler()
-        .findThreadFor(threadToLoad)
-        .filter { it.event == null }
-        .map { it.idHex }
-        .toSet()
-        .ifEmpty { null }
-        ?: return null
+        val eventsToLoad =
+            ThreadAssembler()
+                .findThreadFor(threadToLoad)
+                .filter { it.event == null }
+                .map { it.idHex }
+                .toSet()
+                .ifEmpty { null }
+                ?: return null
 
-    if (eventsToLoad.isEmpty()) return null
+        if (eventsToLoad.isEmpty()) return null
 
-    return TypedFilter(
-      types = COMMON_FEED_TYPES,
-      filter =
-        JsonFilter(
-          ids = eventsToLoad.toList(),
-        ),
-    )
-  }
-
-  val loadEventsChannel = requestNewChannel { _, _ ->
-    // Many relays operate with limits in the amount of filters.
-    // As information comes, the filters will be rotated to get more data.
-    invalidateFilters()
-  }
-
-  override fun updateChannelFilters() {
-    loadEventsChannel.typedFilters =
-      listOfNotNull(createLoadEventsIfNotLoadedFilter()).ifEmpty { null }
-  }
-
-  fun loadThread(noteId: String?) {
-    if (eventToWatch != noteId) {
-      eventToWatch = noteId
-
-      invalidateFilters()
+        return TypedFilter(
+            types = COMMON_FEED_TYPES,
+            filter =
+                JsonFilter(
+                    ids = eventsToLoad.toList(),
+                ),
+        )
+    }
+
+    val loadEventsChannel =
+        requestNewChannel { _, _ ->
+            // Many relays operate with limits in the amount of filters.
+            // As information comes, the filters will be rotated to get more data.
+            invalidateFilters()
+        }
+
+    override fun updateChannelFilters() {
+        loadEventsChannel.typedFilters =
+            listOfNotNull(createLoadEventsIfNotLoadedFilter()).ifEmpty { null }
+    }
+
+    fun loadThread(noteId: String?) {
+        if (eventToWatch != noteId) {
+            eventToWatch = noteId
+
+            invalidateFilters()
+        }
     }
-  }
 }

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

@@ -43,140 +43,140 @@ import com.vitorpamplona.quartz.events.RepostEvent
 import com.vitorpamplona.quartz.events.TextNoteEvent
 
 object NostrUserProfileDataSource : NostrDataSource("UserProfileFeed") {
-  var user: User? = null
+    var user: User? = null
 
-  fun loadUserProfile(user: User?) {
-    this.user = user
-  }
-
-  fun createUserInfoFilter() =
-    user?.let {
-      TypedFilter(
-        types = COMMON_FEED_TYPES,
-        filter =
-          JsonFilter(
-            kinds = listOf(MetadataEvent.KIND),
-            authors = listOf(it.pubkeyHex),
-            limit = 1,
-          ),
-      )
+    fun loadUserProfile(user: User?) {
+        this.user = user
     }
 
-  fun createUserPostsFilter() =
-    user?.let {
-      TypedFilter(
-        types = COMMON_FEED_TYPES,
-        filter =
-          JsonFilter(
-            kinds =
-              listOf(
-                TextNoteEvent.KIND,
-                GenericRepostEvent.KIND,
-                RepostEvent.KIND,
-                LongTextNoteEvent.KIND,
-                AudioTrackEvent.KIND,
-                AudioHeaderEvent.KIND,
-                PinListEvent.KIND,
-                PollNoteEvent.KIND,
-                HighlightEvent.KIND,
-              ),
-            authors = listOf(it.pubkeyHex),
-            limit = 200,
-          ),
-      )
+    fun createUserInfoFilter() =
+        user?.let {
+            TypedFilter(
+                types = COMMON_FEED_TYPES,
+                filter =
+                    JsonFilter(
+                        kinds = listOf(MetadataEvent.KIND),
+                        authors = listOf(it.pubkeyHex),
+                        limit = 1,
+                    ),
+            )
+        }
+
+    fun createUserPostsFilter() =
+        user?.let {
+            TypedFilter(
+                types = COMMON_FEED_TYPES,
+                filter =
+                    JsonFilter(
+                        kinds =
+                            listOf(
+                                TextNoteEvent.KIND,
+                                GenericRepostEvent.KIND,
+                                RepostEvent.KIND,
+                                LongTextNoteEvent.KIND,
+                                AudioTrackEvent.KIND,
+                                AudioHeaderEvent.KIND,
+                                PinListEvent.KIND,
+                                PollNoteEvent.KIND,
+                                HighlightEvent.KIND,
+                            ),
+                        authors = listOf(it.pubkeyHex),
+                        limit = 200,
+                    ),
+            )
+        }
+
+    fun createUserReceivedZapsFilter() =
+        user?.let {
+            TypedFilter(
+                types = COMMON_FEED_TYPES,
+                filter =
+                    JsonFilter(
+                        kinds = listOf(LnZapEvent.KIND),
+                        tags = mapOf("p" to listOf(it.pubkeyHex)),
+                    ),
+            )
+        }
+
+    fun createFollowFilter() =
+        user?.let {
+            TypedFilter(
+                types = COMMON_FEED_TYPES,
+                filter =
+                    JsonFilter(
+                        kinds = listOf(ContactListEvent.KIND),
+                        authors = listOf(it.pubkeyHex),
+                        limit = 1,
+                    ),
+            )
+        }
+
+    fun createFollowersFilter() =
+        user?.let {
+            TypedFilter(
+                types = COMMON_FEED_TYPES,
+                filter =
+                    JsonFilter(
+                        kinds = listOf(ContactListEvent.KIND),
+                        tags = mapOf("p" to listOf(it.pubkeyHex)),
+                    ),
+            )
+        }
+
+    fun createAcceptedAwardsFilter() =
+        user?.let {
+            TypedFilter(
+                types = COMMON_FEED_TYPES,
+                filter =
+                    JsonFilter(
+                        kinds = listOf(BadgeProfilesEvent.KIND),
+                        authors = listOf(it.pubkeyHex),
+                        limit = 1,
+                    ),
+            )
+        }
+
+    fun createBookmarksFilter() =
+        user?.let {
+            TypedFilter(
+                types = COMMON_FEED_TYPES,
+                filter =
+                    JsonFilter(
+                        kinds =
+                            listOf(BookmarkListEvent.KIND, PeopleListEvent.KIND, AppRecommendationEvent.KIND),
+                        authors = listOf(it.pubkeyHex),
+                        limit = 100,
+                    ),
+            )
+        }
+
+    fun createReceivedAwardsFilter() =
+        user?.let {
+            TypedFilter(
+                types = COMMON_FEED_TYPES,
+                filter =
+                    JsonFilter(
+                        kinds = listOf(BadgeAwardEvent.KIND),
+                        tags = mapOf("p" to listOf(it.pubkeyHex)),
+                        limit = 20,
+                    ),
+            )
+        }
+
+    val userInfoChannel = requestNewChannel()
+
+    override fun updateChannelFilters() {
+        userInfoChannel.typedFilters =
+            listOfNotNull(
+                createUserInfoFilter(),
+                createUserPostsFilter(),
+                createFollowFilter(),
+                createFollowersFilter(),
+                createUserReceivedZapsFilter(),
+                createAcceptedAwardsFilter(),
+                createReceivedAwardsFilter(),
+                createBookmarksFilter(),
+            )
+                .ifEmpty { null }
     }
-
-  fun createUserReceivedZapsFilter() =
-    user?.let {
-      TypedFilter(
-        types = COMMON_FEED_TYPES,
-        filter =
-          JsonFilter(
-            kinds = listOf(LnZapEvent.KIND),
-            tags = mapOf("p" to listOf(it.pubkeyHex)),
-          ),
-      )
-    }
-
-  fun createFollowFilter() =
-    user?.let {
-      TypedFilter(
-        types = COMMON_FEED_TYPES,
-        filter =
-          JsonFilter(
-            kinds = listOf(ContactListEvent.KIND),
-            authors = listOf(it.pubkeyHex),
-            limit = 1,
-          ),
-      )
-    }
-
-  fun createFollowersFilter() =
-    user?.let {
-      TypedFilter(
-        types = COMMON_FEED_TYPES,
-        filter =
-          JsonFilter(
-            kinds = listOf(ContactListEvent.KIND),
-            tags = mapOf("p" to listOf(it.pubkeyHex)),
-          ),
-      )
-    }
-
-  fun createAcceptedAwardsFilter() =
-    user?.let {
-      TypedFilter(
-        types = COMMON_FEED_TYPES,
-        filter =
-          JsonFilter(
-            kinds = listOf(BadgeProfilesEvent.KIND),
-            authors = listOf(it.pubkeyHex),
-            limit = 1,
-          ),
-      )
-    }
-
-  fun createBookmarksFilter() =
-    user?.let {
-      TypedFilter(
-        types = COMMON_FEED_TYPES,
-        filter =
-          JsonFilter(
-            kinds =
-              listOf(BookmarkListEvent.KIND, PeopleListEvent.KIND, AppRecommendationEvent.KIND),
-            authors = listOf(it.pubkeyHex),
-            limit = 100,
-          ),
-      )
-    }
-
-  fun createReceivedAwardsFilter() =
-    user?.let {
-      TypedFilter(
-        types = COMMON_FEED_TYPES,
-        filter =
-          JsonFilter(
-            kinds = listOf(BadgeAwardEvent.KIND),
-            tags = mapOf("p" to listOf(it.pubkeyHex)),
-            limit = 20,
-          ),
-      )
-    }
-
-  val userInfoChannel = requestNewChannel()
-
-  override fun updateChannelFilters() {
-    userInfoChannel.typedFilters =
-      listOfNotNull(
-          createUserInfoFilter(),
-          createUserPostsFilter(),
-          createFollowFilter(),
-          createFollowersFilter(),
-          createUserReceivedZapsFilter(),
-          createAcceptedAwardsFilter(),
-          createReceivedAwardsFilter(),
-          createBookmarksFilter(),
-        )
-        .ifEmpty { null }
-  }
 }

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

@@ -33,120 +33,121 @@ import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
 
 object NostrVideoDataSource : NostrDataSource("VideoFeed") {
-  lateinit var account: Account
+    lateinit var account: Account
 
-  val scope = Amethyst.instance.applicationIOScope
-  val latestEOSEs = EOSEAccount()
+    val scope = Amethyst.instance.applicationIOScope
+    val latestEOSEs = EOSEAccount()
 
-  var job: Job? = null
+    var job: Job? = null
 
-  override fun start() {
-    job?.cancel()
-    job =
-      scope.launch(Dispatchers.IO) {
-        account.liveStoriesFollowLists.collect {
-          if (this@NostrVideoDataSource::account.isInitialized) {
-            invalidateFilters()
-          }
-        }
-      }
-    super.start()
-  }
+    override fun start() {
+        job?.cancel()
+        job =
+            scope.launch(Dispatchers.IO) {
+                account.liveStoriesFollowLists.collect {
+                    if (this@NostrVideoDataSource::account.isInitialized) {
+                        invalidateFilters()
+                    }
+                }
+            }
+        super.start()
+    }
 
-  override fun stop() {
-    super.stop()
-    job?.cancel()
-  }
+    override fun stop() {
+        super.stop()
+        job?.cancel()
+    }
 
-  fun createContextualFilter(): TypedFilter {
-    val follows = account.liveStoriesFollowLists.value?.users?.toList()
+    fun createContextualFilter(): TypedFilter {
+        val follows = account.liveStoriesFollowLists.value?.users?.toList()
 
-    return TypedFilter(
-      types = setOf(FeedType.GLOBAL),
-      filter =
-        JsonFilter(
-          authors = follows,
-          kinds = listOf(FileHeaderEvent.KIND, FileStorageHeaderEvent.KIND),
-          limit = 200,
-          since =
-            latestEOSEs.users[account.userProfile()]
-              ?.followList
-              ?.get(account.defaultStoriesFollowList.value)
-              ?.relayList,
-        ),
-    )
-  }
-
-  fun createFollowTagsFilter(): TypedFilter? {
-    val hashToLoad = account.liveStoriesFollowLists.value?.hashtags?.toList() ?: return null
-
-    if (hashToLoad.isEmpty()) return null
-
-    return TypedFilter(
-      types = setOf(FeedType.GLOBAL),
-      filter =
-        JsonFilter(
-          kinds = listOf(FileHeaderEvent.KIND, FileStorageHeaderEvent.KIND),
-          tags =
-            mapOf(
-              "t" to
-                hashToLoad
-                  .map { listOf(it, it.lowercase(), it.uppercase(), it.capitalize()) }
-                  .flatten(),
-            ),
-          limit = 100,
-          since =
-            latestEOSEs.users[account.userProfile()]
-              ?.followList
-              ?.get(account.defaultStoriesFollowList.value)
-              ?.relayList,
-        ),
-    )
-  }
-
-  fun createFollowGeohashesFilter(): TypedFilter? {
-    val hashToLoad = account.liveStoriesFollowLists.value?.geotags?.toList() ?: return null
-
-    if (hashToLoad.isEmpty()) return null
-
-    return TypedFilter(
-      types = setOf(FeedType.GLOBAL),
-      filter =
-        JsonFilter(
-          kinds = listOf(FileHeaderEvent.KIND, FileStorageHeaderEvent.KIND),
-          tags =
-            mapOf(
-              "g" to
-                hashToLoad
-                  .map { listOf(it, it.lowercase(), it.uppercase(), it.capitalize()) }
-                  .flatten(),
-            ),
-          limit = 100,
-          since =
-            latestEOSEs.users[account.userProfile()]
-              ?.followList
-              ?.get(account.defaultStoriesFollowList.value)
-              ?.relayList,
-        ),
-    )
-  }
-
-  val videoFeedChannel = requestNewChannel { time, relayUrl ->
-    latestEOSEs.addOrUpdate(
-      account.userProfile(),
-      account.defaultStoriesFollowList.value,
-      relayUrl,
-      time,
-    )
-  }
-
-  override fun updateChannelFilters() {
-    videoFeedChannel.typedFilters =
-      listOfNotNull(
-          createContextualFilter(),
-          createFollowTagsFilter(),
-          createFollowGeohashesFilter(),
+        return TypedFilter(
+            types = setOf(FeedType.GLOBAL),
+            filter =
+                JsonFilter(
+                    authors = follows,
+                    kinds = listOf(FileHeaderEvent.KIND, FileStorageHeaderEvent.KIND),
+                    limit = 200,
+                    since =
+                        latestEOSEs.users[account.userProfile()]
+                            ?.followList
+                            ?.get(account.defaultStoriesFollowList.value)
+                            ?.relayList,
+                ),
         )
-        .ifEmpty { null }
-  }
+    }
+
+    fun createFollowTagsFilter(): TypedFilter? {
+        val hashToLoad = account.liveStoriesFollowLists.value?.hashtags?.toList() ?: return null
+
+        if (hashToLoad.isEmpty()) return null
+
+        return TypedFilter(
+            types = setOf(FeedType.GLOBAL),
+            filter =
+                JsonFilter(
+                    kinds = listOf(FileHeaderEvent.KIND, FileStorageHeaderEvent.KIND),
+                    tags =
+                        mapOf(
+                            "t" to
+                                hashToLoad
+                                    .map { listOf(it, it.lowercase(), it.uppercase(), it.capitalize()) }
+                                    .flatten(),
+                        ),
+                    limit = 100,
+                    since =
+                        latestEOSEs.users[account.userProfile()]
+                            ?.followList
+                            ?.get(account.defaultStoriesFollowList.value)
+                            ?.relayList,
+                ),
+        )
+    }
+
+    fun createFollowGeohashesFilter(): TypedFilter? {
+        val hashToLoad = account.liveStoriesFollowLists.value?.geotags?.toList() ?: return null
+
+        if (hashToLoad.isEmpty()) return null
+
+        return TypedFilter(
+            types = setOf(FeedType.GLOBAL),
+            filter =
+                JsonFilter(
+                    kinds = listOf(FileHeaderEvent.KIND, FileStorageHeaderEvent.KIND),
+                    tags =
+                        mapOf(
+                            "g" to
+                                hashToLoad
+                                    .map { listOf(it, it.lowercase(), it.uppercase(), it.capitalize()) }
+                                    .flatten(),
+                        ),
+                    limit = 100,
+                    since =
+                        latestEOSEs.users[account.userProfile()]
+                            ?.followList
+                            ?.get(account.defaultStoriesFollowList.value)
+                            ?.relayList,
+                ),
+        )
+    }
+
+    val videoFeedChannel =
+        requestNewChannel { time, relayUrl ->
+            latestEOSEs.addOrUpdate(
+                account.userProfile(),
+                account.defaultStoriesFollowList.value,
+                relayUrl,
+                time,
+            )
+        }
+
+    override fun updateChannelFilters() {
+        videoFeedChannel.typedFilters =
+            listOfNotNull(
+                createContextualFilter(),
+                createFollowTagsFilter(),
+                createFollowGeohashesFilter(),
+            )
+                .ifEmpty { null }
+    }
 }

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

@@ -29,46 +29,46 @@ import okhttp3.Request
 @Immutable data class OnlineCheckResult(val timeInMs: Long, val online: Boolean)
 
 object OnlineChecker {
-  val checkOnlineCache = LruCache<String, OnlineCheckResult>(100)
-  val fiveMinutes = 1000 * 60 * 5
+    val checkOnlineCache = LruCache<String, OnlineCheckResult>(100)
+    val fiveMinutes = 1000 * 60 * 5
 
-  fun isOnlineCached(url: String?): Boolean {
-    if (url.isNullOrBlank()) return false
-    if ((checkOnlineCache.get(url)?.timeInMs ?: 0) > System.currentTimeMillis() - fiveMinutes) {
-      return checkOnlineCache.get(url).online
-    }
-    return false
-  }
-
-  fun isOnline(url: String?): Boolean {
-    checkNotInMainThread()
-
-    if (url.isNullOrBlank()) return false
-    if ((checkOnlineCache.get(url)?.timeInMs ?: 0) > System.currentTimeMillis() - fiveMinutes) {
-      return checkOnlineCache.get(url).online
-    }
-
-    Log.d("OnlineChecker", "isOnline $url")
-
-    return try {
-      val request =
-        Request.Builder()
-          .header("User-Agent", "Amethyst/${BuildConfig.VERSION_NAME}")
-          .url(url)
-          .get()
-          .build()
-
-      val result =
-        HttpClient.getHttpClient().newCall(request).execute().use {
-          checkNotInMainThread()
-          it.isSuccessful
+    fun isOnlineCached(url: String?): Boolean {
+        if (url.isNullOrBlank()) return false
+        if ((checkOnlineCache.get(url)?.timeInMs ?: 0) > System.currentTimeMillis() - fiveMinutes) {
+            return checkOnlineCache.get(url).online
+        }
+        return false
+    }
+
+    fun isOnline(url: String?): Boolean {
+        checkNotInMainThread()
+
+        if (url.isNullOrBlank()) return false
+        if ((checkOnlineCache.get(url)?.timeInMs ?: 0) > System.currentTimeMillis() - fiveMinutes) {
+            return checkOnlineCache.get(url).online
+        }
+
+        Log.d("OnlineChecker", "isOnline $url")
+
+        return try {
+            val request =
+                Request.Builder()
+                    .header("User-Agent", "Amethyst/${BuildConfig.VERSION_NAME}")
+                    .url(url)
+                    .get()
+                    .build()
+
+            val result =
+                HttpClient.getHttpClient().newCall(request).execute().use {
+                    checkNotInMainThread()
+                    it.isSuccessful
+                }
+            checkOnlineCache.put(url, OnlineCheckResult(System.currentTimeMillis(), result))
+            result
+        } catch (e: Exception) {
+            checkOnlineCache.put(url, OnlineCheckResult(System.currentTimeMillis(), false))
+            Log.e("LiveActivities", "Failed to check streaming url $url", e)
+            false
         }
-      checkOnlineCache.put(url, OnlineCheckResult(System.currentTimeMillis(), result))
-      result
-    } catch (e: Exception) {
-      checkOnlineCache.put(url, OnlineCheckResult(System.currentTimeMillis(), false))
-      Log.e("LiveActivities", "Failed to check streaming url $url", e)
-      false
     }
-  }
 }

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

@@ -23,20 +23,20 @@ package com.vitorpamplona.amethyst.service
 import android.content.Context
 
 object PackageUtils {
-  private fun isPackageInstalled(
-    context: Context,
-    target: String,
-  ): Boolean {
-    return context.packageManager.getInstalledApplications(0).find { info ->
-      info.packageName == target
-    } != null
-  }
+    private fun isPackageInstalled(
+        context: Context,
+        target: String,
+    ): Boolean {
+        return context.packageManager.getInstalledApplications(0).find { info ->
+            info.packageName == target
+        } != null
+    }
 
-  fun isOrbotInstalled(context: Context): Boolean {
-    return isPackageInstalled(context, "org.torproject.android")
-  }
+    fun isOrbotInstalled(context: Context): Boolean {
+        return isPackageInstalled(context, "org.torproject.android")
+    }
 
-  fun isAmberInstalled(context: Context): Boolean {
-    return isPackageInstalled(context, "com.greenart7c3.nostrsigner")
-  }
+    fun isAmberInstalled(context: Context): Boolean {
+        return isPackageInstalled(context, "com.greenart7c3.nostrsigner")
+    }
 }

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

@@ -32,230 +32,229 @@ import com.vitorpamplona.quartz.events.LiveActivitiesEvent
 import com.vitorpamplona.quartz.events.LnZapEvent
 import com.vitorpamplona.quartz.events.PayInvoiceErrorResponse
 import com.vitorpamplona.quartz.events.ZapSplitSetup
-import kotlin.math.round
 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
 
 class ZapPaymentHandler(val account: Account) {
-  @Immutable
-  data class Payable(
-    val info: ZapSplitSetup,
-    val user: User?,
-    val amountMilliSats: Long,
-    val invoice: String,
-  )
+    @Immutable
+    data class Payable(
+        val info: ZapSplitSetup,
+        val user: User?,
+        val amountMilliSats: Long,
+        val invoice: String,
+    )
 
-  suspend fun zap(
-    note: Note,
-    amountMilliSats: Long,
-    pollOption: Int?,
-    message: String,
-    context: Context,
-    onError: (String, String) -> Unit,
-    onProgress: (percent: Float) -> Unit,
-    onPayViaIntent: (ImmutableList<Payable>) -> Unit,
-    zapType: LnZapEvent.ZapType,
-  ) =
-    withContext(Dispatchers.IO) {
-      val zapSplitSetup = note.event?.zapSplitSetup()
+    suspend fun zap(
+        note: Note,
+        amountMilliSats: Long,
+        pollOption: Int?,
+        message: String,
+        context: Context,
+        onError: (String, String) -> Unit,
+        onProgress: (percent: Float) -> Unit,
+        onPayViaIntent: (ImmutableList<Payable>) -> Unit,
+        zapType: LnZapEvent.ZapType,
+    ) = withContext(Dispatchers.IO) {
+        val zapSplitSetup = note.event?.zapSplitSetup()
 
-      val noteEvent = note.event
+        val noteEvent = note.event
 
-      val zapsToSend =
-        if (!zapSplitSetup.isNullOrEmpty()) {
-          zapSplitSetup
-        } else if (noteEvent is LiveActivitiesEvent && noteEvent.hasHost()) {
-          noteEvent.hosts().map { ZapSplitSetup(it, null, weight = 1.0, false) }
-        } else {
-          val lud16 = note.author?.info?.lud16?.trim() ?: note.author?.info?.lud06?.trim()
+        val zapsToSend =
+            if (!zapSplitSetup.isNullOrEmpty()) {
+                zapSplitSetup
+            } else if (noteEvent is LiveActivitiesEvent && noteEvent.hasHost()) {
+                noteEvent.hosts().map { ZapSplitSetup(it, null, weight = 1.0, false) }
+            } else {
+                val lud16 = note.author?.info?.lud16?.trim() ?: note.author?.info?.lud06?.trim()
 
-          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
-          }
+                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))
-        }
+                listOf(ZapSplitSetup(lud16, null, weight = 1.0, true))
+            }
 
-      val totalWeight = zapsToSend.sumOf { it.weight }
+        val totalWeight = zapsToSend.sumOf { it.weight }
 
-      val invoicesToPayOnIntent = mutableListOf<Payable>()
+        val invoicesToPayOnIntent = mutableListOf<Payable>()
 
-      zapsToSend.forEachIndexed { index, value ->
-        val outerProgressMin = index / zapsToSend.size.toFloat()
-        val outerProgressMax = (index + 1) / zapsToSend.size.toFloat()
+        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
+            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,
-                ),
-              )
-            },
-          )
-        } else {
-          val user = LocalCache.getUserIfExists(value.lnAddressOrPubKeyHex)
-          val lud16 = user?.info?.lnAddress()
-
-          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,
-                  ),
+            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,
+                            ),
+                        )
+                    },
                 )
-              },
-            )
-          } 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,
-              ),
-            )
-          }
-        }
-      }
+            } else {
+                val user = LocalCache.getUserIfExists(value.lnAddressOrPubKeyHex)
+                val lud16 = user?.info?.lnAddress()
 
-      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()) {
+                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,
+                                ),
+                            )
+                        },
+                    )
+                } 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,
+                        ),
+                    )
+                }
+            }
+        }
+
+        if (invoicesToPayOnIntent.isNotEmpty()) {
             onPayViaIntent(invoicesToPayOnIntent.toImmutableList())
             onProgress(1f)
-          } else {
-            onProgress(1f)
-          }
-        }
-      }
-    }
-
-  private fun prepareZapRequestIfNeeded(
-    note: Note,
-    pollOption: Int?,
-    message: String,
-    zapType: LnZapEvent.ZapType,
-    overrideUser: User? = null,
-    onReady: (String?) -> Unit,
-  ) {
-    if (zapType != LnZapEvent.ZapType.NONZAP) {
-      account.createZapRequestFor(note, pollOption, message, zapType, overrideUser) { zapRequest ->
-        onReady(zapRequest.toJson())
-      }
-    } else {
-      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 {
+        } 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)
-                  }
-                },
-              )
-              onProgress(0.8f)
-            } else {
-              onPayInvoiceThroughIntent(it)
-              onProgress(0f)
+                } else {
+                    onProgress(1f)
+                }
             }
-          },
-          onError = onError,
-          onProgress = onProgress,
-          context = context,
-        )
+        }
+    }
+
+    private fun prepareZapRequestIfNeeded(
+        note: Note,
+        pollOption: Int?,
+        message: String,
+        zapType: LnZapEvent.ZapType,
+        overrideUser: User? = null,
+        onReady: (String?) -> Unit,
+    ) {
+        if (zapType != LnZapEvent.ZapType.NONZAP) {
+            account.createZapRequestFor(note, pollOption, message, zapType, overrideUser) { zapRequest ->
+                onReady(zapRequest.toJson())
+            }
+        } else {
+            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

@@ -29,263 +29,263 @@ 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
 import java.net.URLEncoder
-import okhttp3.Request
 
 class LightningAddressResolver() {
-  val client = HttpClient.getHttpClient()
+    val client = HttpClient.getHttpClient()
 
-  fun assembleUrl(lnaddress: String): String? {
-    val parts = lnaddress.split("@")
+    fun assembleUrl(lnaddress: String): String? {
+        val parts = lnaddress.split("@")
 
-    if (parts.size == 2) {
-      return "https://${parts[1]}/.well-known/lnurlp/${parts[0]}"
-    }
-
-    if (lnaddress.lowercase().startsWith("lnurl")) {
-      return Lud06().toLnUrlp(lnaddress)
-    }
-
-    return null
-  }
-
-  private fun fetchLightningAddressJson(
-    lnaddress: String,
-    onSuccess: (String) -> Unit,
-    onError: (String, String) -> Unit,
-    context: Context,
-  ) {
-    checkNotInMainThread()
-
-    val url = assembleUrl(lnaddress)
-
-    if (url == null) {
-      onError(
-        context.getString(R.string.error_unable_to_fetch_invoice),
-        context.getString(
-          R.string.could_not_assemble_lnurl_from_lightning_address_check_the_user_s_setup,
-          lnaddress,
-        ),
-      )
-      return
-    }
-
-    try {
-      val request: Request =
-        Request.Builder()
-          .header("User-Agent", "Amethyst/${BuildConfig.VERSION_NAME}")
-          .url(url)
-          .build()
-
-      client.newCall(request).execute().use {
-        if (it.isSuccessful) {
-          onSuccess(it.body.string())
-        } else {
-          onError(
-            context.getString(R.string.error_unable_to_fetch_invoice),
-            context.getString(
-              R.string
-                .the_receiver_s_lightning_service_at_is_not_available_it_was_calculated_from_the_lightning_address_error_check_if_the_server_is_up_and_if_the_lightning_address_is_correct,
-              url,
-              lnaddress,
-              it.code.toString(),
-            ),
-          )
+        if (parts.size == 2) {
+            return "https://${parts[1]}/.well-known/lnurlp/${parts[0]}"
         }
-      }
-    } catch (e: Exception) {
-      e.printStackTrace()
-      onError(
-        context.getString(R.string.error_unable_to_fetch_invoice),
-        context.getString(
-          R.string
-            .could_not_resolve_check_if_you_are_connected_if_the_server_is_up_and_if_the_lightning_address_is_correct,
-          url,
-          lnaddress,
-        ),
-      )
-    }
-  }
 
-  fun fetchLightningInvoice(
-    lnCallback: String,
-    milliSats: Long,
-    message: String,
-    nostrRequest: String? = null,
-    onSuccess: (String) -> Unit,
-    onError: (String, String) -> Unit,
-    context: Context,
-  ) {
-    checkNotInMainThread()
+        if (lnaddress.lowercase().startsWith("lnurl")) {
+            return Lud06().toLnUrlp(lnaddress)
+        }
 
-    val encodedMessage = URLEncoder.encode(message, "utf-8")
-
-    val urlBinder = if (lnCallback.contains("?")) "&" else "?"
-    var url = "$lnCallback${urlBinder}amount=$milliSats&comment=$encodedMessage"
-
-    if (nostrRequest != null) {
-      val encodedNostrRequest = URLEncoder.encode(nostrRequest, "utf-8")
-      url += "&nostr=$encodedNostrRequest"
+        return null
     }
 
-    val request: Request =
-      Request.Builder()
-        .header("User-Agent", "Amethyst/${BuildConfig.VERSION_NAME}")
-        .url(url)
-        .build()
+    private fun fetchLightningAddressJson(
+        lnaddress: String,
+        onSuccess: (String) -> Unit,
+        onError: (String, String) -> Unit,
+        context: Context,
+    ) {
+        checkNotInMainThread()
 
-    client.newCall(request).execute().use {
-      if (it.isSuccessful) {
-        onSuccess(it.body.string())
-      } else {
-        onError(
-          context.getString(R.string.error_unable_to_fetch_invoice),
-          context.getString(R.string.could_not_fetch_invoice_from, lnCallback),
-        )
-      }
-    }
-  }
+        val url = assembleUrl(lnaddress)
 
-  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,
-    message: String,
-    nostrRequest: String? = null,
-    onSuccess: (String) -> Unit,
-    onError: (String, String) -> Unit,
-    onProgress: (percent: Float) -> Unit,
-    context: Context,
-  ) {
-    val mapper = jacksonObjectMapper()
-
-    fetchLightningAddressJson(
-      lnaddress,
-      onSuccess = { lnAddressJson ->
-        onProgress(0.4f)
-
-        val lnurlp =
-          try {
-            mapper.readTree(lnAddressJson)
-          } catch (t: Throwable) {
+        if (url == null) {
             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,
-              ),
+                context.getString(R.string.error_unable_to_fetch_invoice),
+                context.getString(
+                    R.string.could_not_assemble_lnurl_from_lightning_address_check_the_user_s_setup,
+                    lnaddress,
+                ),
             )
-            null
-          }
-
-        val callback = lnurlp?.get("callback")?.asText()
-
-        if (callback == null) {
-          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,
-            ),
-          )
+            return
         }
 
-        val allowsNostr = lnurlp?.get("allowsNostr")?.asBoolean() ?: false
+        try {
+            val request: Request =
+                Request.Builder()
+                    .header("User-Agent", "Amethyst/${BuildConfig.VERSION_NAME}")
+                    .url(url)
+                    .build()
 
-        callback?.let { cb ->
-          fetchLightningInvoice(
-            cb,
-            milliSats,
-            message,
-            if (allowsNostr) nostrRequest else null,
-            onSuccess = {
-              onProgress(0.6f)
+            client.newCall(request).execute().use {
+                if (it.isSuccessful) {
+                    onSuccess(it.body.string())
+                } else {
+                    onError(
+                        context.getString(R.string.error_unable_to_fetch_invoice),
+                        context.getString(
+                            R.string
+                                .the_receiver_s_lightning_service_at_is_not_available_it_was_calculated_from_the_lightning_address_error_check_if_the_server_is_up_and_if_the_lightning_address_is_correct,
+                            url,
+                            lnaddress,
+                            it.code.toString(),
+                        ),
+                    )
+                }
+            }
+        } catch (e: Exception) {
+            e.printStackTrace()
+            onError(
+                context.getString(R.string.error_unable_to_fetch_invoice),
+                context.getString(
+                    R.string
+                        .could_not_resolve_check_if_you_are_connected_if_the_server_is_up_and_if_the_lightning_address_is_correct,
+                    url,
+                    lnaddress,
+                ),
+            )
+        }
+    }
 
-              val lnInvoice =
-                try {
-                  mapper.readTree(it)
-                } catch (t: Throwable) {
-                  onError(
+    fun fetchLightningInvoice(
+        lnCallback: String,
+        milliSats: Long,
+        message: String,
+        nostrRequest: String? = null,
+        onSuccess: (String) -> Unit,
+        onError: (String, String) -> Unit,
+        context: Context,
+    ) {
+        checkNotInMainThread()
+
+        val encodedMessage = URLEncoder.encode(message, "utf-8")
+
+        val urlBinder = if (lnCallback.contains("?")) "&" else "?"
+        var url = "$lnCallback${urlBinder}amount=$milliSats&comment=$encodedMessage"
+
+        if (nostrRequest != null) {
+            val encodedNostrRequest = URLEncoder.encode(nostrRequest, "utf-8")
+            url += "&nostr=$encodedNostrRequest"
+        }
+
+        val request: Request =
+            Request.Builder()
+                .header("User-Agent", "Amethyst/${BuildConfig.VERSION_NAME}")
+                .url(url)
+                .build()
+
+        client.newCall(request).execute().use {
+            if (it.isSuccessful) {
+                onSuccess(it.body.string())
+            } else {
+                onError(
                     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,
-                    ),
-                  )
-                  null
+                    context.getString(R.string.could_not_fetch_invoice_from, lnCallback),
+                )
+            }
+        }
+    }
+
+    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,
+        message: String,
+        nostrRequest: String? = null,
+        onSuccess: (String) -> Unit,
+        onError: (String, String) -> Unit,
+        onProgress: (percent: Float) -> Unit,
+        context: Context,
+    ) {
+        val mapper = jacksonObjectMapper()
+
+        fetchLightningAddressJson(
+            lnaddress,
+            onSuccess = { lnAddressJson ->
+                onProgress(0.4f)
+
+                val lnurlp =
+                    try {
+                        mapper.readTree(lnAddressJson)
+                    } catch (t: Throwable) {
+                        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,
+                            ),
+                        )
+                        null
+                    }
+
+                val callback = lnurlp?.get("callback")?.asText()
+
+                if (callback == null) {
+                    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,
+                        ),
+                    )
                 }
 
-              lnInvoice
-                ?.get("pr")
-                ?.asText()
-                ?.ifBlank { null }
-                ?.let { pr ->
-                  // Forces LN Invoice amount to be the requested amount.
-                  val expectedAmountInSats =
-                    BigDecimal(milliSats).divide(BigDecimal(1000), RoundingMode.HALF_UP).toLong()
-                  val invoiceAmount = LnInvoiceUtil.getAmountInSats(pr)
-                  if (invoiceAmount.toLong() == expectedAmountInSats) {
-                    onProgress(0.7f)
-                    onSuccess(pr)
-                  } else {
-                    onProgress(0.0f)
-                    onError(
-                      context.getString(R.string.error_unable_to_fetch_invoice),
-                      context.getString(
-                        R.string.incorrect_invoice_amount_sats_from_it_should_have_been,
-                        invoiceAmount.toLong().toString(),
-                        lnaddress,
-                        expectedAmountInSats.toString(),
-                      ),
+                val allowsNostr = lnurlp?.get("allowsNostr")?.asBoolean() ?: false
+
+                callback?.let { cb ->
+                    fetchLightningInvoice(
+                        cb,
+                        milliSats,
+                        message,
+                        if (allowsNostr) nostrRequest else null,
+                        onSuccess = {
+                            onProgress(0.6f)
+
+                            val lnInvoice =
+                                try {
+                                    mapper.readTree(it)
+                                } catch (t: Throwable) {
+                                    onError(
+                                        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,
+                                        ),
+                                    )
+                                    null
+                                }
+
+                            lnInvoice
+                                ?.get("pr")
+                                ?.asText()
+                                ?.ifBlank { null }
+                                ?.let { pr ->
+                                    // Forces LN Invoice amount to be the requested amount.
+                                    val expectedAmountInSats =
+                                        BigDecimal(milliSats).divide(BigDecimal(1000), RoundingMode.HALF_UP).toLong()
+                                    val invoiceAmount = LnInvoiceUtil.getAmountInSats(pr)
+                                    if (invoiceAmount.toLong() == expectedAmountInSats) {
+                                        onProgress(0.7f)
+                                        onSuccess(pr)
+                                    } else {
+                                        onProgress(0.0f)
+                                        onError(
+                                            context.getString(R.string.error_unable_to_fetch_invoice),
+                                            context.getString(
+                                                R.string.incorrect_invoice_amount_sats_from_it_should_have_been,
+                                                invoiceAmount.toLong().toString(),
+                                                lnaddress,
+                                                expectedAmountInSats.toString(),
+                                            ),
+                                        )
+                                    }
+                                }
+                                ?: lnInvoice
+                                    ?.get("reason")
+                                    ?.asText()
+                                    ?.ifBlank { null }
+                                    ?.let { reason ->
+                                        onProgress(0.0f)
+                                        onError(
+                                            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,
+                                                reason,
+                                            ),
+                                        )
+                                    }
+                                ?: run {
+                                    onProgress(0.0f)
+                                    onError(
+                                        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,
+                                        ),
+                                    )
+                                }
+                        },
+                        onError = onError,
+                        context,
                     )
-                  }
-                }
-                ?: lnInvoice
-                  ?.get("reason")
-                  ?.asText()
-                  ?.ifBlank { null }
-                  ?.let { reason ->
-                    onProgress(0.0f)
-                    onError(
-                      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,
-                        reason,
-                      ),
-                    )
-                  }
-                  ?: run {
-                  onProgress(0.0f)
-                  onError(
-                    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,
-                    ),
-                  )
                 }
             },
             onError = onError,
             context,
-          )
-        }
-      },
-      onError = onError,
-      context,
-    )
-  }
+        )
+    }
 }

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

@@ -25,12 +25,14 @@ import com.vitorpamplona.amethyst.ui.screen.ZapReqResponse
 import com.vitorpamplona.quartz.events.LnZapEventInterface
 
 object UserZaps {
-  fun forProfileFeed(zaps: Map<Note, Note?>?): List<ZapReqResponse> {
-    if (zaps == null) return emptyList()
+    fun forProfileFeed(zaps: Map<Note, Note?>?): List<ZapReqResponse> {
+        if (zaps == null) return emptyList()
 
-    return (zaps
-      .mapNotNull { entry -> entry.value?.let { ZapReqResponse(entry.key, it) } }
-      .sortedBy { (it.zapEvent.event as? LnZapEventInterface)?.amount() }
-      .reversed())
-  }
+        return (
+            zaps
+                .mapNotNull { entry -> entry.value?.let { ZapReqResponse(entry.key, it) } }
+                .sortedBy { (it.zapEvent.event as? LnZapEventInterface)?.amount() }
+                .reversed()
+        )
+    }
 }

app/src/main/java/com/vitorpamplona/amethyst/service/notifications/EventNotificationConsumer.kt

@@ -40,203 +40,207 @@ import com.vitorpamplona.quartz.events.LnZapRequestEvent
 import com.vitorpamplona.quartz.events.PrivateDmEvent
 import com.vitorpamplona.quartz.events.SealedGossipEvent
 import com.vitorpamplona.quartz.utils.TimeUtils
-import java.math.BigDecimal
 import kotlinx.collections.immutable.persistentSetOf
+import java.math.BigDecimal
 
 class EventNotificationConsumer(private val applicationContext: Context) {
-  suspend fun consume(event: GiftWrapEvent) {
-    if (!LocalCache.justVerify(event)) return
-    if (!notificationManager().areNotificationsEnabled()) return
+    suspend fun consume(event: GiftWrapEvent) {
+        if (!LocalCache.justVerify(event)) return
+        if (!notificationManager().areNotificationsEnabled()) return
 
-    // PushNotification Wraps don't include a receiver.
-    // Test with all logged in accounts
-    LocalPreferences.allSavedAccounts().forEach {
-      if (it.hasPrivKey || it.loggedInWithExternalSigner) {
-        LocalPreferences.loadCurrentAccountFromEncryptedStorage(it.npub)?.let { acc ->
-          consumeIfMatchesAccount(event, acc)
-        }
-      }
-    }
-  }
-
-  private suspend fun consumeIfMatchesAccount(
-    pushWrappedEvent: GiftWrapEvent,
-    account: Account,
-  ) {
-    pushWrappedEvent.cachedGift(account.signer) { notificationEvent ->
-      LocalCache.justConsume(notificationEvent, null)
-
-      unwrapAndConsume(notificationEvent, account) { innerEvent ->
-        if (innerEvent is PrivateDmEvent) {
-          notify(innerEvent, account)
-        } else if (innerEvent is LnZapEvent) {
-          notify(innerEvent, account)
-        } else if (innerEvent is ChatMessageEvent) {
-          notify(innerEvent, account)
-        }
-      }
-    }
-  }
-
-  private fun unwrapAndConsume(
-    event: Event,
-    account: Account,
-    onReady: (Event) -> Unit,
-  ) {
-    if (!LocalCache.justVerify(event)) return
-
-    when (event) {
-      is GiftWrapEvent -> {
-        event.cachedGift(account.signer) { unwrapAndConsume(it, account, onReady) }
-      }
-      is SealedGossipEvent -> {
-        event.cachedGossip(account.signer) {
-          // this is not verifiable
-          LocalCache.justConsume(it, null)
-          onReady(it)
-        }
-      }
-      else -> {
-        LocalCache.justConsume(event, null)
-        onReady(event)
-      }
-    }
-  }
-
-  private fun notify(
-    event: ChatMessageEvent,
-    acc: Account,
-  ) {
-    if (
-      event.createdAt > TimeUtils.fiveMinutesAgo() && // old event being re-broadcasted
-      event.pubKey != acc.userProfile().pubkeyHex
-    ) { // from the user
-
-      val chatNote = LocalCache.notes[event.id] ?: return
-      val chatRoom = event.chatroomKey(acc.keyPair.pubKey.toHexKey())
-
-      val followingKeySet = acc.followingKeySet()
-
-      val isKnownRoom =
-        (acc.userProfile().privateChatrooms[chatRoom]?.senderIntersects(followingKeySet) == true ||
-          acc.userProfile().hasSentMessagesTo(chatRoom)) && !acc.isAllHidden(chatRoom.users)
-
-      if (isKnownRoom) {
-        val content = chatNote.event?.content() ?: ""
-        val user = chatNote.author?.toBestDisplayName() ?: ""
-        val userPicture = chatNote.author?.profilePicture()
-        val noteUri = chatNote.toNEvent()
-        notificationManager()
-          .sendDMNotification(
-            event.id,
-            content,
-            user,
-            userPicture,
-            noteUri,
-            applicationContext,
-          )
-      }
-    }
-  }
-
-  private fun notify(
-    event: PrivateDmEvent,
-    acc: Account,
-  ) {
-    val note = LocalCache.notes[event.id] ?: return
-
-    // old event being re-broadcast
-    if (event.createdAt < TimeUtils.fiveMinutesAgo()) return
-
-    if (acc.userProfile().pubkeyHex == event.verifiedRecipientPubKey()) {
-      val followingKeySet = acc.followingKeySet()
-
-      val knownChatrooms =
-        acc
-          .userProfile()
-          .privateChatrooms
-          .keys
-          .filter {
-            (acc.userProfile().privateChatrooms[it]?.senderIntersects(followingKeySet) == true ||
-              acc.userProfile().hasSentMessagesTo(it)) && !acc.isAllHidden(it.users)
-          }
-          .toSet()
-
-      note.author?.let {
-        if (ChatroomKey(persistentSetOf(it.pubkeyHex)) in knownChatrooms) {
-          acc.decryptContent(note) { content ->
-            val user = note.author?.toBestDisplayName() ?: ""
-            val userPicture = note.author?.profilePicture()
-            val noteUri = note.toNEvent()
-            notificationManager()
-              .sendDMNotification(event.id, content, user, userPicture, noteUri, applicationContext)
-          }
-        }
-      }
-    }
-  }
-
-  private fun notify(
-    event: LnZapEvent,
-    acc: Account,
-  ) {
-    val noteZapEvent = LocalCache.notes[event.id] ?: return
-
-    // old event being re-broadcast
-    if (event.createdAt < TimeUtils.fiveMinutesAgo()) return
-
-    val noteZapRequest = event.zapRequest?.id?.let { LocalCache.checkGetOrCreateNote(it) } ?: return
-    val noteZapped =
-      event.zappedPost().firstOrNull()?.let { LocalCache.checkGetOrCreateNote(it) } ?: return
-
-    if ((event.amount ?: BigDecimal.ZERO) < BigDecimal.TEN) return
-
-    if (acc.userProfile().pubkeyHex == event.zappedAuthor().firstOrNull()) {
-      val amount = showAmount(event.amount)
-      (noteZapRequest.event as? LnZapRequestEvent)?.let { event ->
-        acc.decryptZapContentAuthor(noteZapRequest) {
-          val author = LocalCache.getOrCreateUser(it.pubKey)
-          val senderInfo = Pair(author, it.content.ifBlank { null })
-
-          acc.decryptContent(noteZapped) {
-            val zappedContent = it.split("\n").get(0)
-
-            val user = senderInfo.first.toBestDisplayName()
-            var title =
-              applicationContext.getString(R.string.app_notification_zaps_channel_message, amount)
-            senderInfo.second?.ifBlank { null }?.let { title += " ($it)" }
-            var content =
-              applicationContext.getString(
-                R.string.app_notification_zaps_channel_message_from,
-                user,
-              )
-            zappedContent?.let {
-              content +=
-                " " +
-                  applicationContext.getString(
-                    R.string.app_notification_zaps_channel_message_for,
-                    zappedContent,
-                  )
+        // PushNotification Wraps don't include a receiver.
+        // Test with all logged in accounts
+        LocalPreferences.allSavedAccounts().forEach {
+            if (it.hasPrivKey || it.loggedInWithExternalSigner) {
+                LocalPreferences.loadCurrentAccountFromEncryptedStorage(it.npub)?.let { acc ->
+                    consumeIfMatchesAccount(event, acc)
+                }
             }
-            val userPicture = senderInfo?.first?.profilePicture()
-            val noteUri = "nostr:Notifications"
-            notificationManager()
-              .sendZapNotification(
-                event.id,
-                content,
-                title,
-                userPicture,
-                noteUri,
-                applicationContext,
-              )
-          }
         }
-      }
     }
-  }
 
-  fun notificationManager(): NotificationManager {
-    return ContextCompat.getSystemService(applicationContext, NotificationManager::class.java)
-      as NotificationManager
-  }
+    private suspend fun consumeIfMatchesAccount(
+        pushWrappedEvent: GiftWrapEvent,
+        account: Account,
+    ) {
+        pushWrappedEvent.cachedGift(account.signer) { notificationEvent ->
+            LocalCache.justConsume(notificationEvent, null)
+
+            unwrapAndConsume(notificationEvent, account) { innerEvent ->
+                if (innerEvent is PrivateDmEvent) {
+                    notify(innerEvent, account)
+                } else if (innerEvent is LnZapEvent) {
+                    notify(innerEvent, account)
+                } else if (innerEvent is ChatMessageEvent) {
+                    notify(innerEvent, account)
+                }
+            }
+        }
+    }
+
+    private fun unwrapAndConsume(
+        event: Event,
+        account: Account,
+        onReady: (Event) -> Unit,
+    ) {
+        if (!LocalCache.justVerify(event)) return
+
+        when (event) {
+            is GiftWrapEvent -> {
+                event.cachedGift(account.signer) { unwrapAndConsume(it, account, onReady) }
+            }
+            is SealedGossipEvent -> {
+                event.cachedGossip(account.signer) {
+                    // this is not verifiable
+                    LocalCache.justConsume(it, null)
+                    onReady(it)
+                }
+            }
+            else -> {
+                LocalCache.justConsume(event, null)
+                onReady(event)
+            }
+        }
+    }
+
+    private fun notify(
+        event: ChatMessageEvent,
+        acc: Account,
+    ) {
+        if (
+            event.createdAt > TimeUtils.fiveMinutesAgo() && // old event being re-broadcasted
+            event.pubKey != acc.userProfile().pubkeyHex
+        ) { // from the user
+
+            val chatNote = LocalCache.notes[event.id] ?: return
+            val chatRoom = event.chatroomKey(acc.keyPair.pubKey.toHexKey())
+
+            val followingKeySet = acc.followingKeySet()
+
+            val isKnownRoom =
+                (
+                    acc.userProfile().privateChatrooms[chatRoom]?.senderIntersects(followingKeySet) == true ||
+                        acc.userProfile().hasSentMessagesTo(chatRoom)
+                ) && !acc.isAllHidden(chatRoom.users)
+
+            if (isKnownRoom) {
+                val content = chatNote.event?.content() ?: ""
+                val user = chatNote.author?.toBestDisplayName() ?: ""
+                val userPicture = chatNote.author?.profilePicture()
+                val noteUri = chatNote.toNEvent()
+                notificationManager()
+                    .sendDMNotification(
+                        event.id,
+                        content,
+                        user,
+                        userPicture,
+                        noteUri,
+                        applicationContext,
+                    )
+            }
+        }
+    }
+
+    private fun notify(
+        event: PrivateDmEvent,
+        acc: Account,
+    ) {
+        val note = LocalCache.notes[event.id] ?: return
+
+        // old event being re-broadcast
+        if (event.createdAt < TimeUtils.fiveMinutesAgo()) return
+
+        if (acc.userProfile().pubkeyHex == event.verifiedRecipientPubKey()) {
+            val followingKeySet = acc.followingKeySet()
+
+            val knownChatrooms =
+                acc
+                    .userProfile()
+                    .privateChatrooms
+                    .keys
+                    .filter {
+                        (
+                            acc.userProfile().privateChatrooms[it]?.senderIntersects(followingKeySet) == true ||
+                                acc.userProfile().hasSentMessagesTo(it)
+                        ) && !acc.isAllHidden(it.users)
+                    }
+                    .toSet()
+
+            note.author?.let {
+                if (ChatroomKey(persistentSetOf(it.pubkeyHex)) in knownChatrooms) {
+                    acc.decryptContent(note) { content ->
+                        val user = note.author?.toBestDisplayName() ?: ""
+                        val userPicture = note.author?.profilePicture()
+                        val noteUri = note.toNEvent()
+                        notificationManager()
+                            .sendDMNotification(event.id, content, user, userPicture, noteUri, applicationContext)
+                    }
+                }
+            }
+        }
+    }
+
+    private fun notify(
+        event: LnZapEvent,
+        acc: Account,
+    ) {
+        val noteZapEvent = LocalCache.notes[event.id] ?: return
+
+        // old event being re-broadcast
+        if (event.createdAt < TimeUtils.fiveMinutesAgo()) return
+
+        val noteZapRequest = event.zapRequest?.id?.let { LocalCache.checkGetOrCreateNote(it) } ?: return
+        val noteZapped =
+            event.zappedPost().firstOrNull()?.let { LocalCache.checkGetOrCreateNote(it) } ?: return
+
+        if ((event.amount ?: BigDecimal.ZERO) < BigDecimal.TEN) return
+
+        if (acc.userProfile().pubkeyHex == event.zappedAuthor().firstOrNull()) {
+            val amount = showAmount(event.amount)
+            (noteZapRequest.event as? LnZapRequestEvent)?.let { event ->
+                acc.decryptZapContentAuthor(noteZapRequest) {
+                    val author = LocalCache.getOrCreateUser(it.pubKey)
+                    val senderInfo = Pair(author, it.content.ifBlank { null })
+
+                    acc.decryptContent(noteZapped) {
+                        val zappedContent = it.split("\n").get(0)
+
+                        val user = senderInfo.first.toBestDisplayName()
+                        var title =
+                            applicationContext.getString(R.string.app_notification_zaps_channel_message, amount)
+                        senderInfo.second?.ifBlank { null }?.let { title += " ($it)" }
+                        var content =
+                            applicationContext.getString(
+                                R.string.app_notification_zaps_channel_message_from,
+                                user,
+                            )
+                        zappedContent?.let {
+                            content +=
+                                " " +
+                                applicationContext.getString(
+                                    R.string.app_notification_zaps_channel_message_for,
+                                    zappedContent,
+                                )
+                        }
+                        val userPicture = senderInfo?.first?.profilePicture()
+                        val noteUri = "nostr:Notifications"
+                        notificationManager()
+                            .sendZapNotification(
+                                event.id,
+                                content,
+                                title,
+                                userPicture,
+                                noteUri,
+                                applicationContext,
+                            )
+                    }
+                }
+            }
+        }
+    }
+
+    fun notificationManager(): NotificationManager {
+        return ContextCompat.getSystemService(applicationContext, NotificationManager::class.java)
+            as NotificationManager
+    }
 }

app/src/main/java/com/vitorpamplona/amethyst/service/notifications/NotificationUtils.kt

@@ -36,213 +36,213 @@ import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.ui.MainActivity
 
 object NotificationUtils {
-  private var dmChannel: NotificationChannel? = null
-  private var zapChannel: NotificationChannel? = null
-  private const val DM_GROUP_KEY = "com.vitorpamplona.amethyst.DM_NOTIFICATION"
-  private const val ZAP_GROUP_KEY = "com.vitorpamplona.amethyst.ZAP_NOTIFICATION"
+    private var dmChannel: NotificationChannel? = null
+    private var zapChannel: NotificationChannel? = null
+    private const val DM_GROUP_KEY = "com.vitorpamplona.amethyst.DM_NOTIFICATION"
+    private const val ZAP_GROUP_KEY = "com.vitorpamplona.amethyst.ZAP_NOTIFICATION"
 
-  fun NotificationManager.getOrCreateDMChannel(applicationContext: Context): NotificationChannel {
-    if (dmChannel != null) return dmChannel!!
+    fun NotificationManager.getOrCreateDMChannel(applicationContext: Context): NotificationChannel {
+        if (dmChannel != null) return dmChannel!!
 
-    dmChannel =
-      NotificationChannel(
-          applicationContext.getString(R.string.app_notification_dms_channel_id),
-          applicationContext.getString(R.string.app_notification_dms_channel_name),
-          NotificationManager.IMPORTANCE_DEFAULT,
-        )
-        .apply {
-          description =
-            applicationContext.getString(R.string.app_notification_dms_channel_description)
-        }
+        dmChannel =
+            NotificationChannel(
+                applicationContext.getString(R.string.app_notification_dms_channel_id),
+                applicationContext.getString(R.string.app_notification_dms_channel_name),
+                NotificationManager.IMPORTANCE_DEFAULT,
+            )
+                .apply {
+                    description =
+                        applicationContext.getString(R.string.app_notification_dms_channel_description)
+                }
 
-    // Register the channel with the system
-    val notificationManager: NotificationManager =
-      applicationContext.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+        // Register the channel with the system
+        val notificationManager: NotificationManager =
+            applicationContext.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
 
-    notificationManager.createNotificationChannel(dmChannel!!)
+        notificationManager.createNotificationChannel(dmChannel!!)
 
-    return dmChannel!!
-  }
-
-  fun NotificationManager.getOrCreateZapChannel(applicationContext: Context): NotificationChannel {
-    if (zapChannel != null) return zapChannel!!
-
-    zapChannel =
-      NotificationChannel(
-          applicationContext.getString(R.string.app_notification_zaps_channel_id),
-          applicationContext.getString(R.string.app_notification_zaps_channel_name),
-          NotificationManager.IMPORTANCE_DEFAULT,
-        )
-        .apply {
-          description =
-            applicationContext.getString(R.string.app_notification_zaps_channel_description)
-        }
-
-    // Register the channel with the system
-    val notificationManager: NotificationManager =
-      applicationContext.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
-
-    notificationManager.createNotificationChannel(zapChannel!!)
-
-    return zapChannel!!
-  }
-
-  fun NotificationManager.sendZapNotification(
-    id: String,
-    messageBody: String,
-    messageTitle: String,
-    pictureUrl: String?,
-    uri: String,
-    applicationContext: Context,
-  ) {
-    val zapChannel = getOrCreateZapChannel(applicationContext)
-    val channelId = applicationContext.getString(R.string.app_notification_zaps_channel_id)
-
-    sendNotification(
-      id,
-      messageBody,
-      messageTitle,
-      pictureUrl,
-      uri,
-      channelId,
-      ZAP_GROUP_KEY,
-      applicationContext,
-    )
-  }
-
-  fun NotificationManager.sendDMNotification(
-    id: String,
-    messageBody: String,
-    messageTitle: String,
-    pictureUrl: String?,
-    uri: String,
-    applicationContext: Context,
-  ) {
-    val dmChannel = getOrCreateDMChannel(applicationContext)
-    val channelId = applicationContext.getString(R.string.app_notification_dms_channel_id)
-
-    sendNotification(
-      id,
-      messageBody,
-      messageTitle,
-      pictureUrl,
-      uri,
-      channelId,
-      DM_GROUP_KEY,
-      applicationContext,
-    )
-  }
-
-  fun NotificationManager.sendNotification(
-    id: String,
-    messageBody: String,
-    messageTitle: String,
-    pictureUrl: String?,
-    uri: String,
-    channelId: String,
-    notificationGroupKey: String,
-    applicationContext: Context,
-  ) {
-    if (pictureUrl != null) {
-      val request = ImageRequest.Builder(applicationContext).data(pictureUrl).build()
-
-      val imageLoader = ImageLoader(applicationContext)
-      val imageResult = imageLoader.executeBlocking(request)
-      sendNotification(
-        id = id,
-        messageBody = messageBody,
-        messageTitle = messageTitle,
-        picture = imageResult.drawable as? BitmapDrawable,
-        uri = uri,
-        channelId,
-        notificationGroupKey,
-        applicationContext = applicationContext,
-      )
-    } else {
-      sendNotification(
-        id = id,
-        messageBody = messageBody,
-        messageTitle = messageTitle,
-        picture = null,
-        uri = uri,
-        channelId,
-        notificationGroupKey,
-        applicationContext = applicationContext,
-      )
-    }
-  }
-
-  private fun NotificationManager.sendNotification(
-    id: String,
-    messageBody: String,
-    messageTitle: String,
-    picture: BitmapDrawable?,
-    uri: String,
-    channelId: String,
-    notificationGroupKey: String,
-    applicationContext: Context,
-  ) {
-    val notId = id.hashCode()
-
-    // dont notify twice
-    val notifications: Array<StatusBarNotification> = getActiveNotifications()
-    for (notification in notifications) {
-      if (notification.id == notId) {
-        return
-      }
+        return dmChannel!!
     }
 
-    val contentIntent =
-      Intent(applicationContext, MainActivity::class.java).apply { data = Uri.parse(uri) }
+    fun NotificationManager.getOrCreateZapChannel(applicationContext: Context): NotificationChannel {
+        if (zapChannel != null) return zapChannel!!
 
-    val contentPendingIntent =
-      PendingIntent.getActivity(
-        applicationContext,
-        notId,
-        contentIntent,
-        PendingIntent.FLAG_MUTABLE,
-      )
+        zapChannel =
+            NotificationChannel(
+                applicationContext.getString(R.string.app_notification_zaps_channel_id),
+                applicationContext.getString(R.string.app_notification_zaps_channel_name),
+                NotificationManager.IMPORTANCE_DEFAULT,
+            )
+                .apply {
+                    description =
+                        applicationContext.getString(R.string.app_notification_zaps_channel_description)
+                }
 
-    // Build the notification
-    val builderPublic =
-      NotificationCompat.Builder(
-          applicationContext,
-          channelId,
+        // Register the channel with the system
+        val notificationManager: NotificationManager =
+            applicationContext.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+
+        notificationManager.createNotificationChannel(zapChannel!!)
+
+        return zapChannel!!
+    }
+
+    fun NotificationManager.sendZapNotification(
+        id: String,
+        messageBody: String,
+        messageTitle: String,
+        pictureUrl: String?,
+        uri: String,
+        applicationContext: Context,
+    ) {
+        val zapChannel = getOrCreateZapChannel(applicationContext)
+        val channelId = applicationContext.getString(R.string.app_notification_zaps_channel_id)
+
+        sendNotification(
+            id,
+            messageBody,
+            messageTitle,
+            pictureUrl,
+            uri,
+            channelId,
+            ZAP_GROUP_KEY,
+            applicationContext,
         )
-        .setSmallIcon(R.drawable.amethyst)
-        .setContentTitle(messageTitle)
-        .setContentText(applicationContext.getString(R.string.app_notification_private_message))
-        .setLargeIcon(picture?.bitmap)
-        // .setGroup(messageTitle)
-        // .setGroup(notificationGroupKey) //-> Might need a Group summary as well before we
-        // activate this
-        .setContentIntent(contentPendingIntent)
-        .setPriority(NotificationCompat.PRIORITY_HIGH)
-        .setAutoCancel(true)
+    }
 
-    // Build the notification
-    val builder =
-      NotificationCompat.Builder(
-          applicationContext,
-          channelId,
+    fun NotificationManager.sendDMNotification(
+        id: String,
+        messageBody: String,
+        messageTitle: String,
+        pictureUrl: String?,
+        uri: String,
+        applicationContext: Context,
+    ) {
+        val dmChannel = getOrCreateDMChannel(applicationContext)
+        val channelId = applicationContext.getString(R.string.app_notification_dms_channel_id)
+
+        sendNotification(
+            id,
+            messageBody,
+            messageTitle,
+            pictureUrl,
+            uri,
+            channelId,
+            DM_GROUP_KEY,
+            applicationContext,
         )
-        .setSmallIcon(R.drawable.amethyst)
-        .setContentTitle(messageTitle)
-        .setContentText(messageBody)
-        .setLargeIcon(picture?.bitmap)
-        // .setGroup(messageTitle)
-        // .setGroup(notificationGroupKey)  //-> Might need a Group summary as well before we
-        // activate this
-        .setContentIntent(contentPendingIntent)
-        .setPublicVersion(builderPublic.build())
-        .setPriority(NotificationCompat.PRIORITY_HIGH)
-        .setAutoCancel(true)
+    }
 
-    notify(notId, builder.build())
-  }
+    fun NotificationManager.sendNotification(
+        id: String,
+        messageBody: String,
+        messageTitle: String,
+        pictureUrl: String?,
+        uri: String,
+        channelId: String,
+        notificationGroupKey: String,
+        applicationContext: Context,
+    ) {
+        if (pictureUrl != null) {
+            val request = ImageRequest.Builder(applicationContext).data(pictureUrl).build()
 
-  /** Cancels all notifications. */
-  fun NotificationManager.cancelNotifications() {
-    cancelAll()
-  }
+            val imageLoader = ImageLoader(applicationContext)
+            val imageResult = imageLoader.executeBlocking(request)
+            sendNotification(
+                id = id,
+                messageBody = messageBody,
+                messageTitle = messageTitle,
+                picture = imageResult.drawable as? BitmapDrawable,
+                uri = uri,
+                channelId,
+                notificationGroupKey,
+                applicationContext = applicationContext,
+            )
+        } else {
+            sendNotification(
+                id = id,
+                messageBody = messageBody,
+                messageTitle = messageTitle,
+                picture = null,
+                uri = uri,
+                channelId,
+                notificationGroupKey,
+                applicationContext = applicationContext,
+            )
+        }
+    }
+
+    private fun NotificationManager.sendNotification(
+        id: String,
+        messageBody: String,
+        messageTitle: String,
+        picture: BitmapDrawable?,
+        uri: String,
+        channelId: String,
+        notificationGroupKey: String,
+        applicationContext: Context,
+    ) {
+        val notId = id.hashCode()
+
+        // dont notify twice
+        val notifications: Array<StatusBarNotification> = getActiveNotifications()
+        for (notification in notifications) {
+            if (notification.id == notId) {
+                return
+            }
+        }
+
+        val contentIntent =
+            Intent(applicationContext, MainActivity::class.java).apply { data = Uri.parse(uri) }
+
+        val contentPendingIntent =
+            PendingIntent.getActivity(
+                applicationContext,
+                notId,
+                contentIntent,
+                PendingIntent.FLAG_MUTABLE,
+            )
+
+        // Build the notification
+        val builderPublic =
+            NotificationCompat.Builder(
+                applicationContext,
+                channelId,
+            )
+                .setSmallIcon(R.drawable.amethyst)
+                .setContentTitle(messageTitle)
+                .setContentText(applicationContext.getString(R.string.app_notification_private_message))
+                .setLargeIcon(picture?.bitmap)
+                // .setGroup(messageTitle)
+                // .setGroup(notificationGroupKey) //-> Might need a Group summary as well before we
+                // activate this
+                .setContentIntent(contentPendingIntent)
+                .setPriority(NotificationCompat.PRIORITY_HIGH)
+                .setAutoCancel(true)
+
+        // Build the notification
+        val builder =
+            NotificationCompat.Builder(
+                applicationContext,
+                channelId,
+            )
+                .setSmallIcon(R.drawable.amethyst)
+                .setContentTitle(messageTitle)
+                .setContentText(messageBody)
+                .setLargeIcon(picture?.bitmap)
+                // .setGroup(messageTitle)
+                // .setGroup(notificationGroupKey)  //-> Might need a Group summary as well before we
+                // activate this
+                .setContentIntent(contentPendingIntent)
+                .setPublicVersion(builderPublic.build())
+                .setPriority(NotificationCompat.PRIORITY_HIGH)
+                .setAutoCancel(true)
+
+        notify(notId, builder.build())
+    }
+
+    /** Cancels all notifications. */
+    fun NotificationManager.cancelNotifications() {
+        cancelAll()
+    }
 }

app/src/main/java/com/vitorpamplona/amethyst/service/notifications/RegisterAccounts.kt

@@ -34,96 +34,96 @@ import okhttp3.Request
 import okhttp3.RequestBody.Companion.toRequestBody
 
 class RegisterAccounts(
-  private val accounts: List<AccountInfo>,
+    private val accounts: List<AccountInfo>,
 ) {
-  private fun recursiveAuthCreation(
-    notificationToken: String,
-    remainingTos: List<Pair<Account, String>>,
-    output: MutableList<RelayAuthEvent>,
-    onReady: (List<RelayAuthEvent>) -> Unit,
-  ) {
-    if (remainingTos.isEmpty()) {
-      onReady(output)
-      return
-    }
-
-    val next = remainingTos.first()
-
-    next.first.createAuthEvent(next.second, notificationToken) {
-      output.add(it)
-      recursiveAuthCreation(notificationToken, remainingTos.filter { next != it }, output, onReady)
-    }
-  }
-
-  // creates proof that it controls all accounts
-  private suspend fun signEventsToProveControlOfAccounts(
-    accounts: List<AccountInfo>,
-    notificationToken: String,
-    onReady: (List<RelayAuthEvent>) -> Unit,
-  ) {
-    val readyToSend =
-      accounts.mapNotNull {
-        val acc = LocalPreferences.loadCurrentAccountFromEncryptedStorage(it.npub)
-        if (acc != null && acc.isWriteable()) {
-          val readRelays =
-            acc.userProfile().latestContactList?.relays() ?: acc.backupContactList?.relays()
-
-          val relayToUse = readRelays?.firstNotNullOfOrNull { if (it.value.read) it.key else null }
-          if (relayToUse != null) {
-            Pair(acc, relayToUse)
-          } else {
-            null
-          }
-        } else {
-          null
+    private fun recursiveAuthCreation(
+        notificationToken: String,
+        remainingTos: List<Pair<Account, String>>,
+        output: MutableList<RelayAuthEvent>,
+        onReady: (List<RelayAuthEvent>) -> Unit,
+    ) {
+        if (remainingTos.isEmpty()) {
+            onReady(output)
+            return
         }
-      }
 
-    val listOfAuthEvents = mutableListOf<RelayAuthEvent>()
-    recursiveAuthCreation(
-      notificationToken,
-      readyToSend,
-      listOfAuthEvents,
-      onReady,
-    )
-  }
+        val next = remainingTos.first()
 
-  fun postRegistrationEvent(events: List<RelayAuthEvent>) {
-    try {
-      val jsonObject =
-        """{
+        next.first.createAuthEvent(next.second, notificationToken) {
+            output.add(it)
+            recursiveAuthCreation(notificationToken, remainingTos.filter { next != it }, output, onReady)
+        }
+    }
+
+    // creates proof that it controls all accounts
+    private suspend fun signEventsToProveControlOfAccounts(
+        accounts: List<AccountInfo>,
+        notificationToken: String,
+        onReady: (List<RelayAuthEvent>) -> Unit,
+    ) {
+        val readyToSend =
+            accounts.mapNotNull {
+                val acc = LocalPreferences.loadCurrentAccountFromEncryptedStorage(it.npub)
+                if (acc != null && acc.isWriteable()) {
+                    val readRelays =
+                        acc.userProfile().latestContactList?.relays() ?: acc.backupContactList?.relays()
+
+                    val relayToUse = readRelays?.firstNotNullOfOrNull { if (it.value.read) it.key else null }
+                    if (relayToUse != null) {
+                        Pair(acc, relayToUse)
+                    } else {
+                        null
+                    }
+                } else {
+                    null
+                }
+            }
+
+        val listOfAuthEvents = mutableListOf<RelayAuthEvent>()
+        recursiveAuthCreation(
+            notificationToken,
+            readyToSend,
+            listOfAuthEvents,
+            onReady,
+        )
+    }
+
+    fun postRegistrationEvent(events: List<RelayAuthEvent>) {
+        try {
+            val jsonObject =
+                """{
                 "events": [ ${events.joinToString(", ") { it.toJson() }} ]
             }
             """
 
-      val mediaType = "application/json; charset=utf-8".toMediaType()
-      val body = jsonObject.toRequestBody(mediaType)
+            val mediaType = "application/json; charset=utf-8".toMediaType()
+            val body = jsonObject.toRequestBody(mediaType)
 
-      val request =
-        Request.Builder()
-          .header("User-Agent", "Amethyst/${BuildConfig.VERSION_NAME}")
-          .url("https://push.amethyst.social/register")
-          .post(body)
-          .build()
+            val request =
+                Request.Builder()
+                    .header("User-Agent", "Amethyst/${BuildConfig.VERSION_NAME}")
+                    .url("https://push.amethyst.social/register")
+                    .post(body)
+                    .build()
 
-      val client = HttpClient.getHttpClient()
+            val client = HttpClient.getHttpClient()
 
-      val isSucess = client.newCall(request).execute().use { it.isSuccessful }
-    } catch (e: java.lang.Exception) {
-      val tag =
-        if (BuildConfig.FLAVOR == "play") {
-          "FirebaseMsgService"
-        } else {
-          "UnifiedPushService"
+            val isSucess = client.newCall(request).execute().use { it.isSuccessful }
+        } catch (e: java.lang.Exception) {
+            val tag =
+                if (BuildConfig.FLAVOR == "play") {
+                    "FirebaseMsgService"
+                } else {
+                    "UnifiedPushService"
+                }
+            Log.e(tag, "Unable to register with push server", e)
         }
-      Log.e(tag, "Unable to register with push server", e)
     }
-  }
 
-  suspend fun go(notificationToken: String) =
-    withContext(Dispatchers.IO) {
-      signEventsToProveControlOfAccounts(accounts, notificationToken) { postRegistrationEvent(it) }
+    suspend fun go(notificationToken: String) =
+        withContext(Dispatchers.IO) {
+            signEventsToProveControlOfAccounts(accounts, notificationToken) { postRegistrationEvent(it) }
 
-      PushNotificationUtils.hasInit = true
-    }
+            PushNotificationUtils.hasInit = true
+        }
 }

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

@@ -32,138 +32,138 @@ import androidx.media3.common.Player.STATE_READY
 import androidx.media3.exoplayer.ExoPlayer
 import androidx.media3.session.MediaSession
 import com.vitorpamplona.amethyst.ui.MainActivity
-import kotlin.math.abs
 import kotlinx.coroutines.DelicateCoroutinesApi
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
+import kotlin.math.abs
 
 class MultiPlayerPlaybackManager(
-  private val dataSourceFactory: androidx.media3.exoplayer.source.MediaSource.Factory? = null,
-  private val cachedPositions: VideoViewedPositionCache,
+    private val dataSourceFactory: androidx.media3.exoplayer.source.MediaSource.Factory? = null,
+    private val cachedPositions: VideoViewedPositionCache,
 ) {
-  // protects from LruCache killing playing sessions
-  private val playingMap = mutableMapOf<String, MediaSession>()
+    // protects from LruCache killing playing sessions
+    private val playingMap = mutableMapOf<String, MediaSession>()
 
-  private val cache =
-    object : LruCache<String, MediaSession>(10) { // up to 10 videos in the screen at the same time
-      override fun entryRemoved(
-        evicted: Boolean,
-        key: String?,
-        oldValue: MediaSession?,
-        newValue: MediaSession?,
-      ) {
-        super.entryRemoved(evicted, key, oldValue, newValue)
+    private val cache =
+        object : LruCache<String, MediaSession>(10) { // up to 10 videos in the screen at the same time
+            override fun entryRemoved(
+                evicted: Boolean,
+                key: String?,
+                oldValue: MediaSession?,
+                newValue: MediaSession?,
+            ) {
+                super.entryRemoved(evicted, key, oldValue, newValue)
 
-        if (!playingMap.contains(key)) {
-          oldValue?.let {
-            it.player.release()
-            it.release()
-          }
-        }
-      }
-    }
-
-  private fun getCallbackIntent(
-    callbackUri: String,
-    applicationContext: Context,
-  ): PendingIntent {
-    return PendingIntent.getActivity(
-      applicationContext,
-      0,
-      Intent(Intent.ACTION_VIEW, callbackUri.toUri(), applicationContext, MainActivity::class.java),
-      PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT,
-    )
-  }
-
-  @androidx.annotation.OptIn(androidx.media3.common.util.UnstableApi::class)
-  fun getMediaSession(
-    id: String,
-    uri: String,
-    callbackUri: String?,
-    context: Context,
-    applicationContext: Context,
-  ): MediaSession {
-    val existingSession = playingMap.get(id) ?: cache.get(id)
-    if (existingSession != null) return existingSession
-
-    val player =
-      ExoPlayer.Builder(context).run {
-        dataSourceFactory?.let { setMediaSourceFactory(it) }
-        build()
-      }
-
-    player.apply {
-      repeatMode = Player.REPEAT_MODE_ALL
-      videoScalingMode = C.VIDEO_SCALING_MODE_SCALE_TO_FIT
-      volume = 0f
-    }
-
-    val mediaSession =
-      MediaSession.Builder(context, player).run {
-        callbackUri?.let { setSessionActivity(getCallbackIntent(it, applicationContext)) }
-        setId(id)
-        build()
-      }
-
-    player.addListener(
-      object : Player.Listener {
-        override fun onIsPlayingChanged(isPlaying: Boolean) {
-          if (isPlaying) {
-            player.setWakeMode(C.WAKE_MODE_NETWORK)
-            playingMap.put(id, mediaSession)
-          } else {
-            player.setWakeMode(C.WAKE_MODE_NONE)
-            cachedPositions.add(uri, player.currentPosition)
-            cache.put(id, mediaSession)
-            playingMap.remove(id, mediaSession)
-          }
-        }
-
-        override fun onPlaybackStateChanged(playbackState: Int) {
-          when (playbackState) {
-            STATE_IDLE -> {
-              // only saves if it wqs playing
-              if (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 (!playingMap.contains(key)) {
+                    oldValue?.let {
+                        it.player.release()
+                        it.release()
+                    }
                 }
-              }
             }
-            else -> {
-              // only saves if it wqs playing
-              if (abs(player.currentPosition) > 1) {
-                cachedPositions.add(uri, player.currentPosition)
-              }
-            }
-          }
         }
-      },
-    )
 
-    cache.put(id, mediaSession)
-
-    return mediaSession
-  }
-
-  @OptIn(DelicateCoroutinesApi::class)
-  fun releaseAppPlayers() {
-    GlobalScope.launch(Dispatchers.Main) {
-      cache.evictAll()
-      playingMap.forEach {
-        it.value.player.release()
-        it.value.release()
-      }
-      playingMap.clear()
+    private fun getCallbackIntent(
+        callbackUri: String,
+        applicationContext: Context,
+    ): PendingIntent {
+        return PendingIntent.getActivity(
+            applicationContext,
+            0,
+            Intent(Intent.ACTION_VIEW, callbackUri.toUri(), applicationContext, MainActivity::class.java),
+            PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT,
+        )
     }
-  }
 
-  fun playingContent(): Collection<MediaSession> {
-    return playingMap.values
-  }
+    @androidx.annotation.OptIn(androidx.media3.common.util.UnstableApi::class)
+    fun getMediaSession(
+        id: String,
+        uri: String,
+        callbackUri: String?,
+        context: Context,
+        applicationContext: Context,
+    ): MediaSession {
+        val existingSession = playingMap.get(id) ?: cache.get(id)
+        if (existingSession != null) return existingSession
+
+        val player =
+            ExoPlayer.Builder(context).run {
+                dataSourceFactory?.let { setMediaSourceFactory(it) }
+                build()
+            }
+
+        player.apply {
+            repeatMode = Player.REPEAT_MODE_ALL
+            videoScalingMode = C.VIDEO_SCALING_MODE_SCALE_TO_FIT
+            volume = 0f
+        }
+
+        val mediaSession =
+            MediaSession.Builder(context, player).run {
+                callbackUri?.let { setSessionActivity(getCallbackIntent(it, applicationContext)) }
+                setId(id)
+                build()
+            }
+
+        player.addListener(
+            object : Player.Listener {
+                override fun onIsPlayingChanged(isPlaying: Boolean) {
+                    if (isPlaying) {
+                        player.setWakeMode(C.WAKE_MODE_NETWORK)
+                        playingMap.put(id, mediaSession)
+                    } else {
+                        player.setWakeMode(C.WAKE_MODE_NONE)
+                        cachedPositions.add(uri, player.currentPosition)
+                        cache.put(id, mediaSession)
+                        playingMap.remove(id, mediaSession)
+                    }
+                }
+
+                override fun onPlaybackStateChanged(playbackState: Int) {
+                    when (playbackState) {
+                        STATE_IDLE -> {
+                            // only saves if it wqs playing
+                            if (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)
+                                }
+                            }
+                        }
+                        else -> {
+                            // only saves if it wqs playing
+                            if (abs(player.currentPosition) > 1) {
+                                cachedPositions.add(uri, player.currentPosition)
+                            }
+                        }
+                    }
+                }
+            },
+        )
+
+        cache.put(id, mediaSession)
+
+        return mediaSession
+    }
+
+    @OptIn(DelicateCoroutinesApi::class)
+    fun releaseAppPlayers() {
+        GlobalScope.launch(Dispatchers.Main) {
+            cache.evictAll()
+            playingMap.forEach {
+                it.value.player.release()
+                it.value.release()
+            }
+            playingMap.clear()
+        }
+    }
+
+    fun playingContent(): Collection<MediaSession> {
+        return playingMap.values
+    }
 }

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

@@ -30,45 +30,45 @@ import androidx.media3.session.SessionToken
 import com.google.common.util.concurrent.MoreExecutors
 
 object PlaybackClientController {
-  val cache = LruCache<Int, SessionToken>(1)
+    val cache = LruCache<Int, SessionToken>(1)
 
-  @androidx.annotation.OptIn(androidx.media3.common.util.UnstableApi::class)
-  fun prepareController(
-    controllerID: String,
-    videoUri: String,
-    callbackUri: String?,
-    context: Context,
-    onReady: (MediaController) -> Unit,
-  ) {
-    try {
-      // creating a bundle object
-      // creating a bundle object
-      val bundle = Bundle()
-      bundle.putString("id", controllerID)
-      bundle.putString("uri", videoUri)
-      bundle.putString("callbackUri", callbackUri)
+    @androidx.annotation.OptIn(androidx.media3.common.util.UnstableApi::class)
+    fun prepareController(
+        controllerID: String,
+        videoUri: String,
+        callbackUri: String?,
+        context: Context,
+        onReady: (MediaController) -> Unit,
+    ) {
+        try {
+            // creating a bundle object
+            // creating a bundle object
+            val bundle = Bundle()
+            bundle.putString("id", controllerID)
+            bundle.putString("uri", videoUri)
+            bundle.putString("callbackUri", callbackUri)
 
-      var session = cache.get(context.hashCode())
-      if (session == null) {
-        session = SessionToken(context, ComponentName(context, PlaybackService::class.java))
-        cache.put(context.hashCode(), session)
-      }
+            var session = cache.get(context.hashCode())
+            if (session == null) {
+                session = SessionToken(context, ComponentName(context, PlaybackService::class.java))
+                cache.put(context.hashCode(), session)
+            }
 
-      val controllerFuture =
-        MediaController.Builder(context, session).setConnectionHints(bundle).buildAsync()
+            val controllerFuture =
+                MediaController.Builder(context, session).setConnectionHints(bundle).buildAsync()
 
-      controllerFuture.addListener(
-        {
-          try {
-            onReady(controllerFuture.get())
-          } catch (e: Exception) {
+            controllerFuture.addListener(
+                {
+                    try {
+                        onReady(controllerFuture.get())
+                    } catch (e: Exception) {
+                        Log.e("Playback Client", "Failed to load Playback Client for $videoUri", e)
+                    }
+                },
+                MoreExecutors.directExecutor(),
+            )
+        } catch (e: Exception) {
             Log.e("Playback Client", "Failed to load Playback Client for $videoUri", e)
-          }
-        },
-        MoreExecutors.directExecutor(),
-      )
-    } catch (e: Exception) {
-      Log.e("Playback Client", "Failed to load Playback Client for $videoUri", e)
+        }
     }
-  }
 }

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

@@ -35,161 +35,161 @@ import com.vitorpamplona.amethyst.service.HttpClient
 
 @UnstableApi // Extend MediaSessionService
 class PlaybackService : MediaSessionService() {
-  private var videoViewedPositionCache = VideoViewedPositionCache()
+    private var videoViewedPositionCache = VideoViewedPositionCache()
 
-  private var managerHls: MultiPlayerPlaybackManager? = null
-  private var managerProgressive: MultiPlayerPlaybackManager? = null
-  private var managerLocal: MultiPlayerPlaybackManager? = null
+    private var managerHls: MultiPlayerPlaybackManager? = null
+    private var managerProgressive: MultiPlayerPlaybackManager? = null
+    private var managerLocal: MultiPlayerPlaybackManager? = null
 
-  fun newHslDataSource(): MediaSource.Factory {
-    return HlsMediaSource.Factory(OkHttpDataSource.Factory(HttpClient.getHttpClient()))
-  }
-
-  fun newProgressiveDataSource(): MediaSource.Factory {
-    return ProgressiveMediaSource.Factory(
-      (applicationContext as Amethyst).videoCache.get(HttpClient.getHttpClient()),
-    )
-  }
-
-  fun lazyHlsDS(): MultiPlayerPlaybackManager {
-    managerHls?.let {
-      return it
+    fun newHslDataSource(): MediaSource.Factory {
+        return HlsMediaSource.Factory(OkHttpDataSource.Factory(HttpClient.getHttpClient()))
     }
 
-    val newInstance = MultiPlayerPlaybackManager(newHslDataSource(), videoViewedPositionCache)
-    managerHls = newInstance
-    return newInstance
-  }
-
-  fun lazyProgressiveDS(): MultiPlayerPlaybackManager {
-    managerProgressive?.let {
-      return it
+    fun newProgressiveDataSource(): MediaSource.Factory {
+        return ProgressiveMediaSource.Factory(
+            (applicationContext as Amethyst).videoCache.get(HttpClient.getHttpClient()),
+        )
     }
 
-    val newInstance =
-      MultiPlayerPlaybackManager(newProgressiveDataSource(), videoViewedPositionCache)
-    managerProgressive = newInstance
-    return newInstance
-  }
+    fun lazyHlsDS(): MultiPlayerPlaybackManager {
+        managerHls?.let {
+            return it
+        }
 
-  fun lazyLocalDS(): MultiPlayerPlaybackManager {
-    managerLocal?.let {
-      return it
+        val newInstance = MultiPlayerPlaybackManager(newHslDataSource(), videoViewedPositionCache)
+        managerHls = newInstance
+        return newInstance
     }
 
-    val newInstance = MultiPlayerPlaybackManager(cachedPositions = videoViewedPositionCache)
-    managerLocal = newInstance
-    return newInstance
-  }
+    fun lazyProgressiveDS(): MultiPlayerPlaybackManager {
+        managerProgressive?.let {
+            return it
+        }
 
-  // Create your Player and MediaSession in the onCreate lifecycle event
-  @OptIn(UnstableApi::class)
-  override fun onCreate() {
-    super.onCreate()
-
-    Log.d("Lifetime Event", "PlaybackService.onCreate")
-
-    // Stop all videos and recreates all managers when the proxy changes.
-    HttpClient.proxyChangeListeners.add(this@PlaybackService::onProxyUpdated)
-  }
-
-  private fun onProxyUpdated() {
-    val toDestroyHls = managerHls
-    val toDestroyProgressive = managerProgressive
-
-    managerHls = MultiPlayerPlaybackManager(newHslDataSource(), videoViewedPositionCache)
-    managerProgressive =
-      MultiPlayerPlaybackManager(newProgressiveDataSource(), videoViewedPositionCache)
-
-    toDestroyHls?.releaseAppPlayers()
-    toDestroyProgressive?.releaseAppPlayers()
-  }
-
-  override fun onTaskRemoved(rootIntent: Intent?) {
-    super.onTaskRemoved(rootIntent)
-
-    Log.d("Lifetime Event", "onTaskRemoved")
-  }
-
-  override fun onDestroy() {
-    Log.d("Lifetime Event", "PlaybackService.onDestroy")
-
-    HttpClient.proxyChangeListeners.remove(this@PlaybackService::onProxyUpdated)
-
-    managerHls?.releaseAppPlayers()
-    managerLocal?.releaseAppPlayers()
-    managerProgressive?.releaseAppPlayers()
-
-    super.onDestroy()
-  }
-
-  fun getAppropriateMediaSessionManager(fileName: String): MultiPlayerPlaybackManager? {
-    return if (fileName.startsWith("file")) {
-      lazyLocalDS()
-    } else if (fileName.endsWith("m3u8")) {
-      lazyHlsDS()
-    } else {
-      lazyProgressiveDS()
+        val newInstance =
+            MultiPlayerPlaybackManager(newProgressiveDataSource(), videoViewedPositionCache)
+        managerProgressive = newInstance
+        return newInstance
     }
-  }
 
-  override fun onUpdateNotification(
-    session: MediaSession,
-    startInForegroundRequired: Boolean,
-  ) {
-    // Updates any new player ready
-    super.onUpdateNotification(session, startInForegroundRequired)
+    fun lazyLocalDS(): MultiPlayerPlaybackManager {
+        managerLocal?.let {
+            return it
+        }
 
-    // Overrides the notification with any player actually playing
-    managerHls?.playingContent()?.forEach {
-      if (it.player.isPlaying) {
-        super.onUpdateNotification(it, startInForegroundRequired)
-      }
+        val newInstance = MultiPlayerPlaybackManager(cachedPositions = videoViewedPositionCache)
+        managerLocal = newInstance
+        return newInstance
     }
-    managerLocal?.playingContent()?.forEach {
-      if (it.player.isPlaying) {
+
+    // Create your Player and MediaSession in the onCreate lifecycle event
+    @OptIn(UnstableApi::class)
+    override fun onCreate() {
+        super.onCreate()
+
+        Log.d("Lifetime Event", "PlaybackService.onCreate")
+
+        // Stop all videos and recreates all managers when the proxy changes.
+        HttpClient.proxyChangeListeners.add(this@PlaybackService::onProxyUpdated)
+    }
+
+    private fun onProxyUpdated() {
+        val toDestroyHls = managerHls
+        val toDestroyProgressive = managerProgressive
+
+        managerHls = MultiPlayerPlaybackManager(newHslDataSource(), videoViewedPositionCache)
+        managerProgressive =
+            MultiPlayerPlaybackManager(newProgressiveDataSource(), videoViewedPositionCache)
+
+        toDestroyHls?.releaseAppPlayers()
+        toDestroyProgressive?.releaseAppPlayers()
+    }
+
+    override fun onTaskRemoved(rootIntent: Intent?) {
+        super.onTaskRemoved(rootIntent)
+
+        Log.d("Lifetime Event", "onTaskRemoved")
+    }
+
+    override fun onDestroy() {
+        Log.d("Lifetime Event", "PlaybackService.onDestroy")
+
+        HttpClient.proxyChangeListeners.remove(this@PlaybackService::onProxyUpdated)
+
+        managerHls?.releaseAppPlayers()
+        managerLocal?.releaseAppPlayers()
+        managerProgressive?.releaseAppPlayers()
+
+        super.onDestroy()
+    }
+
+    fun getAppropriateMediaSessionManager(fileName: String): MultiPlayerPlaybackManager? {
+        return if (fileName.startsWith("file")) {
+            lazyLocalDS()
+        } else if (fileName.endsWith("m3u8")) {
+            lazyHlsDS()
+        } else {
+            lazyProgressiveDS()
+        }
+    }
+
+    override fun onUpdateNotification(
+        session: MediaSession,
+        startInForegroundRequired: Boolean,
+    ) {
+        // Updates any new player ready
         super.onUpdateNotification(session, startInForegroundRequired)
-      }
-    }
-    managerProgressive?.playingContent()?.forEach {
-      if (it.player.isPlaying) {
-        super.onUpdateNotification(session, startInForegroundRequired)
-      }
+
+        // Overrides the notification with any player actually playing
+        managerHls?.playingContent()?.forEach {
+            if (it.player.isPlaying) {
+                super.onUpdateNotification(it, startInForegroundRequired)
+            }
+        }
+        managerLocal?.playingContent()?.forEach {
+            if (it.player.isPlaying) {
+                super.onUpdateNotification(session, startInForegroundRequired)
+            }
+        }
+        managerProgressive?.playingContent()?.forEach {
+            if (it.player.isPlaying) {
+                super.onUpdateNotification(session, startInForegroundRequired)
+            }
+        }
+
+        // Overrides again with playing with audio
+        managerHls?.playingContent()?.forEach {
+            if (it.player.isPlaying && it.player.volume > 0) {
+                super.onUpdateNotification(it, startInForegroundRequired)
+            }
+        }
+        managerLocal?.playingContent()?.forEach {
+            if (it.player.isPlaying && it.player.volume > 0) {
+                super.onUpdateNotification(session, startInForegroundRequired)
+            }
+        }
+        managerProgressive?.playingContent()?.forEach {
+            if (it.player.isPlaying && it.player.volume > 0) {
+                super.onUpdateNotification(session, startInForegroundRequired)
+            }
+        }
     }
 
-    // Overrides again with playing with audio
-    managerHls?.playingContent()?.forEach {
-      if (it.player.isPlaying && it.player.volume > 0) {
-        super.onUpdateNotification(it, startInForegroundRequired)
-      }
-    }
-    managerLocal?.playingContent()?.forEach {
-      if (it.player.isPlaying && it.player.volume > 0) {
-        super.onUpdateNotification(session, startInForegroundRequired)
-      }
-    }
-    managerProgressive?.playingContent()?.forEach {
-      if (it.player.isPlaying && it.player.volume > 0) {
-        super.onUpdateNotification(session, startInForegroundRequired)
-      }
-    }
-  }
+    // Return a MediaSession to link with the MediaController that is making
+    // this request.
+    override fun onGetSession(controllerInfo: MediaSession.ControllerInfo): MediaSession? {
+        val id = controllerInfo.connectionHints.getString("id") ?: return null
+        val uri = controllerInfo.connectionHints.getString("uri") ?: return null
+        val callbackUri = controllerInfo.connectionHints.getString("callbackUri")
 
-  // Return a MediaSession to link with the MediaController that is making
-  // this request.
-  override fun onGetSession(controllerInfo: MediaSession.ControllerInfo): MediaSession? {
-    val id = controllerInfo.connectionHints.getString("id") ?: return null
-    val uri = controllerInfo.connectionHints.getString("uri") ?: return null
-    val callbackUri = controllerInfo.connectionHints.getString("callbackUri")
+        val manager = getAppropriateMediaSessionManager(uri)
 
-    val manager = getAppropriateMediaSessionManager(uri)
-
-    return manager?.getMediaSession(
-      id,
-      uri,
-      callbackUri,
-      context = this,
-      applicationContext = applicationContext,
-    )
-  }
+        return manager?.getMediaSession(
+            id,
+            uri,
+            callbackUri,
+            context = this,
+            applicationContext = applicationContext,
+        )
+    }
 }

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

@@ -27,47 +27,47 @@ 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 java.io.File
 import okhttp3.OkHttpClient
+import java.io.File
 
 @SuppressLint("UnsafeOptInUsageError")
 class VideoCache {
-  var exoPlayerCacheSize: Long = 150 * 1024 * 1024 // 90MB
+    var exoPlayerCacheSize: Long = 150 * 1024 * 1024 // 90MB
 
-  var leastRecentlyUsedCacheEvictor = LeastRecentlyUsedCacheEvictor(exoPlayerCacheSize)
+    var leastRecentlyUsedCacheEvictor = LeastRecentlyUsedCacheEvictor(exoPlayerCacheSize)
 
-  lateinit var exoDatabaseProvider: StandaloneDatabaseProvider
-  lateinit var simpleCache: SimpleCache
+    lateinit var exoDatabaseProvider: StandaloneDatabaseProvider
+    lateinit var simpleCache: SimpleCache
 
-  lateinit var cacheDataSourceFactory: CacheDataSource.Factory
+    lateinit var cacheDataSourceFactory: CacheDataSource.Factory
 
-  @Synchronized
-  fun initFileCache(context: Context) {
-    exoDatabaseProvider = StandaloneDatabaseProvider(context)
+    @Synchronized
+    fun initFileCache(context: Context) {
+        exoDatabaseProvider = StandaloneDatabaseProvider(context)
 
-    simpleCache =
-      SimpleCache(
-        File(context.cacheDir, "exoplayer"),
-        leastRecentlyUsedCacheEvictor,
-        exoDatabaseProvider,
-      )
-  }
+        simpleCache =
+            SimpleCache(
+                File(context.cacheDir, "exoplayer"),
+                leastRecentlyUsedCacheEvictor,
+                exoDatabaseProvider,
+            )
+    }
 
-  // This method should be called when proxy setting changes.
-  fun renewCacheFactory(client: OkHttpClient) {
-    cacheDataSourceFactory =
-      CacheDataSource.Factory()
-        .setCache(simpleCache)
-        .setUpstreamDataSourceFactory(
-          OkHttpDataSource.Factory(client),
-        )
-        .setFlags(CacheDataSource.FLAG_IGNORE_CACHE_ON_ERROR)
-  }
+    // This method should be called when proxy setting changes.
+    fun renewCacheFactory(client: OkHttpClient) {
+        cacheDataSourceFactory =
+            CacheDataSource.Factory()
+                .setCache(simpleCache)
+                .setUpstreamDataSourceFactory(
+                    OkHttpDataSource.Factory(client),
+                )
+                .setFlags(CacheDataSource.FLAG_IGNORE_CACHE_ON_ERROR)
+    }
 
-  fun get(client: OkHttpClient): CacheDataSource.Factory {
-    // Renews the factory because OkHttpMight have changed.
-    renewCacheFactory(client)
+    fun get(client: OkHttpClient): CacheDataSource.Factory {
+        // Renews the factory because OkHttpMight have changed.
+        renewCacheFactory(client)
 
-    return cacheDataSourceFactory
-  }
+        return cacheDataSourceFactory
+    }
 }

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

@@ -23,16 +23,16 @@ package com.vitorpamplona.amethyst.service.playback
 import android.util.LruCache
 
 class VideoViewedPositionCache {
-  val cachedPosition = LruCache<String, Long>(100)
+    val cachedPosition = LruCache<String, Long>(100)
 
-  fun add(
-    uri: String,
-    position: Long,
-  ) {
-    cachedPosition.put(uri, position)
-  }
+    fun add(
+        uri: String,
+        position: Long,
+    ) {
+        cachedPosition.put(uri, position)
+    }
 
-  fun get(uri: String): Long? {
-    return cachedPosition.get(uri)
-  }
+    fun get(uri: String): Long? {
+        return cachedPosition.get(uri)
+    }
 }

app/src/main/java/com/vitorpamplona/amethyst/service/previews/BahaUrlPreview.kt

@@ -24,20 +24,20 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 
 class BahaUrlPreview(val url: String, var callback: IUrlPreviewCallback?) {
-  suspend fun fetchUrlPreview(timeOut: Int = 30000) =
-    withContext(Dispatchers.IO) {
-      try {
-        fetch(timeOut)
-      } catch (t: Throwable) {
-        callback?.onFailed(t)
-      }
+    suspend fun fetchUrlPreview(timeOut: Int = 30000) =
+        withContext(Dispatchers.IO) {
+            try {
+                fetch(timeOut)
+            } catch (t: Throwable) {
+                callback?.onFailed(t)
+            }
+        }
+
+    private suspend fun fetch(timeOut: Int = 30000) {
+        callback?.onComplete(getDocument(url, timeOut))
     }
 
-  private suspend fun fetch(timeOut: Int = 30000) {
-    callback?.onComplete(getDocument(url, timeOut))
-  }
-
-  fun cleanUp() {
-    callback = null
-  }
+    fun cleanUp() {
+        callback = null
+    }
 }

app/src/main/java/com/vitorpamplona/amethyst/service/previews/IUrlPreviewCallback.kt

@@ -21,7 +21,7 @@
 package com.vitorpamplona.amethyst.service.previews
 
 interface IUrlPreviewCallback {
-  suspend fun onComplete(urlInfo: UrlInfoItem)
+    suspend fun onComplete(urlInfo: UrlInfoItem)
 
-  suspend fun onFailed(throwable: Throwable)
+    suspend fun onFailed(throwable: Throwable)
 }

app/src/main/java/com/vitorpamplona/amethyst/service/previews/UrlInfoItem.kt

@@ -21,30 +21,30 @@
 package com.vitorpamplona.amethyst.service.previews
 
 import androidx.compose.runtime.Immutable
-import java.net.URL
 import okhttp3.MediaType
+import java.net.URL
 
 @Immutable
 class UrlInfoItem(
-  val url: String = "",
-  val title: String = "",
-  val description: String = "",
-  val image: String = "",
-  val mimeType: MediaType,
+    val url: String = "",
+    val title: String = "",
+    val description: String = "",
+    val image: String = "",
+    val mimeType: MediaType,
 ) {
-  val verifiedUrl = kotlin.runCatching { URL(url) }.getOrNull()
-  val imageUrlFullPath =
-    if (image.startsWith("/")) {
-      URL(verifiedUrl, image).toString()
-    } else {
-      image
+    val verifiedUrl = kotlin.runCatching { URL(url) }.getOrNull()
+    val imageUrlFullPath =
+        if (image.startsWith("/")) {
+            URL(verifiedUrl, image).toString()
+        } else {
+            image
+        }
+
+    fun fetchComplete(): Boolean {
+        return url.isNotEmpty() && image.isNotEmpty()
     }
 
-  fun fetchComplete(): Boolean {
-    return url.isNotEmpty() && image.isNotEmpty()
-  }
-
-  fun allFetchComplete(): Boolean {
-    return title.isNotEmpty() && description.isNotEmpty() && image.isNotEmpty()
-  }
+    fun allFetchComplete(): Boolean {
+        return title.isNotEmpty() && description.isNotEmpty() && image.isNotEmpty()
+    }
 }

app/src/main/java/com/vitorpamplona/amethyst/service/previews/UrlPreviewUtils.kt

@@ -36,147 +36,147 @@ private const val ATTRIBUTE_VALUE_ITEMPROP = "itemprop"
 
 // for <meta itemprop=... to get title
 private val META_X_TITLE =
-  arrayOf(
-    "og:title",
-    "\"og:title\"",
-    "'og:title'",
-    "name",
-    "\"name\"",
-    "'name'",
-    "twitter:title",
-    "\"twitter:title\"",
-    "'twitter:title'",
-    "title",
-    "\"title\"",
-    "'title'",
-  )
+    arrayOf(
+        "og:title",
+        "\"og:title\"",
+        "'og:title'",
+        "name",
+        "\"name\"",
+        "'name'",
+        "twitter:title",
+        "\"twitter:title\"",
+        "'twitter:title'",
+        "title",
+        "\"title\"",
+        "'title'",
+    )
 
 // for <meta itemprop=... to get description
 private val META_X_DESCRIPTION =
-  arrayOf(
-    "og:description",
-    "\"og:description\"",
-    "'og:description'",
-    "description",
-    "\"description\"",
-    "'description'",
-    "twitter:description",
-    "\"twitter:description\"",
-    "'twitter:description'",
-    "description",
-    "\"description\"",
-    "'description'",
-  )
+    arrayOf(
+        "og:description",
+        "\"og:description\"",
+        "'og:description'",
+        "description",
+        "\"description\"",
+        "'description'",
+        "twitter:description",
+        "\"twitter:description\"",
+        "'twitter:description'",
+        "description",
+        "\"description\"",
+        "'description'",
+    )
 
 // for <meta itemprop=... to get image
 private val META_X_IMAGE =
-  arrayOf(
-    "og:image",
-    "\"og:image\"",
-    "'og:image'",
-    "image",
-    "\"image\"",
-    "'image'",
-    "twitter:image",
-    "\"twitter:image\"",
-    "'twitter:image'",
-  )
+    arrayOf(
+        "og:image",
+        "\"og:image\"",
+        "'og:image'",
+        "image",
+        "\"image\"",
+        "'image'",
+        "twitter:image",
+        "\"twitter:image\"",
+        "'twitter:image'",
+    )
 
 private const val CONTENT = "content"
 
 suspend fun getDocument(
-  url: String,
-  timeOut: Int = 30000,
+    url: String,
+    timeOut: Int = 30000,
 ): UrlInfoItem =
-  withContext(Dispatchers.IO) {
-    val request: Request = Request.Builder().url(url).get().build()
-    HttpClient.getHttpClient().newCall(request).execute().use {
-      if (it.isSuccessful) {
-        val mimeType =
-          it.headers.get("Content-Type")?.toMediaType()
-            ?: throw IllegalArgumentException(
-              "Website returned unknown mimetype: ${it.headers.get("Content-Type")}",
-            )
+    withContext(Dispatchers.IO) {
+        val request: Request = Request.Builder().url(url).get().build()
+        HttpClient.getHttpClient().newCall(request).execute().use {
+            if (it.isSuccessful) {
+                val mimeType =
+                    it.headers.get("Content-Type")?.toMediaType()
+                        ?: throw IllegalArgumentException(
+                            "Website returned unknown mimetype: ${it.headers.get("Content-Type")}",
+                        )
 
-        if (mimeType.type == "text" && mimeType.subtype == "html") {
-          val document = Jsoup.parse(it.body.string())
-          parseHtml(url, document, mimeType)
-        } else if (mimeType.type == "image") {
-          UrlInfoItem(url, image = url, mimeType = mimeType)
-        } else if (mimeType.type == "video") {
-          UrlInfoItem(url, image = url, mimeType = mimeType)
-        } else {
-          throw IllegalArgumentException(
-            "Website returned unknown encoding for previews: $mimeType",
-          )
+                if (mimeType.type == "text" && mimeType.subtype == "html") {
+                    val document = Jsoup.parse(it.body.string())
+                    parseHtml(url, document, mimeType)
+                } else if (mimeType.type == "image") {
+                    UrlInfoItem(url, image = url, mimeType = mimeType)
+                } else if (mimeType.type == "video") {
+                    UrlInfoItem(url, image = url, mimeType = mimeType)
+                } else {
+                    throw IllegalArgumentException(
+                        "Website returned unknown encoding for previews: $mimeType",
+                    )
+                }
+            } else {
+                throw IllegalArgumentException("Website returned: " + it.code)
+            }
         }
-      } else {
-        throw IllegalArgumentException("Website returned: " + it.code)
-      }
     }
-  }
 
 suspend fun parseHtml(
-  url: String,
-  document: Document,
-  type: MediaType,
+    url: String,
+    document: Document,
+    type: MediaType,
 ): UrlInfoItem =
-  withContext(Dispatchers.IO) {
-    val metaTags = document.getElementsByTag(ELEMENT_TAG_META)
+    withContext(Dispatchers.IO) {
+        val metaTags = document.getElementsByTag(ELEMENT_TAG_META)
 
-    var title: String = ""
-    var description: String = ""
-    var image: String = ""
+        var title: String = ""
+        var description: String = ""
+        var image: String = ""
 
-    metaTags.forEach {
-      when (it.attr(ATTRIBUTE_VALUE_PROPERTY)) {
-        in META_X_TITLE ->
-          if (title.isEmpty()) {
-            title = it.attr(CONTENT)
-          }
-        in META_X_DESCRIPTION ->
-          if (description.isEmpty()) {
-            description = it.attr(CONTENT)
-          }
-        in META_X_IMAGE ->
-          if (image.isEmpty()) {
-            image = it.attr(CONTENT)
-          }
-      }
+        metaTags.forEach {
+            when (it.attr(ATTRIBUTE_VALUE_PROPERTY)) {
+                in META_X_TITLE ->
+                    if (title.isEmpty()) {
+                        title = it.attr(CONTENT)
+                    }
+                in META_X_DESCRIPTION ->
+                    if (description.isEmpty()) {
+                        description = it.attr(CONTENT)
+                    }
+                in META_X_IMAGE ->
+                    if (image.isEmpty()) {
+                        image = it.attr(CONTENT)
+                    }
+            }
 
-      when (it.attr(ATTRIBUTE_VALUE_NAME)) {
-        in META_X_TITLE ->
-          if (title.isEmpty()) {
-            title = it.attr(CONTENT)
-          }
-        in META_X_DESCRIPTION ->
-          if (description.isEmpty()) {
-            description = it.attr(CONTENT)
-          }
-        in META_X_IMAGE ->
-          if (image.isEmpty()) {
-            image = it.attr(CONTENT)
-          }
-      }
+            when (it.attr(ATTRIBUTE_VALUE_NAME)) {
+                in META_X_TITLE ->
+                    if (title.isEmpty()) {
+                        title = it.attr(CONTENT)
+                    }
+                in META_X_DESCRIPTION ->
+                    if (description.isEmpty()) {
+                        description = it.attr(CONTENT)
+                    }
+                in META_X_IMAGE ->
+                    if (image.isEmpty()) {
+                        image = it.attr(CONTENT)
+                    }
+            }
 
-      when (it.attr(ATTRIBUTE_VALUE_ITEMPROP)) {
-        in META_X_TITLE ->
-          if (title.isEmpty()) {
-            title = it.attr(CONTENT)
-          }
-        in META_X_DESCRIPTION ->
-          if (description.isEmpty()) {
-            description = it.attr(CONTENT)
-          }
-        in META_X_IMAGE ->
-          if (image.isEmpty()) {
-            image = it.attr(CONTENT)
-          }
-      }
+            when (it.attr(ATTRIBUTE_VALUE_ITEMPROP)) {
+                in META_X_TITLE ->
+                    if (title.isEmpty()) {
+                        title = it.attr(CONTENT)
+                    }
+                in META_X_DESCRIPTION ->
+                    if (description.isEmpty()) {
+                        description = it.attr(CONTENT)
+                    }
+                in META_X_IMAGE ->
+                    if (image.isEmpty()) {
+                        image = it.attr(CONTENT)
+                    }
+            }
 
-      if (title.isNotEmpty() && description.isNotEmpty() && image.isNotEmpty()) {
+            if (title.isNotEmpty() && description.isNotEmpty() && image.isNotEmpty()) {
+                return@withContext UrlInfoItem(url, title, description, image, type)
+            }
+        }
         return@withContext UrlInfoItem(url, title, description, image, type)
-      }
     }
-    return@withContext UrlInfoItem(url, title, description, image, type)
-  }

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

@@ -24,293 +24,293 @@ import android.util.Log
 import com.vitorpamplona.amethyst.service.checkNotInMainThread
 import com.vitorpamplona.quartz.events.Event
 import com.vitorpamplona.quartz.events.EventInterface
-import java.util.UUID
 import kotlinx.coroutines.DelicateCoroutinesApi
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
+import java.util.UUID
 
 /**
  * The Nostr Client manages multiple personae the user may switch between. Events are received and
  * published through multiple relays. Events are stored with their respective persona.
  */
 object Client : RelayPool.Listener {
-  private var listeners = setOf<Listener>()
-  private var relays = emptyArray<Relay>()
-  private var subscriptions = mapOf<String, List<TypedFilter>>()
+    private var listeners = setOf<Listener>()
+    private var relays = emptyArray<Relay>()
+    private var subscriptions = mapOf<String, List<TypedFilter>>()
 
-  @Synchronized
-  fun reconnect(
-    relays: Array<Relay>?,
-    onlyIfChanged: Boolean = false,
-  ) {
-    Log.d("Relay", "Relay Pool Reconnecting to ${relays?.size} relays")
-    checkNotInMainThread()
+    @Synchronized
+    fun reconnect(
+        relays: Array<Relay>?,
+        onlyIfChanged: Boolean = false,
+    ) {
+        Log.d("Relay", "Relay Pool Reconnecting to ${relays?.size} relays")
+        checkNotInMainThread()
 
-    if (onlyIfChanged) {
-      if (!isSameRelaySetConfig(relays)) {
-        if (this.relays.isNotEmpty()) {
-          RelayPool.disconnect()
-          RelayPool.unregister(this)
-          RelayPool.unloadRelays()
+        if (onlyIfChanged) {
+            if (!isSameRelaySetConfig(relays)) {
+                if (this.relays.isNotEmpty()) {
+                    RelayPool.disconnect()
+                    RelayPool.unregister(this)
+                    RelayPool.unloadRelays()
+                }
+
+                if (relays != null) {
+                    RelayPool.register(this)
+                    RelayPool.loadRelays(relays.toList())
+                    RelayPool.requestAndWatch()
+                    this.relays = relays
+                }
+            }
+        } else {
+            if (this.relays.isNotEmpty()) {
+                RelayPool.disconnect()
+                RelayPool.unregister(this)
+                RelayPool.unloadRelays()
+            }
+
+            if (relays != null) {
+                RelayPool.register(this)
+                RelayPool.loadRelays(relays.toList())
+                RelayPool.requestAndWatch()
+                this.relays = relays
+            }
+        }
+    }
+
+    fun isSameRelaySetConfig(newRelayConfig: Array<Relay>?): Boolean {
+        if (relays.size != newRelayConfig?.size) return false
+
+        relays.forEach { oldRelayInfo ->
+            val newRelayInfo = newRelayConfig.find { it.url == oldRelayInfo.url } ?: return false
+
+            if (!oldRelayInfo.isSameRelayConfig(newRelayInfo)) return false
         }
 
-        if (relays != null) {
-          RelayPool.register(this)
-          RelayPool.loadRelays(relays.toList())
-          RelayPool.requestAndWatch()
-          this.relays = relays
+        return true
+    }
+
+    fun sendFilter(
+        subscriptionId: String = UUID.randomUUID().toString().substring(0..10),
+        filters: List<TypedFilter> = listOf(),
+    ) {
+        checkNotInMainThread()
+
+        subscriptions = subscriptions + Pair(subscriptionId, filters)
+        RelayPool.sendFilter(subscriptionId)
+    }
+
+    fun sendFilterOnlyIfDisconnected(
+        subscriptionId: String = UUID.randomUUID().toString().substring(0..10),
+        filters: List<TypedFilter> = listOf(),
+    ) {
+        checkNotInMainThread()
+
+        subscriptions = subscriptions + Pair(subscriptionId, filters)
+        RelayPool.sendFilterOnlyIfDisconnected(subscriptionId)
+    }
+
+    fun send(
+        signedEvent: EventInterface,
+        relay: String? = null,
+        feedTypes: Set<FeedType>? = null,
+        relayList: List<Relay>? = null,
+        onDone: (() -> Unit)? = null,
+    ) {
+        checkNotInMainThread()
+
+        if (relayList != null) {
+            RelayPool.sendToSelectedRelays(relayList, signedEvent)
+        } 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 = { relay -> relay.send(signedEvent) },
+                    onDone = onDone,
+                )
+            }
         }
-      }
-    } else {
-      if (this.relays.isNotEmpty()) {
-        RelayPool.disconnect()
-        RelayPool.unregister(this)
-        RelayPool.unloadRelays()
-      }
-
-      if (relays != null) {
-        RelayPool.register(this)
-        RelayPool.loadRelays(relays.toList())
-        RelayPool.requestAndWatch()
-        this.relays = relays
-      }
-    }
-  }
-
-  fun isSameRelaySetConfig(newRelayConfig: Array<Relay>?): Boolean {
-    if (relays.size != newRelayConfig?.size) return false
-
-    relays.forEach { oldRelayInfo ->
-      val newRelayInfo = newRelayConfig.find { it.url == oldRelayInfo.url } ?: return false
-
-      if (!oldRelayInfo.isSameRelayConfig(newRelayInfo)) return false
     }
 
-    return true
-  }
+    @OptIn(DelicateCoroutinesApi::class)
+    private fun newSporadicRelay(
+        url: String,
+        feedTypes: Set<FeedType>?,
+        onConnected: (Relay) -> Unit,
+        onDone: (() -> Unit)?,
+    ) {
+        val relay = Relay(url, true, true, feedTypes ?: emptySet())
+        RelayPool.addRelay(relay)
 
-  fun sendFilter(
-    subscriptionId: String = UUID.randomUUID().toString().substring(0..10),
-    filters: List<TypedFilter> = listOf(),
-  ) {
-    checkNotInMainThread()
+        relay.connectAndRun {
+            allSubscriptions().forEach { relay.sendFilter(requestId = it) }
 
-    subscriptions = subscriptions + Pair(subscriptionId, filters)
-    RelayPool.sendFilter(subscriptionId)
-  }
+            onConnected(relay)
 
-  fun sendFilterOnlyIfDisconnected(
-    subscriptionId: String = UUID.randomUUID().toString().substring(0..10),
-    filters: List<TypedFilter> = listOf(),
-  ) {
-    checkNotInMainThread()
+            GlobalScope.launch(Dispatchers.IO) {
+                delay(60000) // waits for a reply
+                relay.disconnect()
+                RelayPool.removeRelay(relay)
 
-    subscriptions = subscriptions + Pair(subscriptionId, filters)
-    RelayPool.sendFilterOnlyIfDisconnected(subscriptionId)
-  }
-
-  fun send(
-    signedEvent: EventInterface,
-    relay: String? = null,
-    feedTypes: Set<FeedType>? = null,
-    relayList: List<Relay>? = null,
-    onDone: (() -> Unit)? = null,
-  ) {
-    checkNotInMainThread()
-
-    if (relayList != null) {
-      RelayPool.sendToSelectedRelays(relayList, signedEvent)
-    } 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 = { relay -> relay.send(signedEvent) },
-          onDone = onDone,
-        )
-      }
-    }
-  }
-
-  @OptIn(DelicateCoroutinesApi::class)
-  private fun newSporadicRelay(
-    url: String,
-    feedTypes: Set<FeedType>?,
-    onConnected: (Relay) -> Unit,
-    onDone: (() -> Unit)?,
-  ) {
-    val relay = Relay(url, true, true, feedTypes ?: emptySet())
-    RelayPool.addRelay(relay)
-
-    relay.connectAndRun {
-      allSubscriptions().forEach { relay.sendFilter(requestId = it) }
-
-      onConnected(relay)
-
-      GlobalScope.launch(Dispatchers.IO) {
-        delay(60000) // waits for a reply
-        relay.disconnect()
-        RelayPool.removeRelay(relay)
-
-        if (onDone != null) {
-          onDone()
+                if (onDone != null) {
+                    onDone()
+                }
+            }
         }
-      }
     }
-  }
 
-  fun close(subscriptionId: String) {
-    RelayPool.close(subscriptionId)
-    subscriptions = subscriptions.minus(subscriptionId)
-  }
-
-  fun isActive(subscriptionId: String): Boolean {
-    return subscriptions.contains(subscriptionId)
-  }
-
-  @OptIn(DelicateCoroutinesApi::class)
-  override fun onEvent(
-    event: Event,
-    subscriptionId: String,
-    relay: Relay,
-    afterEOSE: Boolean,
-  ) {
-    // Releases the Web thread for the new payload.
-    // May need to add a processing queue if processing new events become too costly.
-    GlobalScope.launch(Dispatchers.Default) {
-      listeners.forEach { it.onEvent(event, subscriptionId, relay, afterEOSE) }
+    fun close(subscriptionId: String) {
+        RelayPool.close(subscriptionId)
+        subscriptions = subscriptions.minus(subscriptionId)
     }
-  }
 
-  @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) }
+    fun isActive(subscriptionId: String): Boolean {
+        return subscriptions.contains(subscriptionId)
     }
-  }
 
-  @OptIn(DelicateCoroutinesApi::class)
-  override fun onRelayStateChange(
-    type: Relay.StateType,
-    relay: Relay,
-    channel: String?,
-  ) {
-    // Releases the Web thread for the new payload.
-    // May need to add a processing queue if processing new events become too costly.
-    GlobalScope.launch(Dispatchers.Default) {
-      listeners.forEach { it.onRelayStateChange(type, relay, channel) }
+    @OptIn(DelicateCoroutinesApi::class)
+    override fun onEvent(
+        event: Event,
+        subscriptionId: String,
+        relay: Relay,
+        afterEOSE: Boolean,
+    ) {
+        // Releases the Web thread for the new payload.
+        // May need to add a processing queue if processing new events become too costly.
+        GlobalScope.launch(Dispatchers.Default) {
+            listeners.forEach { it.onEvent(event, subscriptionId, relay, afterEOSE) }
+        }
     }
-  }
 
-  @OptIn(DelicateCoroutinesApi::class)
-  override fun onSendResponse(
-    eventId: String,
-    success: Boolean,
-    message: String,
-    relay: Relay,
-  ) {
-    // Releases the Web thread for the new payload.
-    // May need to add a processing queue if processing new events become too costly.
-    GlobalScope.launch(Dispatchers.Default) {
-      listeners.forEach { it.onSendResponse(eventId, success, message, relay) }
+    @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 onAuth(
-    relay: Relay,
-    challenge: String,
-  ) {
-    // Releases the Web thread for the new payload.
-    // May need to add a processing queue if processing new events become too costly.
-    GlobalScope.launch(Dispatchers.Default) { listeners.forEach { it.onAuth(relay, challenge) } }
-  }
-
-  override fun onNotify(
-    relay: Relay,
-    description: String,
-  ) {
-    // Releases the Web thread for the new payload.
-    // May need to add a processing queue if processing new events become too costly.
-    GlobalScope.launch(Dispatchers.Default) {
-      listeners.forEach { it.onNotify(relay, description) }
+    @OptIn(DelicateCoroutinesApi::class)
+    override fun onRelayStateChange(
+        type: Relay.StateType,
+        relay: Relay,
+        channel: String?,
+    ) {
+        // Releases the Web thread for the new payload.
+        // May need to add a processing queue if processing new events become too costly.
+        GlobalScope.launch(Dispatchers.Default) {
+            listeners.forEach { it.onRelayStateChange(type, relay, channel) }
+        }
     }
-  }
 
-  fun subscribe(listener: Listener) {
-    listeners = listeners.plus(listener)
-  }
+    @OptIn(DelicateCoroutinesApi::class)
+    override fun onSendResponse(
+        eventId: String,
+        success: Boolean,
+        message: String,
+        relay: Relay,
+    ) {
+        // Releases the Web thread for the new payload.
+        // May need to add a processing queue if processing new events become too costly.
+        GlobalScope.launch(Dispatchers.Default) {
+            listeners.forEach { it.onSendResponse(eventId, success, message, relay) }
+        }
+    }
 
-  fun isSubscribed(listener: Listener): Boolean {
-    return listeners.contains(listener)
-  }
+    @OptIn(DelicateCoroutinesApi::class)
+    override fun onAuth(
+        relay: Relay,
+        challenge: String,
+    ) {
+        // Releases the Web thread for the new payload.
+        // May need to add a processing queue if processing new events become too costly.
+        GlobalScope.launch(Dispatchers.Default) { listeners.forEach { it.onAuth(relay, challenge) } }
+    }
 
-  fun unsubscribe(listener: Listener) {
-    listeners = listeners.minus(listener)
-  }
+    override fun onNotify(
+        relay: Relay,
+        description: String,
+    ) {
+        // Releases the Web thread for the new payload.
+        // May need to add a processing queue if processing new events become too costly.
+        GlobalScope.launch(Dispatchers.Default) {
+            listeners.forEach { it.onNotify(relay, description) }
+        }
+    }
 
-  fun allSubscriptions(): Set<String> {
-    return subscriptions.keys
-  }
+    fun subscribe(listener: Listener) {
+        listeners = listeners.plus(listener)
+    }
 
-  fun getSubscriptionFilters(subId: String): List<TypedFilter> {
-    return subscriptions[subId] ?: emptyList()
-  }
+    fun isSubscribed(listener: Listener): Boolean {
+        return listeners.contains(listener)
+    }
 
-  abstract class Listener {
-    /** A new message was received */
-    open fun onEvent(
-      event: Event,
-      subscriptionId: String,
-      relay: Relay,
-      afterEOSE: Boolean,
-    ) = Unit
+    fun unsubscribe(listener: Listener) {
+        listeners = listeners.minus(listener)
+    }
 
-    /** A new or repeat message was received */
-    open fun onError(
-      error: Error,
-      subscriptionId: String,
-      relay: Relay,
-    ) = Unit
+    fun allSubscriptions(): Set<String> {
+        return subscriptions.keys
+    }
 
-    /** Connected to or disconnected from a relay */
-    open fun onRelayStateChange(
-      type: Relay.StateType,
-      relay: Relay,
-      channel: String?,
-    ) = Unit
+    fun getSubscriptionFilters(subId: String): List<TypedFilter> {
+        return subscriptions[subId] ?: emptyList()
+    }
 
-    /** When an relay saves or rejects a new event. */
-    open fun onSendResponse(
-      eventId: String,
-      success: Boolean,
-      message: String,
-      relay: Relay,
-    ) = Unit
+    abstract class Listener {
+        /** A new message was received */
+        open fun onEvent(
+            event: Event,
+            subscriptionId: String,
+            relay: Relay,
+            afterEOSE: Boolean,
+        ) = Unit
 
-    open fun onAuth(
-      relay: Relay,
-      challenge: String,
-    ) = Unit
+        /** A new or repeat message was received */
+        open fun onError(
+            error: Error,
+            subscriptionId: String,
+            relay: Relay,
+        ) = Unit
 
-    open fun onNotify(
-      relay: Relay,
-      description: String,
-    ) = Unit
-  }
+        /** Connected to or disconnected from a relay */
+        open fun onRelayStateChange(
+            type: Relay.StateType,
+            relay: Relay,
+            channel: String?,
+        ) = Unit
+
+        /** When an relay saves or rejects a new event. */
+        open fun onSendResponse(
+            eventId: String,
+            success: Boolean,
+            message: String,
+            relay: Relay,
+        ) = Unit
+
+        open fun onAuth(
+            relay: Relay,
+            challenge: String,
+        ) = Unit
+
+        open fun onNotify(
+            relay: Relay,
+            description: String,
+        ) = Unit
+    }
 }

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

@@ -23,156 +23,156 @@ package com.vitorpamplona.amethyst.service.relays
 import com.vitorpamplona.amethyst.model.RelaySetupInfo
 
 object Constants {
-  val activeTypes = setOf(FeedType.FOLLOWS, FeedType.PRIVATE_DMS)
-  val activeTypesChats = setOf(FeedType.FOLLOWS, FeedType.PUBLIC_CHATS, FeedType.PRIVATE_DMS)
-  val activeTypesGlobalChats =
-    setOf(FeedType.FOLLOWS, FeedType.PUBLIC_CHATS, FeedType.PRIVATE_DMS, FeedType.GLOBAL)
-  val activeTypesSearch = setOf(FeedType.SEARCH)
+    val activeTypes = setOf(FeedType.FOLLOWS, FeedType.PRIVATE_DMS)
+    val activeTypesChats = setOf(FeedType.FOLLOWS, FeedType.PUBLIC_CHATS, FeedType.PRIVATE_DMS)
+    val activeTypesGlobalChats =
+        setOf(FeedType.FOLLOWS, FeedType.PUBLIC_CHATS, FeedType.PRIVATE_DMS, FeedType.GLOBAL)
+    val activeTypesSearch = setOf(FeedType.SEARCH)
 
-  fun convertDefaultRelays(): Array<Relay> {
-    return defaultRelays.map { Relay(it.url, it.read, it.write, it.feedTypes) }.toTypedArray()
-  }
+    fun convertDefaultRelays(): Array<Relay> {
+        return defaultRelays.map { Relay(it.url, it.read, it.write, it.feedTypes) }.toTypedArray()
+    }
 
-  val defaultRelays =
-    arrayOf(
-      // Free relays for only DMs and Follows due to the amount of spam
-      RelaySetupInfo("wss://relay.damus.io", read = true, write = true, feedTypes = activeTypes),
-      // Chats
-      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-pub.wellorder.net",
-        read = true,
-        write = true,
-        feedTypes = activeTypesChats,
-      ),
-      RelaySetupInfo("wss://nostr.mom", read = true, write = true, feedTypes = activeTypesChats),
-      RelaySetupInfo("wss://nos.lol", read = true, write = true, feedTypes = activeTypesChats),
-      // Less Reliable
-      // NewRelayListViewModel.Relay("wss://nostr.orangepill.dev", read = true, write = true,
-      // feedTypes = activeTypes),
-      // NewRelayListViewModel.Relay("wss://nostr.onsats.org", read = true, write = true, feedTypes
-      // = activeTypes),
-      // NewRelayListViewModel.Relay("wss://nostr.sandwich.farm", read = true, write = true,
-      // feedTypes = activeTypes),
-      // NewRelayListViewModel.Relay("wss://relay.nostr.ch", read = true, write = true, feedTypes =
-      // activeTypes),
-      // NewRelayListViewModel.Relay("wss://nostr.zebedee.cloud", read = true, write = true,
-      // feedTypes = activeTypes),
-      // NewRelayListViewModel.Relay("wss://nostr.rocks", read = true, write = true, feedTypes =
-      // activeTypes),
-      // NewRelayListViewModel.Relay("wss://nostr.fmt.wiz.biz", read = true, write = true, feedTypes
-      // = activeTypes),
-      // NewRelayListViewModel.Relay("wss://brb.io", read = true, write = true, feedTypes =
-      // activeTypes),
-      // Paid relays
-      RelaySetupInfo(
-        "wss://relay.snort.social",
-        read = true,
-        write = false,
-        feedTypes = activeTypesGlobalChats,
-      ),
-      RelaySetupInfo(
-        "wss://relay.nostr.com.au",
-        read = true,
-        write = false,
-        feedTypes = activeTypesGlobalChats,
-      ),
-      RelaySetupInfo(
-        "wss://eden.nostr.land",
-        read = true,
-        write = false,
-        feedTypes = activeTypesGlobalChats,
-      ),
-      RelaySetupInfo(
-        "wss://nostr.milou.lol",
-        read = true,
-        write = false,
-        feedTypes = activeTypesGlobalChats,
-      ),
-      RelaySetupInfo(
-        "wss://puravida.nostr.land",
-        read = true,
-        write = false,
-        feedTypes = activeTypesGlobalChats,
-      ),
-      RelaySetupInfo(
-        "wss://nostr.wine",
-        read = true,
-        write = false,
-        feedTypes = activeTypesGlobalChats,
-      ),
-      RelaySetupInfo(
-        "wss://nostr.inosta.cc",
-        read = true,
-        write = false,
-        feedTypes = activeTypesGlobalChats,
-      ),
-      RelaySetupInfo(
-        "wss://atlas.nostr.land",
-        read = true,
-        write = false,
-        feedTypes = activeTypesGlobalChats,
-      ),
-      RelaySetupInfo(
-        "wss://relay.orangepill.dev",
-        read = true,
-        write = false,
-        feedTypes = activeTypesGlobalChats,
-      ),
-      RelaySetupInfo(
-        "wss://relay.nostrati.com",
-        read = true,
-        write = false,
-        feedTypes = activeTypesGlobalChats,
-      ),
-      // 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,
-      ),
-    )
+    val defaultRelays =
+        arrayOf(
+            // Free relays for only DMs and Follows due to the amount of spam
+            RelaySetupInfo("wss://relay.damus.io", read = true, write = true, feedTypes = activeTypes),
+            // Chats
+            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-pub.wellorder.net",
+                read = true,
+                write = true,
+                feedTypes = activeTypesChats,
+            ),
+            RelaySetupInfo("wss://nostr.mom", read = true, write = true, feedTypes = activeTypesChats),
+            RelaySetupInfo("wss://nos.lol", read = true, write = true, feedTypes = activeTypesChats),
+            // Less Reliable
+            // NewRelayListViewModel.Relay("wss://nostr.orangepill.dev", read = true, write = true,
+            // feedTypes = activeTypes),
+            // NewRelayListViewModel.Relay("wss://nostr.onsats.org", read = true, write = true, feedTypes
+            // = activeTypes),
+            // NewRelayListViewModel.Relay("wss://nostr.sandwich.farm", read = true, write = true,
+            // feedTypes = activeTypes),
+            // NewRelayListViewModel.Relay("wss://relay.nostr.ch", read = true, write = true, feedTypes =
+            // activeTypes),
+            // NewRelayListViewModel.Relay("wss://nostr.zebedee.cloud", read = true, write = true,
+            // feedTypes = activeTypes),
+            // NewRelayListViewModel.Relay("wss://nostr.rocks", read = true, write = true, feedTypes =
+            // activeTypes),
+            // NewRelayListViewModel.Relay("wss://nostr.fmt.wiz.biz", read = true, write = true, feedTypes
+            // = activeTypes),
+            // NewRelayListViewModel.Relay("wss://brb.io", read = true, write = true, feedTypes =
+            // activeTypes),
+            // Paid relays
+            RelaySetupInfo(
+                "wss://relay.snort.social",
+                read = true,
+                write = false,
+                feedTypes = activeTypesGlobalChats,
+            ),
+            RelaySetupInfo(
+                "wss://relay.nostr.com.au",
+                read = true,
+                write = false,
+                feedTypes = activeTypesGlobalChats,
+            ),
+            RelaySetupInfo(
+                "wss://eden.nostr.land",
+                read = true,
+                write = false,
+                feedTypes = activeTypesGlobalChats,
+            ),
+            RelaySetupInfo(
+                "wss://nostr.milou.lol",
+                read = true,
+                write = false,
+                feedTypes = activeTypesGlobalChats,
+            ),
+            RelaySetupInfo(
+                "wss://puravida.nostr.land",
+                read = true,
+                write = false,
+                feedTypes = activeTypesGlobalChats,
+            ),
+            RelaySetupInfo(
+                "wss://nostr.wine",
+                read = true,
+                write = false,
+                feedTypes = activeTypesGlobalChats,
+            ),
+            RelaySetupInfo(
+                "wss://nostr.inosta.cc",
+                read = true,
+                write = false,
+                feedTypes = activeTypesGlobalChats,
+            ),
+            RelaySetupInfo(
+                "wss://atlas.nostr.land",
+                read = true,
+                write = false,
+                feedTypes = activeTypesGlobalChats,
+            ),
+            RelaySetupInfo(
+                "wss://relay.orangepill.dev",
+                read = true,
+                write = false,
+                feedTypes = activeTypesGlobalChats,
+            ),
+            RelaySetupInfo(
+                "wss://relay.nostrati.com",
+                read = true,
+                write = false,
+                feedTypes = activeTypesGlobalChats,
+            ),
+            // 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,
+            ),
+        )
 
-  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 forcedRelaysForSearchSet = forcedRelayForSearch.map { it.url }
+    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 forcedRelaysForSearchSet = forcedRelayForSearch.map { it.url }
 }

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

@@ -23,60 +23,60 @@ package com.vitorpamplona.amethyst.service.relays
 import com.vitorpamplona.amethyst.model.User
 
 class EOSETime(var time: Long) {
-  override fun toString(): String {
-    return time.toString()
-  }
+    override fun toString(): String {
+        return time.toString()
+    }
 }
 
 class EOSERelayList(var relayList: Map<String, EOSETime> = emptyMap()) {
-  fun addOrUpdate(
-    relayUrl: String,
-    time: Long,
-  ) {
-    val eose = relayList[relayUrl]
-    if (eose == null) {
-      relayList = relayList + Pair(relayUrl, EOSETime(time))
-    } else {
-      eose.time = time
+    fun addOrUpdate(
+        relayUrl: String,
+        time: Long,
+    ) {
+        val eose = relayList[relayUrl]
+        if (eose == null) {
+            relayList = relayList + Pair(relayUrl, EOSETime(time))
+        } else {
+            eose.time = time
+        }
     }
-  }
 }
 
 class EOSEFollowList(var followList: Map<String, EOSERelayList> = emptyMap()) {
-  fun addOrUpdate(
-    listCode: String,
-    relayUrl: String,
-    time: Long,
-  ) {
-    val relayList = followList[listCode]
-    if (relayList == null) {
-      val newList = EOSERelayList()
-      newList.addOrUpdate(relayUrl, time)
-      followList = followList + mapOf(listCode to newList)
-    } else {
-      relayList.addOrUpdate(relayUrl, time)
+    fun addOrUpdate(
+        listCode: String,
+        relayUrl: String,
+        time: Long,
+    ) {
+        val relayList = followList[listCode]
+        if (relayList == null) {
+            val newList = EOSERelayList()
+            newList.addOrUpdate(relayUrl, time)
+            followList = followList + mapOf(listCode to newList)
+        } else {
+            relayList.addOrUpdate(relayUrl, time)
+        }
     }
-  }
 }
 
 class EOSEAccount(var users: Map<User, EOSEFollowList> = emptyMap()) {
-  fun addOrUpdate(
-    user: User,
-    listCode: String,
-    relayUrl: String,
-    time: Long,
-  ) {
-    val followList = users[user]
-    if (followList == null) {
-      val newList = EOSEFollowList()
-      newList.addOrUpdate(listCode, relayUrl, time)
-      users = users + mapOf(user to newList)
-    } else {
-      followList.addOrUpdate(listCode, relayUrl, time)
+    fun addOrUpdate(
+        user: User,
+        listCode: String,
+        relayUrl: String,
+        time: Long,
+    ) {
+        val followList = users[user]
+        if (followList == null) {
+            val newList = EOSEFollowList()
+            newList.addOrUpdate(listCode, relayUrl, time)
+            users = users + mapOf(user to newList)
+        } else {
+            followList.addOrUpdate(listCode, relayUrl, time)
+        }
     }
-  }
 
-  fun removeDataFor(user: User) {
-    users = users.minus(user)
-  }
+    fun removeDataFor(user: User) {
+        users = users.minus(user)
+    }
 }

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

@@ -23,65 +23,65 @@ package com.vitorpamplona.amethyst.service.relays
 import com.vitorpamplona.quartz.events.Event
 
 class JsonFilter(
-  val ids: List<String>? = null,
-  val authors: List<String>? = null,
-  val kinds: List<Int>? = null,
-  val tags: Map<String, List<String>>? = null,
-  val since: Map<String, EOSETime>? = null,
-  val until: Long? = null,
-  val limit: Int? = null,
-  val search: String? = null,
+    val ids: List<String>? = null,
+    val authors: List<String>? = null,
+    val kinds: List<Int>? = null,
+    val tags: Map<String, List<String>>? = null,
+    val since: Map<String, EOSETime>? = null,
+    val until: Long? = null,
+    val limit: Int? = null,
+    val search: String? = null,
 ) {
-  fun toJson(forRelay: String? = null): String {
-    val factory = Event.mapper.nodeFactory
-    val filter =
-      factory.objectNode().apply {
-        ids?.run {
-          put(
-            "ids",
-            factory.arrayNode(ids.size).apply { ids.forEach { add(it) } },
-          )
-        }
-        authors?.run {
-          put(
-            "authors",
-            factory.arrayNode(authors.size).apply { authors.forEach { add(it) } },
-          )
-        }
-        kinds?.run {
-          put(
-            "kinds",
-            factory.arrayNode(kinds.size).apply { kinds.forEach { add(it) } },
-          )
-        }
-        tags?.run {
-          entries.forEach { kv ->
-            put(
-              "#${kv.key}",
-              factory.arrayNode(kv.value.size).apply { kv.value.forEach { add(it) } },
-            )
-          }
-        }
-        since?.run {
-          if (!isEmpty()) {
-            if (forRelay != null) {
-              val relaySince = get(forRelay)
-              if (relaySince != null) {
-                put("since", relaySince.time)
-              }
-            } else {
-              val jsonObjectSince = factory.objectNode()
-              entries.forEach { sincePairs ->
-                jsonObjectSince.put(sincePairs.key, "${sincePairs.value}")
-              }
-              put("since", jsonObjectSince)
+    fun toJson(forRelay: String? = null): String {
+        val factory = Event.mapper.nodeFactory
+        val filter =
+            factory.objectNode().apply {
+                ids?.run {
+                    put(
+                        "ids",
+                        factory.arrayNode(ids.size).apply { ids.forEach { add(it) } },
+                    )
+                }
+                authors?.run {
+                    put(
+                        "authors",
+                        factory.arrayNode(authors.size).apply { authors.forEach { add(it) } },
+                    )
+                }
+                kinds?.run {
+                    put(
+                        "kinds",
+                        factory.arrayNode(kinds.size).apply { kinds.forEach { add(it) } },
+                    )
+                }
+                tags?.run {
+                    entries.forEach { kv ->
+                        put(
+                            "#${kv.key}",
+                            factory.arrayNode(kv.value.size).apply { kv.value.forEach { add(it) } },
+                        )
+                    }
+                }
+                since?.run {
+                    if (!isEmpty()) {
+                        if (forRelay != null) {
+                            val relaySince = get(forRelay)
+                            if (relaySince != null) {
+                                put("since", relaySince.time)
+                            }
+                        } else {
+                            val jsonObjectSince = factory.objectNode()
+                            entries.forEach { sincePairs ->
+                                jsonObjectSince.put(sincePairs.key, "${sincePairs.value}")
+                            }
+                            put("since", jsonObjectSince)
+                        }
+                    }
+                }
+                until?.run { put("until", until) }
+                limit?.run { put("limit", limit) }
+                search?.run { put("search", search) }
             }
-          }
-        }
-        until?.run { put("until", until) }
-        limit?.run { put("limit", limit) }
-        search?.run { put("search", search) }
-      }
-    return Event.mapper.writeValueAsString(filter)
-  }
+        return Event.mapper.writeValueAsString(filter)
+    }
 }

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

@@ -31,501 +31,501 @@ import com.vitorpamplona.quartz.events.EventInterface
 import com.vitorpamplona.quartz.events.RelayAuthEvent
 import com.vitorpamplona.quartz.events.bytesUsedInMemory
 import com.vitorpamplona.quartz.utils.TimeUtils
-import java.lang.StringBuilder
-import java.util.concurrent.atomic.AtomicBoolean
 import okhttp3.Request
 import okhttp3.Response
 import okhttp3.WebSocket
 import okhttp3.WebSocketListener
+import java.lang.StringBuilder
+import java.util.concurrent.atomic.AtomicBoolean
 
 enum class FeedType {
-  FOLLOWS,
-  PUBLIC_CHATS,
-  PRIVATE_DMS,
-  GLOBAL,
-  SEARCH,
-  WALLET_CONNECT,
+    FOLLOWS,
+    PUBLIC_CHATS,
+    PRIVATE_DMS,
+    GLOBAL,
+    SEARCH,
+    WALLET_CONNECT,
 }
 
 val COMMON_FEED_TYPES =
-  setOf(FeedType.FOLLOWS, FeedType.PUBLIC_CHATS, FeedType.PRIVATE_DMS, FeedType.GLOBAL)
+    setOf(FeedType.FOLLOWS, FeedType.PUBLIC_CHATS, FeedType.PRIVATE_DMS, FeedType.GLOBAL)
 
 class Relay(
-  val url: String,
-  val read: Boolean = true,
-  val write: Boolean = true,
-  val activeTypes: Set<FeedType> = FeedType.values().toSet(),
+    val url: String,
+    val read: Boolean = true,
+    val write: Boolean = true,
+    val activeTypes: Set<FeedType> = FeedType.values().toSet(),
 ) {
-  val brief = RelayBriefInfoCache.get(url)
+    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 = HttpClient.getHttpClientForRelays()
-
-  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
-
-  var spamCounter = 0
-  var errorCounter = 0
-  var pingInMs: Long? = null
-
-  var closingTimeInSeconds = 0L
-
-  var afterEOSEPerSubscription = mutableMapOf<String, Boolean>()
-
-  val authResponse = mutableMapOf<HexKey, Boolean>()
-
-  fun register(listener: Listener) {
-    listeners = listeners.plus(listener)
-  }
-
-  fun unregister(listener: Listener) {
-    listeners = listeners.minus(listener)
-  }
-
-  fun isConnected(): Boolean {
-    return socket != null
-  }
-
-  fun connect() {
-    connectAndRun {
-      checkNotInMainThread()
-
-      // Sends everything.
-      renewFilters()
-    }
-  }
-
-  private var connectingBlock = AtomicBoolean()
-
-  fun connectAndRun(onConnected: (Relay) -> Unit) {
-    Log.d("Relay", "Relay.connect $url")
-    // BRB is crashing OkHttp Deflater object :(
-    if (url.contains("brb.io")) return
-
-    // If there is a connection, don't wait.
-    if (connectingBlock.getAndSet(true)) {
-      return
+    companion object {
+        // waits 3 minutes to reconnect once things fail
+        const val RECONNECTING_IN_SECONDS = 60 * 3
     }
 
-    checkNotInMainThread()
+    private val httpClient = HttpClient.getHttpClientForRelays()
 
-    if (socket != null) return
+    private var listeners = setOf<Listener>()
+    private var socket: WebSocket? = null
+    private var isReady: Boolean = false
+    private var usingCompression: Boolean = false
 
-    try {
-      val request =
-        Request.Builder()
-          .header("User-Agent", "Amethyst/${BuildConfig.VERSION_NAME}")
-          .url(url.trim())
-          .build()
+    var eventDownloadCounterInBytes = 0
+    var eventUploadCounterInBytes = 0
 
-      socket = httpClient.newWebSocket(request, RelayListener(onConnected))
-    } catch (e: Exception) {
-      errorCounter++
-      markConnectionAsClosed()
-      Log.e("Relay", "Relay Invalid $url")
-      e.printStackTrace()
-    } finally {
-      connectingBlock.set(false)
-    }
-  }
+    var spamCounter = 0
+    var errorCounter = 0
+    var pingInMs: Long? = null
 
-  inner class RelayListener(val onConnected: (Relay) -> Unit) : WebSocketListener() {
-    override fun onOpen(
-      webSocket: WebSocket,
-      response: Response,
-    ) {
-      checkNotInMainThread()
-      Log.d("Relay", "Connect onOpen $url $socket")
+    var closingTimeInSeconds = 0L
 
-      markConnectionAsReady(
-        pingInMs = response.receivedResponseAtMillis - response.sentRequestAtMillis,
-        usingCompression =
-          response.headers.get("Sec-WebSocket-Extensions")?.contains("permessage-deflate") ?: false,
-      )
+    var afterEOSEPerSubscription = mutableMapOf<String, Boolean>()
 
-      // Log.w("Relay", "Relay OnOpen, Loading All subscriptions $url")
-      onConnected(this@Relay)
+    val authResponse = mutableMapOf<HexKey, Boolean>()
 
-      listeners.forEach { it.onRelayStateChange(this@Relay, StateType.CONNECT, null) }
+    fun register(listener: Listener) {
+        listeners = listeners.plus(listener)
     }
 
-    override fun onMessage(
-      webSocket: WebSocket,
-      text: String,
-    ) {
-      checkNotInMainThread()
-
-      eventDownloadCounterInBytes += text.bytesUsedInMemory()
-
-      try {
-        processNewRelayMessage(text)
-      } catch (t: Throwable) {
-        t.printStackTrace()
-        text.chunked(2000) { chunked ->
-          listeners.forEach { it.onError(this@Relay, "", Error("Problem with $chunked")) }
-        }
-      }
+    fun unregister(listener: Listener) {
+        listeners = listeners.minus(listener)
     }
 
-    override fun onClosing(
-      webSocket: WebSocket,
-      code: Int,
-      reason: String,
-    ) {
-      checkNotInMainThread()
-
-      Log.w("Relay", "Relay onClosing $url: $reason")
-
-      listeners.forEach {
-        it.onRelayStateChange(
-          this@Relay,
-          StateType.DISCONNECTING,
-          null,
-        )
-      }
+    fun isConnected(): Boolean {
+        return socket != null
     }
 
-    override fun onClosed(
-      webSocket: WebSocket,
-      code: Int,
-      reason: String,
-    ) {
-      checkNotInMainThread()
-
-      markConnectionAsClosed()
-
-      Log.w("Relay", "Relay onClosed $url: $reason")
-
-      listeners.forEach { it.onRelayStateChange(this@Relay, StateType.DISCONNECT, null) }
-    }
-
-    override fun onFailure(
-      webSocket: WebSocket,
-      t: Throwable,
-      response: Response?,
-    ) {
-      checkNotInMainThread()
-
-      errorCounter++
-
-      socket?.cancel() // 1000, "Normal close"
-      // 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),
-        )
-      }
-    }
-  }
-
-  fun markConnectionAsReady(
-    pingInMs: Long,
-    usingCompression: Boolean,
-  ) {
-    this.resetEOSEStatuses()
-    this.isReady = true
-    this.pingInMs = pingInMs
-    this.usingCompression = usingCompression
-  }
-
-  fun markConnectionAsClosed() {
-    this.socket = null
-    this.isReady = false
-    this.usingCompression = false
-    this.resetEOSEStatuses()
-    this.closingTimeInSeconds = TimeUtils.now()
-  }
-
-  fun processNewRelayMessage(newMessage: String) {
-    val msgArray = Event.mapper.readTree(newMessage)
-
-    when (val type = msgArray.get(0).asText()) {
-      "EVENT" -> {
-        val subscriptionId = msgArray.get(1).asText()
-        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,
-            subscriptionId,
-            event,
-            afterEOSEPerSubscription[subscriptionId] == true,
-          )
-        }
-      }
-      "EOSE" ->
-        listeners.forEach {
-          val subscriptionId = msgArray.get(1).asText()
-
-          afterEOSEPerSubscription[subscriptionId] = true
-          // Log.w("Relay", "Relay onEOSE $url $subscriptionId")
-          it.onRelayStateChange(this@Relay, StateType.EOSE, subscriptionId)
-        }
-      "NOTICE" ->
-        listeners.forEach {
-          val message = msgArray.get(1).asText()
-          Log.w("Relay", "Relay onNotice $url, $message")
-
-          it.onError(this@Relay, message, Error("Relay sent notice: $message"))
-        }
-      "OK" ->
-        listeners.forEach {
-          val eventId = msgArray[1].asText()
-          val success = msgArray[2].asBoolean()
-          val message = if (msgArray.size() > 2) msgArray[3].asText() else ""
-
-          if (authResponse.containsKey(eventId)) {
-            val wasAlreadyAuthenticated = authResponse.get(eventId)
-            authResponse.put(eventId, success)
-            if (wasAlreadyAuthenticated != true && success) {
-              renewFilters()
-            }
-          }
-
-          Log.w("Relay", "Relay on OK $url, $eventId, $success, $message")
-          it.onSendResponse(this@Relay, eventId, success, message)
-        }
-      "AUTH" ->
-        listeners.forEach {
-          // Log.w("Relay", "Relay onAuth $url, ${msg[1].asString}")
-          it.onAuth(this@Relay, msgArray[1].asText())
-        }
-      "NOTIFY" ->
-        listeners.forEach {
-          // Log.w("Relay", "Relay onNotify $url, ${msg[1].asString}")
-          it.onNotify(this@Relay, msgArray[1].asText())
-        }
-      "CLOSED" -> listeners.forEach { Log.w("Relay", "Relay onClosed $url, $newMessage") }
-      else ->
-        listeners.forEach {
-          Log.w("Relay", "Unsupported message: $newMessage")
-          it.onError(
-            this@Relay,
-            "",
-            Error("Unknown type $type on channel. Msg was $newMessage"),
-          )
-        }
-    }
-  }
-
-  fun disconnect() {
-    Log.d("Relay", "Relay.disconnect $url")
-    checkNotInMainThread()
-
-    closingTimeInSeconds = TimeUtils.now()
-    socket?.cancel()
-    socket = null
-    isReady = false
-    usingCompression = false
-    resetEOSEStatuses()
-  }
-
-  fun resetEOSEStatuses() {
-    afterEOSEPerSubscription = LinkedHashMap(afterEOSEPerSubscription.size)
-  }
-
-  fun sendFilter(requestId: String) {
-    checkNotInMainThread()
-
-    if (read) {
-      if (isConnected()) {
-        if (isReady) {
-          val filters =
-            Client.getSubscriptionFilters(requestId).filter { filter ->
-              activeTypes.any { it in filter.types }
-            }
-          if (filters.isNotEmpty()) {
-            val request =
-              filters.joinToStringLimited(
-                separator = ",",
-                limit = 20,
-                prefix = """["REQ","$requestId",""",
-                postfix = "]",
-              ) {
-                it.filter.toJson(url)
-              }
-
-            // Log.d("Relay", "onFilterSent $url $requestId $request")
-
-            socket?.send(request)
-            eventUploadCounterInBytes += request.bytesUsedInMemory()
-            resetEOSEStatuses()
-          }
-        }
-      } else {
-        // waits 60 seconds to reconnect after disconnected.
-        if (TimeUtils.now() > closingTimeInSeconds + RECONNECTING_IN_SECONDS) {
-          // sends all filters after connection is successful.
-          connect()
-        }
-      }
-    }
-  }
-
-  fun <T> Iterable<T>.joinToStringLimited(
-    separator: CharSequence = ", ",
-    prefix: CharSequence = "",
-    postfix: CharSequence = "",
-    limit: Int = -1,
-    transform: ((T) -> CharSequence)? = null,
-  ): String {
-    val buffer = StringBuilder()
-    buffer.append(prefix)
-    var count = 0
-    for (element in this) {
-      if (limit < 0 || count <= limit) {
-        if (++count > 1) buffer.append(separator)
-        when {
-          transform != null -> buffer.append(transform(element))
-          element is CharSequence? -> buffer.append(element)
-          element is Char -> buffer.append(element)
-          else -> buffer.append(element.toString())
-        }
-      } else {
-        break
-      }
-    }
-    buffer.append(postfix)
-    return buffer.toString()
-  }
-
-  fun sendFilterOnlyIfDisconnected(subscriptionId: String) {
-    checkNotInMainThread()
-
-    if (socket == null) {
-      // waits 60 seconds to reconnect after disconnected.
-      if (TimeUtils.now() > closingTimeInSeconds + RECONNECTING_IN_SECONDS) {
-        // println("sendfilter Only if Disconnected ${url} ")
-        connect()
-      }
-    }
-  }
-
-  fun renewFilters() {
-    // Force update all filters after AUTH.
-    Client.allSubscriptions().forEach { sendFilter(requestId = it) }
-  }
-
-  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()
-    } else {
-      if (write) {
-        val event = """["EVENT",${signedEvent.toJson()}]"""
-        if (isConnected()) {
-          if (isReady) {
-            socket?.send(event)
-            eventUploadCounterInBytes += event.bytesUsedInMemory()
-          }
-        } else {
-          // sends all filters after connection is successful.
-          connectAndRun {
+    fun connect() {
+        connectAndRun {
             checkNotInMainThread()
 
+            // Sends everything.
+            renewFilters()
+        }
+    }
+
+    private var connectingBlock = AtomicBoolean()
+
+    fun connectAndRun(onConnected: (Relay) -> Unit) {
+        Log.d("Relay", "Relay.connect $url")
+        // BRB is crashing OkHttp Deflater object :(
+        if (url.contains("brb.io")) return
+
+        // If there is a connection, don't wait.
+        if (connectingBlock.getAndSet(true)) {
+            return
+        }
+
+        checkNotInMainThread()
+
+        if (socket != null) return
+
+        try {
+            val request =
+                Request.Builder()
+                    .header("User-Agent", "Amethyst/${BuildConfig.VERSION_NAME}")
+                    .url(url.trim())
+                    .build()
+
+            socket = httpClient.newWebSocket(request, RelayListener(onConnected))
+        } catch (e: Exception) {
+            errorCounter++
+            markConnectionAsClosed()
+            Log.e("Relay", "Relay Invalid $url")
+            e.printStackTrace()
+        } finally {
+            connectingBlock.set(false)
+        }
+    }
+
+    inner class RelayListener(val onConnected: (Relay) -> Unit) : WebSocketListener() {
+        override fun onOpen(
+            webSocket: WebSocket,
+            response: Response,
+        ) {
+            checkNotInMainThread()
+            Log.d("Relay", "Connect onOpen $url $socket")
+
+            markConnectionAsReady(
+                pingInMs = response.receivedResponseAtMillis - response.sentRequestAtMillis,
+                usingCompression =
+                    response.headers.get("Sec-WebSocket-Extensions")?.contains("permessage-deflate") ?: false,
+            )
+
+            // Log.w("Relay", "Relay OnOpen, Loading All subscriptions $url")
+            onConnected(this@Relay)
+
+            listeners.forEach { it.onRelayStateChange(this@Relay, StateType.CONNECT, null) }
+        }
+
+        override fun onMessage(
+            webSocket: WebSocket,
+            text: String,
+        ) {
+            checkNotInMainThread()
+
+            eventDownloadCounterInBytes += text.bytesUsedInMemory()
+
+            try {
+                processNewRelayMessage(text)
+            } catch (t: Throwable) {
+                t.printStackTrace()
+                text.chunked(2000) { chunked ->
+                    listeners.forEach { it.onError(this@Relay, "", Error("Problem with $chunked")) }
+                }
+            }
+        }
+
+        override fun onClosing(
+            webSocket: WebSocket,
+            code: Int,
+            reason: String,
+        ) {
+            checkNotInMainThread()
+
+            Log.w("Relay", "Relay onClosing $url: $reason")
+
+            listeners.forEach {
+                it.onRelayStateChange(
+                    this@Relay,
+                    StateType.DISCONNECTING,
+                    null,
+                )
+            }
+        }
+
+        override fun onClosed(
+            webSocket: WebSocket,
+            code: Int,
+            reason: String,
+        ) {
+            checkNotInMainThread()
+
+            markConnectionAsClosed()
+
+            Log.w("Relay", "Relay onClosed $url: $reason")
+
+            listeners.forEach { it.onRelayStateChange(this@Relay, StateType.DISCONNECT, null) }
+        }
+
+        override fun onFailure(
+            webSocket: WebSocket,
+            t: Throwable,
+            response: Response?,
+        ) {
+            checkNotInMainThread()
+
+            errorCounter++
+
+            socket?.cancel() // 1000, "Normal close"
+            // 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),
+                )
+            }
+        }
+    }
+
+    fun markConnectionAsReady(
+        pingInMs: Long,
+        usingCompression: Boolean,
+    ) {
+        this.resetEOSEStatuses()
+        this.isReady = true
+        this.pingInMs = pingInMs
+        this.usingCompression = usingCompression
+    }
+
+    fun markConnectionAsClosed() {
+        this.socket = null
+        this.isReady = false
+        this.usingCompression = false
+        this.resetEOSEStatuses()
+        this.closingTimeInSeconds = TimeUtils.now()
+    }
+
+    fun processNewRelayMessage(newMessage: String) {
+        val msgArray = Event.mapper.readTree(newMessage)
+
+        when (val type = msgArray.get(0).asText()) {
+            "EVENT" -> {
+                val subscriptionId = msgArray.get(1).asText()
+                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,
+                        subscriptionId,
+                        event,
+                        afterEOSEPerSubscription[subscriptionId] == true,
+                    )
+                }
+            }
+            "EOSE" ->
+                listeners.forEach {
+                    val subscriptionId = msgArray.get(1).asText()
+
+                    afterEOSEPerSubscription[subscriptionId] = true
+                    // Log.w("Relay", "Relay onEOSE $url $subscriptionId")
+                    it.onRelayStateChange(this@Relay, StateType.EOSE, subscriptionId)
+                }
+            "NOTICE" ->
+                listeners.forEach {
+                    val message = msgArray.get(1).asText()
+                    Log.w("Relay", "Relay onNotice $url, $message")
+
+                    it.onError(this@Relay, message, Error("Relay sent notice: $message"))
+                }
+            "OK" ->
+                listeners.forEach {
+                    val eventId = msgArray[1].asText()
+                    val success = msgArray[2].asBoolean()
+                    val message = if (msgArray.size() > 2) msgArray[3].asText() else ""
+
+                    if (authResponse.containsKey(eventId)) {
+                        val wasAlreadyAuthenticated = authResponse.get(eventId)
+                        authResponse.put(eventId, success)
+                        if (wasAlreadyAuthenticated != true && success) {
+                            renewFilters()
+                        }
+                    }
+
+                    Log.w("Relay", "Relay on OK $url, $eventId, $success, $message")
+                    it.onSendResponse(this@Relay, eventId, success, message)
+                }
+            "AUTH" ->
+                listeners.forEach {
+                    // Log.w("Relay", "Relay onAuth $url, ${msg[1].asString}")
+                    it.onAuth(this@Relay, msgArray[1].asText())
+                }
+            "NOTIFY" ->
+                listeners.forEach {
+                    // Log.w("Relay", "Relay onNotify $url, ${msg[1].asString}")
+                    it.onNotify(this@Relay, msgArray[1].asText())
+                }
+            "CLOSED" -> listeners.forEach { Log.w("Relay", "Relay onClosed $url, $newMessage") }
+            else ->
+                listeners.forEach {
+                    Log.w("Relay", "Unsupported message: $newMessage")
+                    it.onError(
+                        this@Relay,
+                        "",
+                        Error("Unknown type $type on channel. Msg was $newMessage"),
+                    )
+                }
+        }
+    }
+
+    fun disconnect() {
+        Log.d("Relay", "Relay.disconnect $url")
+        checkNotInMainThread()
+
+        closingTimeInSeconds = TimeUtils.now()
+        socket?.cancel()
+        socket = null
+        isReady = false
+        usingCompression = false
+        resetEOSEStatuses()
+    }
+
+    fun resetEOSEStatuses() {
+        afterEOSEPerSubscription = LinkedHashMap(afterEOSEPerSubscription.size)
+    }
+
+    fun sendFilter(requestId: String) {
+        checkNotInMainThread()
+
+        if (read) {
+            if (isConnected()) {
+                if (isReady) {
+                    val filters =
+                        Client.getSubscriptionFilters(requestId).filter { filter ->
+                            activeTypes.any { it in filter.types }
+                        }
+                    if (filters.isNotEmpty()) {
+                        val request =
+                            filters.joinToStringLimited(
+                                separator = ",",
+                                limit = 20,
+                                prefix = """["REQ","$requestId",""",
+                                postfix = "]",
+                            ) {
+                                it.filter.toJson(url)
+                            }
+
+                        // Log.d("Relay", "onFilterSent $url $requestId $request")
+
+                        socket?.send(request)
+                        eventUploadCounterInBytes += request.bytesUsedInMemory()
+                        resetEOSEStatuses()
+                    }
+                }
+            } else {
+                // waits 60 seconds to reconnect after disconnected.
+                if (TimeUtils.now() > closingTimeInSeconds + RECONNECTING_IN_SECONDS) {
+                    // sends all filters after connection is successful.
+                    connect()
+                }
+            }
+        }
+    }
+
+    fun <T> Iterable<T>.joinToStringLimited(
+        separator: CharSequence = ", ",
+        prefix: CharSequence = "",
+        postfix: CharSequence = "",
+        limit: Int = -1,
+        transform: ((T) -> CharSequence)? = null,
+    ): String {
+        val buffer = StringBuilder()
+        buffer.append(prefix)
+        var count = 0
+        for (element in this) {
+            if (limit < 0 || count <= limit) {
+                if (++count > 1) buffer.append(separator)
+                when {
+                    transform != null -> buffer.append(transform(element))
+                    element is CharSequence? -> buffer.append(element)
+                    element is Char -> buffer.append(element)
+                    else -> buffer.append(element.toString())
+                }
+            } else {
+                break
+            }
+        }
+        buffer.append(postfix)
+        return buffer.toString()
+    }
+
+    fun sendFilterOnlyIfDisconnected(subscriptionId: String) {
+        checkNotInMainThread()
+
+        if (socket == null) {
+            // waits 60 seconds to reconnect after disconnected.
+            if (TimeUtils.now() > closingTimeInSeconds + RECONNECTING_IN_SECONDS) {
+                // println("sendfilter Only if Disconnected ${url} ")
+                connect()
+            }
+        }
+    }
+
+    fun renewFilters() {
+        // Force update all filters after AUTH.
+        Client.allSubscriptions().forEach { sendFilter(requestId = it) }
+    }
+
+    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()
+        } else {
+            if (write) {
+                val event = """["EVENT",${signedEvent.toJson()}]"""
+                if (isConnected()) {
+                    if (isReady) {
+                        socket?.send(event)
+                        eventUploadCounterInBytes += event.bytesUsedInMemory()
+                    }
+                } else {
+                    // sends all filters after connection is successful.
+                    connectAndRun {
+                        checkNotInMainThread()
 
-            // Sends everything.
-            Client.allSubscriptions().forEach { sendFilter(requestId = it) }
-          }
+                        socket?.send(event)
+                        eventUploadCounterInBytes += event.bytesUsedInMemory()
+
+                        // Sends everything.
+                        Client.allSubscriptions().forEach { sendFilter(requestId = it) }
+                    }
+                }
+            }
         }
-      }
     }
-  }
 
-  fun close(subscriptionId: String) {
-    checkNotInMainThread()
+    fun close(subscriptionId: String) {
+        checkNotInMainThread()
 
-    val msg = """["CLOSE","$subscriptionId"]"""
-    // Log.d("Relay", "Close Subscription $url $msg")
-    socket?.send(msg)
-  }
+        val msg = """["CLOSE","$subscriptionId"]"""
+        // Log.d("Relay", "Close Subscription $url $msg")
+        socket?.send(msg)
+    }
 
-  fun isSameRelayConfig(other: Relay): Boolean {
-    return url == other.url &&
-      write == other.write &&
-      read == other.read &&
-      activeTypes == other.activeTypes
-  }
+    fun isSameRelayConfig(other: Relay): Boolean {
+        return url == other.url &&
+            write == other.write &&
+            read == other.read &&
+            activeTypes == other.activeTypes
+    }
 
-  enum class StateType {
-    // Websocket connected
-    CONNECT,
+    enum class StateType {
+        // Websocket connected
+        CONNECT,
 
-    // Websocket disconnecting
-    DISCONNECTING,
+        // Websocket disconnecting
+        DISCONNECTING,
 
-    // Websocket disconnected
-    DISCONNECT,
+        // Websocket disconnected
+        DISCONNECT,
 
-    // End Of Stored Events
-    EOSE,
-  }
+        // End Of Stored Events
+        EOSE,
+    }
 
-  interface Listener {
-    /** A new message was received */
-    fun onEvent(
-      relay: Relay,
-      subscriptionId: String,
-      event: Event,
-      afterEOSE: Boolean,
-    )
+    interface Listener {
+        /** A new message was received */
+        fun onEvent(
+            relay: Relay,
+            subscriptionId: String,
+            event: Event,
+            afterEOSE: Boolean,
+        )
 
-    fun onError(
-      relay: Relay,
-      subscriptionId: String,
-      error: Error,
-    )
+        fun onError(
+            relay: Relay,
+            subscriptionId: String,
+            error: Error,
+        )
 
-    fun onSendResponse(
-      relay: Relay,
-      eventId: String,
-      success: Boolean,
-      message: String,
-    )
+        fun onSendResponse(
+            relay: Relay,
+            eventId: String,
+            success: Boolean,
+            message: String,
+        )
 
-    fun onAuth(
-      relay: Relay,
-      challenge: String,
-    )
+        fun onAuth(
+            relay: Relay,
+            challenge: String,
+        )
 
-    /**
-     * Connected to or disconnected from a relay
-     *
-     * @param type is 0 for disconnect and 1 for connect
-     */
-    fun onRelayStateChange(
-      relay: Relay,
-      type: StateType,
-      channel: String?,
-    )
+        /**
+         * Connected to or disconnected from a relay
+         *
+         * @param type is 0 for disconnect and 1 for connect
+         */
+        fun onRelayStateChange(
+            relay: Relay,
+            type: StateType,
+            channel: String?,
+        )
 
-    /** Relay sent an invoice */
-    fun onNotify(
-      relay: Relay,
-      description: String,
-    )
-  }
+        /** Relay sent an invoice */
+        fun onNotify(
+            relay: Relay,
+            description: String,
+        )
+    }
 }

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

@@ -33,200 +33,200 @@ import kotlinx.coroutines.flow.asSharedFlow
  * RelayPool manages the connection to multiple Relays and lets consumers deal with simple events.
  */
 object RelayPool : Relay.Listener {
-  private var relays = listOf<Relay>()
-  private var listeners = setOf<Listener>()
+    private var relays = listOf<Relay>()
+    private var listeners = setOf<Listener>()
 
-  // Backing property to avoid flow emissions from other classes
-  private var lastStatus = RelayPoolStatus(0, 0)
-  private val _statusFlow =
-    MutableSharedFlow<RelayPoolStatus>(1, 1, onBufferOverflow = BufferOverflow.DROP_OLDEST)
-  val statusFlow: SharedFlow<RelayPoolStatus> = _statusFlow.asSharedFlow()
+    // Backing property to avoid flow emissions from other classes
+    private var lastStatus = RelayPoolStatus(0, 0)
+    private val _statusFlow =
+        MutableSharedFlow<RelayPoolStatus>(1, 1, onBufferOverflow = BufferOverflow.DROP_OLDEST)
+    val statusFlow: SharedFlow<RelayPoolStatus> = _statusFlow.asSharedFlow()
 
-  fun availableRelays(): Int {
-    return relays.size
-  }
-
-  fun connectedRelays(): Int {
-    return relays.count { it.isConnected() }
-  }
-
-  fun getRelay(url: String): Relay? {
-    return relays.firstOrNull { it.url == url }
-  }
-
-  fun getRelays(url: String): List<Relay> {
-    return relays.filter { it.url == url }
-  }
-
-  fun loadRelays(relayList: List<Relay>) {
-    if (!relayList.isNullOrEmpty()) {
-      relayList.forEach { addRelay(it) }
-    } else {
-      Constants.convertDefaultRelays().forEach { addRelay(it) }
+    fun availableRelays(): Int {
+        return relays.size
     }
-  }
 
-  fun unloadRelays() {
-    relays.forEach { it.unregister(this) }
-    relays = listOf()
-  }
-
-  fun requestAndWatch() {
-    checkNotInMainThread()
-
-    relays.forEach { it.connect() }
-  }
-
-  fun sendFilter(subscriptionId: String) {
-    relays.forEach { it.sendFilter(subscriptionId) }
-  }
-
-  fun sendFilterOnlyIfDisconnected(subscriptionId: String) {
-    relays.forEach { it.sendFilterOnlyIfDisconnected(subscriptionId) }
-  }
-
-  fun sendToSelectedRelays(
-    list: List<Relay>,
-    signedEvent: EventInterface,
-  ) {
-    list.forEach { relay -> relays.filter { it.url == relay.url }.forEach { it.send(signedEvent) } }
-  }
-
-  fun send(signedEvent: EventInterface) {
-    relays.forEach { it.send(signedEvent) }
-  }
-
-  fun close(subscriptionId: String) {
-    relays.forEach { it.close(subscriptionId) }
-  }
-
-  fun disconnect() {
-    relays.forEach { it.disconnect() }
-  }
-
-  fun addRelay(relay: Relay) {
-    relay.register(this)
-    relays += relay
-    updateStatus()
-  }
-
-  fun removeRelay(relay: Relay) {
-    relay.unregister(this)
-    relays = relays.minus(relay)
-    updateStatus()
-  }
-
-  fun register(listener: Listener) {
-    listeners = listeners.plus(listener)
-  }
-
-  fun unregister(listener: Listener) {
-    listeners = listeners.minus(listener)
-  }
-
-  interface Listener {
-    fun onEvent(
-      event: Event,
-      subscriptionId: String,
-      relay: Relay,
-      afterEOSE: Boolean,
-    )
-
-    fun onError(
-      error: Error,
-      subscriptionId: String,
-      relay: Relay,
-    )
-
-    fun onRelayStateChange(
-      type: Relay.StateType,
-      relay: Relay,
-      channel: String?,
-    )
-
-    fun onSendResponse(
-      eventId: String,
-      success: Boolean,
-      message: String,
-      relay: Relay,
-    )
-
-    fun onAuth(
-      relay: Relay,
-      challenge: String,
-    )
-
-    fun onNotify(
-      relay: Relay,
-      description: String,
-    )
-  }
-
-  override fun onEvent(
-    relay: Relay,
-    subscriptionId: String,
-    event: Event,
-    afterEOSE: Boolean,
-  ) {
-    listeners.forEach { it.onEvent(event, subscriptionId, relay, afterEOSE) }
-  }
-
-  override fun onError(
-    relay: Relay,
-    subscriptionId: String,
-    error: Error,
-  ) {
-    listeners.forEach { it.onError(error, subscriptionId, relay) }
-    updateStatus()
-  }
-
-  override fun onRelayStateChange(
-    relay: Relay,
-    type: Relay.StateType,
-    channel: String?,
-  ) {
-    listeners.forEach { it.onRelayStateChange(type, relay, channel) }
-    if (type != Relay.StateType.EOSE) {
-      updateStatus()
+    fun connectedRelays(): Int {
+        return relays.count { it.isConnected() }
     }
-  }
 
-  override fun onSendResponse(
-    relay: Relay,
-    eventId: String,
-    success: Boolean,
-    message: String,
-  ) {
-    listeners.forEach { it.onSendResponse(eventId, success, message, relay) }
-  }
-
-  override fun onAuth(
-    relay: Relay,
-    challenge: String,
-  ) {
-    listeners.forEach { it.onAuth(relay, challenge) }
-  }
-
-  override fun onNotify(
-    relay: Relay,
-    description: String,
-  ) {
-    listeners.forEach { it.onNotify(relay, description) }
-  }
-
-  private fun updateStatus() {
-    val connected = connectedRelays()
-    val available = availableRelays()
-    if (lastStatus.connected != connected || lastStatus.available != available) {
-      lastStatus = RelayPoolStatus(connected, available)
-      _statusFlow.tryEmit(lastStatus)
+    fun getRelay(url: String): Relay? {
+        return relays.firstOrNull { it.url == url }
+    }
+
+    fun getRelays(url: String): List<Relay> {
+        return relays.filter { it.url == url }
+    }
+
+    fun loadRelays(relayList: List<Relay>) {
+        if (!relayList.isNullOrEmpty()) {
+            relayList.forEach { addRelay(it) }
+        } else {
+            Constants.convertDefaultRelays().forEach { addRelay(it) }
+        }
+    }
+
+    fun unloadRelays() {
+        relays.forEach { it.unregister(this) }
+        relays = listOf()
+    }
+
+    fun requestAndWatch() {
+        checkNotInMainThread()
+
+        relays.forEach { it.connect() }
+    }
+
+    fun sendFilter(subscriptionId: String) {
+        relays.forEach { it.sendFilter(subscriptionId) }
+    }
+
+    fun sendFilterOnlyIfDisconnected(subscriptionId: String) {
+        relays.forEach { it.sendFilterOnlyIfDisconnected(subscriptionId) }
+    }
+
+    fun sendToSelectedRelays(
+        list: List<Relay>,
+        signedEvent: EventInterface,
+    ) {
+        list.forEach { relay -> relays.filter { it.url == relay.url }.forEach { it.send(signedEvent) } }
+    }
+
+    fun send(signedEvent: EventInterface) {
+        relays.forEach { it.send(signedEvent) }
+    }
+
+    fun close(subscriptionId: String) {
+        relays.forEach { it.close(subscriptionId) }
+    }
+
+    fun disconnect() {
+        relays.forEach { it.disconnect() }
+    }
+
+    fun addRelay(relay: Relay) {
+        relay.register(this)
+        relays += relay
+        updateStatus()
+    }
+
+    fun removeRelay(relay: Relay) {
+        relay.unregister(this)
+        relays = relays.minus(relay)
+        updateStatus()
+    }
+
+    fun register(listener: Listener) {
+        listeners = listeners.plus(listener)
+    }
+
+    fun unregister(listener: Listener) {
+        listeners = listeners.minus(listener)
+    }
+
+    interface Listener {
+        fun onEvent(
+            event: Event,
+            subscriptionId: String,
+            relay: Relay,
+            afterEOSE: Boolean,
+        )
+
+        fun onError(
+            error: Error,
+            subscriptionId: String,
+            relay: Relay,
+        )
+
+        fun onRelayStateChange(
+            type: Relay.StateType,
+            relay: Relay,
+            channel: String?,
+        )
+
+        fun onSendResponse(
+            eventId: String,
+            success: Boolean,
+            message: String,
+            relay: Relay,
+        )
+
+        fun onAuth(
+            relay: Relay,
+            challenge: String,
+        )
+
+        fun onNotify(
+            relay: Relay,
+            description: String,
+        )
+    }
+
+    override fun onEvent(
+        relay: Relay,
+        subscriptionId: String,
+        event: Event,
+        afterEOSE: Boolean,
+    ) {
+        listeners.forEach { it.onEvent(event, subscriptionId, relay, afterEOSE) }
+    }
+
+    override fun onError(
+        relay: Relay,
+        subscriptionId: String,
+        error: Error,
+    ) {
+        listeners.forEach { it.onError(error, subscriptionId, relay) }
+        updateStatus()
+    }
+
+    override fun onRelayStateChange(
+        relay: Relay,
+        type: Relay.StateType,
+        channel: String?,
+    ) {
+        listeners.forEach { it.onRelayStateChange(type, relay, channel) }
+        if (type != Relay.StateType.EOSE) {
+            updateStatus()
+        }
+    }
+
+    override fun onSendResponse(
+        relay: Relay,
+        eventId: String,
+        success: Boolean,
+        message: String,
+    ) {
+        listeners.forEach { it.onSendResponse(eventId, success, message, relay) }
+    }
+
+    override fun onAuth(
+        relay: Relay,
+        challenge: String,
+    ) {
+        listeners.forEach { it.onAuth(relay, challenge) }
+    }
+
+    override fun onNotify(
+        relay: Relay,
+        description: String,
+    ) {
+        listeners.forEach { it.onNotify(relay, description) }
+    }
+
+    private fun updateStatus() {
+        val connected = connectedRelays()
+        val available = availableRelays()
+        if (lastStatus.connected != connected || lastStatus.available != available) {
+            lastStatus = RelayPoolStatus(connected, available)
+            _statusFlow.tryEmit(lastStatus)
+        }
     }
-  }
 }
 
 @Immutable
 data class RelayPoolStatus(
-  val connected: Int,
-  val available: Int,
-  val isConnected: Boolean = connected > 0,
+    val connected: Int,
+    val available: Int,
+    val isConnected: Boolean = connected > 0,
 )

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

@@ -25,35 +25,35 @@ import com.vitorpamplona.quartz.events.Event
 import java.util.UUID
 
 data class Subscription(
-  val id: String = UUID.randomUUID().toString().substring(0, 4),
-  val onEOSE: ((Long, String) -> Unit)? = null,
+    val id: String = UUID.randomUUID().toString().substring(0, 4),
+    val onEOSE: ((Long, String) -> Unit)? = null,
 ) {
-  var typedFilters: List<TypedFilter>? = null // Inactive when null
+    var typedFilters: List<TypedFilter>? = null // Inactive when null
 
-  fun updateEOSE(
-    time: Long,
-    relay: String,
-  ) {
-    onEOSE?.let { it(time, relay) }
-  }
-
-  fun toJson(): String {
-    return Event.mapper.writeValueAsString(toJsonObject())
-  }
-
-  fun toJsonObject(): JsonNode {
-    val factory = Event.mapper.nodeFactory
-
-    return factory.objectNode().apply {
-      put("id", id)
-      typedFilters?.also { filters ->
-        put(
-          "typedFilters",
-          factory.arrayNode(filters.size).apply {
-            filters.forEach { filter -> add(filter.toJsonObject()) }
-          },
-        )
-      }
+    fun updateEOSE(
+        time: Long,
+        relay: String,
+    ) {
+        onEOSE?.let { it(time, relay) }
+    }
+
+    fun toJson(): String {
+        return Event.mapper.writeValueAsString(toJsonObject())
+    }
+
+    fun toJsonObject(): JsonNode {
+        val factory = Event.mapper.nodeFactory
+
+        return factory.objectNode().apply {
+            put("id", id)
+            typedFilters?.also { filters ->
+                put(
+                    "typedFilters",
+                    factory.arrayNode(filters.size).apply {
+                        filters.forEach { filter -> add(filter.toJsonObject()) }
+                    },
+                )
+            }
+        }
     }
-  }
 }

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

@@ -25,56 +25,56 @@ import com.fasterxml.jackson.databind.node.ArrayNode
 import com.vitorpamplona.quartz.events.Event
 
 class TypedFilter(
-  val types: Set<FeedType>,
-  val filter: JsonFilter,
+    val types: Set<FeedType>,
+    val filter: JsonFilter,
 ) {
-  fun toJson(): String {
-    return Event.mapper.writeValueAsString(toJsonObject())
-  }
-
-  fun toJsonObject(): JsonNode {
-    val factory = Event.mapper.nodeFactory
-
-    return factory.objectNode().apply {
-      put("types", typesToJson(types))
-      put("filter", filterToJson(filter))
+    fun toJson(): String {
+        return Event.mapper.writeValueAsString(toJsonObject())
     }
-  }
 
-  fun typesToJson(types: Set<FeedType>): ArrayNode {
-    val factory = Event.mapper.nodeFactory
-    return factory.arrayNode(types.size).apply { types.forEach { add(it.name.lowercase()) } }
-  }
+    fun toJsonObject(): JsonNode {
+        val factory = Event.mapper.nodeFactory
 
-  fun filterToJson(filter: JsonFilter): JsonNode {
-    val factory = Event.mapper.nodeFactory
-    return factory.objectNode().apply {
-      filter.ids?.run {
-        put(
-          "ids",
-          factory.arrayNode(filter.ids.size).apply { filter.ids.forEach { add(it) } },
-        )
-      }
-      filter.authors?.run {
-        put(
-          "authors",
-          factory.arrayNode(filter.authors.size).apply { filter.authors.forEach { add(it) } },
-        )
-      }
-      filter.kinds?.run {
-        put(
-          "kinds",
-          factory.arrayNode(filter.kinds.size).apply { filter.kinds.forEach { add(it) } },
-        )
-      }
-      filter.tags?.run {
-        entries.forEach { kv ->
-          put(
-            "#${kv.key}",
-            factory.arrayNode(kv.value.size).apply { kv.value.forEach { add(it) } },
-          )
+        return factory.objectNode().apply {
+            put("types", typesToJson(types))
+            put("filter", filterToJson(filter))
         }
-      }
+    }
+
+    fun typesToJson(types: Set<FeedType>): ArrayNode {
+        val factory = Event.mapper.nodeFactory
+        return factory.arrayNode(types.size).apply { types.forEach { add(it.name.lowercase()) } }
+    }
+
+    fun filterToJson(filter: JsonFilter): JsonNode {
+        val factory = Event.mapper.nodeFactory
+        return factory.objectNode().apply {
+            filter.ids?.run {
+                put(
+                    "ids",
+                    factory.arrayNode(filter.ids.size).apply { filter.ids.forEach { add(it) } },
+                )
+            }
+            filter.authors?.run {
+                put(
+                    "authors",
+                    factory.arrayNode(filter.authors.size).apply { filter.authors.forEach { add(it) } },
+                )
+            }
+            filter.kinds?.run {
+                put(
+                    "kinds",
+                    factory.arrayNode(filter.kinds.size).apply { filter.kinds.forEach { add(it) } },
+                )
+            }
+            filter.tags?.run {
+                entries.forEach { kv ->
+                    put(
+                        "#${kv.key}",
+                        factory.arrayNode(kv.value.size).apply { kv.value.forEach { add(it) } },
+                    )
+                }
+            }
       /*
       Does not include since in the json comparison
       filter.since?.run {
@@ -84,9 +84,9 @@ class TypedFilter(
           }
           jsonObject.add("since", jsonObjectSince)
       }*/
-      filter.until?.run { put("until", filter.until) }
-      filter.limit?.run { put("limit", filter.limit) }
-      filter.search?.run { put("search", filter.search) }
+            filter.until?.run { put("until", filter.until) }
+            filter.limit?.run { put("limit", filter.limit) }
+            filter.search?.run { put("search", filter.search) }
+        }
     }
-  }
 }

app/src/main/java/com/vitorpamplona/amethyst/service/tts/TextToSpeechEngine.kt

@@ -28,160 +28,159 @@ import java.util.Locale
 const val DEF_SPEECH_AND_PITCH = 0.8f
 
 fun getErrorText(errorCode: Int): String =
-  when (errorCode) {
-    TextToSpeech.ERROR -> "ERROR"
-    TextToSpeech.ERROR_INVALID_REQUEST -> "ERROR_INVALID_REQUEST"
-    TextToSpeech.ERROR_NETWORK -> "ERROR_NETWORK"
-    TextToSpeech.ERROR_NETWORK_TIMEOUT -> "ERROR_NETWORK_TIMEOUT"
-    TextToSpeech.ERROR_SERVICE -> "ERROR_SERVICE"
-    TextToSpeech.ERROR_SYNTHESIS -> "ERROR_SYNTHESIS"
-    TextToSpeech.ERROR_NOT_INSTALLED_YET -> "ERROR_NOT_INSTALLED_YET"
-    else -> "UNKNOWN"
-  }
+    when (errorCode) {
+        TextToSpeech.ERROR -> "ERROR"
+        TextToSpeech.ERROR_INVALID_REQUEST -> "ERROR_INVALID_REQUEST"
+        TextToSpeech.ERROR_NETWORK -> "ERROR_NETWORK"
+        TextToSpeech.ERROR_NETWORK_TIMEOUT -> "ERROR_NETWORK_TIMEOUT"
+        TextToSpeech.ERROR_SERVICE -> "ERROR_SERVICE"
+        TextToSpeech.ERROR_SYNTHESIS -> "ERROR_SYNTHESIS"
+        TextToSpeech.ERROR_NOT_INSTALLED_YET -> "ERROR_NOT_INSTALLED_YET"
+        else -> "UNKNOWN"
+    }
 
 class TextToSpeechEngine private constructor() {
-  private var tts: TextToSpeech? = null
+    private var tts: TextToSpeech? = null
 
-  private var defaultPitch = 0.8f
-  private var defaultSpeed = 0.8f
-  private var defLanguage = Locale.getDefault()
-  private var onStartListener: (() -> Unit)? = null
-  private var onDoneListener: (() -> Unit)? = null
-  private var onErrorListener: ((String) -> Unit)? = null
-  private var onHighlightListener: ((Int, Int) -> Unit)? = null
-  private var message: String? = null
+    private var defaultPitch = 0.8f
+    private var defaultSpeed = 0.8f
+    private var defLanguage = Locale.getDefault()
+    private var onStartListener: (() -> Unit)? = null
+    private var onDoneListener: (() -> Unit)? = null
+    private var onErrorListener: ((String) -> Unit)? = null
+    private var onHighlightListener: ((Int, Int) -> Unit)? = null
+    private var message: String? = null
 
-  companion object {
-    private var instance: TextToSpeechEngine? = null
+    companion object {
+        private var instance: TextToSpeechEngine? = null
 
-    fun getInstance(): TextToSpeechEngine {
-      if (instance == null) {
-        instance = TextToSpeechEngine()
-      }
-      return instance!!
-    }
-  }
-
-  fun initTTS(
-    context: Context,
-    message: String,
-  ) {
-    tts =
-      TextToSpeech(context) {
-        if (it == TextToSpeech.SUCCESS) {
-          tts?.let {
-            it.language = defLanguage
-            it.setPitch(defaultPitch)
-            it.setSpeechRate(defaultSpeed)
-            it.setListener(
-              onStart = { onStartListener?.invoke() },
-              onError = { e -> e?.let { error -> onErrorListener?.invoke(error) } },
-              onRange = { start, end ->
-                if (this@TextToSpeechEngine.message != null) {
-                  onHighlightListener?.invoke(start, end)
-                }
-              },
-              onDone = { onStartListener?.invoke() },
-            )
-            speak(message)
-          }
-        } else {
-          onErrorListener?.invoke(getErrorText(it))
+        fun getInstance(): TextToSpeechEngine {
+            if (instance == null) {
+                instance = TextToSpeechEngine()
+            }
+            return instance!!
         }
-      }
-  }
+    }
 
-  private fun speak(message: String): TextToSpeechEngine {
-    tts?.speak(
-      message,
-      TextToSpeech.QUEUE_FLUSH,
-      null,
-      TextToSpeech.ACTION_TTS_QUEUE_PROCESSING_COMPLETED,
-    )
-    return this
-  }
+    fun initTTS(
+        context: Context,
+        message: String,
+    ) {
+        tts =
+            TextToSpeech(context) {
+                if (it == TextToSpeech.SUCCESS) {
+                    tts?.let {
+                        it.language = defLanguage
+                        it.setPitch(defaultPitch)
+                        it.setSpeechRate(defaultSpeed)
+                        it.setListener(
+                            onStart = { onStartListener?.invoke() },
+                            onError = { e -> e?.let { error -> onErrorListener?.invoke(error) } },
+                            onRange = { start, end ->
+                                if (this@TextToSpeechEngine.message != null) {
+                                    onHighlightListener?.invoke(start, end)
+                                }
+                            },
+                            onDone = { onStartListener?.invoke() },
+                        )
+                        speak(message)
+                    }
+                } else {
+                    onErrorListener?.invoke(getErrorText(it))
+                }
+            }
+    }
 
-  fun setPitchAndSpeed(
-    pitch: Float,
-    speed: Float,
-  ) {
-    defaultPitch = pitch
-    defaultSpeed = speed
-  }
+    private fun speak(message: String): TextToSpeechEngine {
+        tts?.speak(
+            message,
+            TextToSpeech.QUEUE_FLUSH,
+            null,
+            TextToSpeech.ACTION_TTS_QUEUE_PROCESSING_COMPLETED,
+        )
+        return this
+    }
 
-  fun resetPitchAndSpeed() {
-    defaultPitch = DEF_SPEECH_AND_PITCH
-    defaultSpeed = DEF_SPEECH_AND_PITCH
-  }
+    fun setPitchAndSpeed(
+        pitch: Float,
+        speed: Float,
+    ) {
+        defaultPitch = pitch
+        defaultSpeed = speed
+    }
 
-  fun setLanguage(local: Locale): TextToSpeechEngine {
-    this.defLanguage = local
-    return this
-  }
+    fun resetPitchAndSpeed() {
+        defaultPitch = DEF_SPEECH_AND_PITCH
+        defaultSpeed = DEF_SPEECH_AND_PITCH
+    }
 
-  fun setHighlightedMessage(message: String) {
-    this.message = message
-  }
+    fun setLanguage(local: Locale): TextToSpeechEngine {
+        this.defLanguage = local
+        return this
+    }
 
-  fun setOnStartListener(onStartListener: (() -> Unit)): TextToSpeechEngine {
-    this.onStartListener = onStartListener
-    return this
-  }
+    fun setHighlightedMessage(message: String) {
+        this.message = message
+    }
 
-  fun setOnCompletionListener(onDoneListener: () -> Unit): TextToSpeechEngine {
-    this.onDoneListener = onDoneListener
-    return this
-  }
+    fun setOnStartListener(onStartListener: (() -> Unit)): TextToSpeechEngine {
+        this.onStartListener = onStartListener
+        return this
+    }
 
-  fun setOnErrorListener(onErrorListener: (String) -> Unit): TextToSpeechEngine {
-    this.onErrorListener = onErrorListener
-    return this
-  }
+    fun setOnCompletionListener(onDoneListener: () -> Unit): TextToSpeechEngine {
+        this.onDoneListener = onDoneListener
+        return this
+    }
 
-  fun setOnHighlightListener(onHighlightListener: (Int, Int) -> Unit): TextToSpeechEngine {
-    this.onHighlightListener = onHighlightListener
-    return this
-  }
+    fun setOnErrorListener(onErrorListener: (String) -> Unit): TextToSpeechEngine {
+        this.onErrorListener = onErrorListener
+        return this
+    }
 
-  fun destroy() {
-    tts?.stop()
-    tts?.shutdown()
-    tts = null
-    instance = null
-  }
+    fun setOnHighlightListener(onHighlightListener: (Int, Int) -> Unit): TextToSpeechEngine {
+        this.onHighlightListener = onHighlightListener
+        return this
+    }
+
+    fun destroy() {
+        tts?.stop()
+        tts?.shutdown()
+        tts = null
+        instance = null
+    }
 }
 
 inline fun TextToSpeech.setListener(
-  crossinline onStart: (String?) -> Unit = {},
-  crossinline onError: (String?) -> Unit = {},
-  crossinline onRange: (Int, Int) -> Unit = { _, _ -> },
-  crossinline onDone: (String?) -> Unit,
-) =
-  this.apply {
+    crossinline onStart: (String?) -> Unit = {},
+    crossinline onError: (String?) -> Unit = {},
+    crossinline onRange: (Int, Int) -> Unit = { _, _ -> },
+    crossinline onDone: (String?) -> Unit,
+) = this.apply {
     setOnUtteranceProgressListener(
-      object : UtteranceProgressListener() {
-        override fun onStart(p0: String?) {
-          onStart.invoke(p0)
-        }
+        object : UtteranceProgressListener() {
+            override fun onStart(p0: String?) {
+                onStart.invoke(p0)
+            }
 
-        override fun onDone(p0: String?) {
-          onDone.invoke(p0)
-        }
+            override fun onDone(p0: String?) {
+                onDone.invoke(p0)
+            }
 
-        @Deprecated("Deprecated in Java", ReplaceWith("onError.invoke(p0)"))
-        override fun onError(p0: String?) {
-          onError.invoke(p0)
-        }
+            @Deprecated("Deprecated in Java", ReplaceWith("onError.invoke(p0)"))
+            override fun onError(p0: String?) {
+                onError.invoke(p0)
+            }
 
-        override fun onRangeStart(
-          utteranceId: String?,
-          start: Int,
-          end: Int,
-          frame: Int,
-        ) {
-          super.onRangeStart(utteranceId, start, end, frame)
-          onRange.invoke(start, end)
-        }
-      },
+            override fun onRangeStart(
+                utteranceId: String?,
+                start: Int,
+                end: Int,
+                frame: Int,
+            ) {
+                super.onRangeStart(utteranceId, start, end, frame)
+                onRange.invoke(start, end)
+            }
+        },
     )
-  }
+}

app/src/main/java/com/vitorpamplona/amethyst/service/tts/TextToSpeechHelper.kt

@@ -29,149 +29,149 @@ import java.lang.ref.WeakReference
 import java.util.Locale
 
 class TextToSpeechHelper private constructor(private val context: WeakReference<Context>) :
-  LifecycleEventObserver {
-  private val appContext
-    get() = context.get()!!.applicationContext
+    LifecycleEventObserver {
+        private val appContext
+            get() = context.get()!!.applicationContext
 
-  private var message: String? = null
+        private var message: String? = null
 
-  private var ttsEngine: TextToSpeechEngine? = null
+        private var ttsEngine: TextToSpeechEngine? = null
 
-  private var onStart: (() -> Unit)? = null
+        private var onStart: (() -> Unit)? = null
 
-  private var onDoneListener: (() -> Unit)? = null
+        private var onDoneListener: (() -> Unit)? = null
 
-  private var onErrorListener: ((String) -> Unit)? = null
+        private var onErrorListener: ((String) -> Unit)? = null
 
-  private var onHighlightListener: ((Pair<Int, Int>) -> Unit)? = null
+        private var onHighlightListener: ((Pair<Int, Int>) -> Unit)? = null
 
-  private var customActionForDestroy: (() -> Unit)? = null
+        private var customActionForDestroy: (() -> Unit)? = null
 
-  init {
-    Log.d("Init", "Init TTS")
-    initTTS()
-  }
-
-  fun registerLifecycle(owner: LifecycleOwner): TextToSpeechHelper {
-    owner.lifecycle.addObserver(this)
-    return this
-  }
-
-  private fun initTTS() =
-    context.get()?.run {
-      ttsEngine =
-        TextToSpeechEngine.getInstance()
-          .setOnCompletionListener { onDoneListener?.invoke() }
-          .setOnErrorListener { onErrorListener?.invoke(it) }
-          .setOnStartListener { onStart?.invoke() }
-    }
-
-  fun speak(message: String): TextToSpeechHelper {
-    if (ttsEngine == null) {
-      initTTS()
-    }
-    this.message = message
-
-    ttsEngine?.initTTS(
-      appContext,
-      message,
-    )
-    return this
-  }
-
-  /**
-   * This method will highlight the text in the textView
-   *
-   * @exception Exception("Message can't be null for highlighting !! Call speak() first")
-   */
-  fun highlight(): TextToSpeechHelper {
-    if (message == null) {
-      throw Exception("Message can't be null for highlighting !! Call speak() first")
-    }
-    ttsEngine?.setHighlightedMessage(message!!)
-    ttsEngine?.setOnHighlightListener { i, i2 -> onHighlightListener?.invoke(Pair(i, i2)) }
-    return this
-  }
-
-  fun removeHighlight(): TextToSpeechHelper {
-    message = null
-    onHighlightListener = null
-    return this
-  }
-
-  fun destroy(action: (() -> Unit) = {}) {
-    ttsEngine?.destroy()
-    ttsEngine = null
-    action.invoke()
-    instance = null
-  }
-
-  fun onStart(onStartListener: () -> Unit): TextToSpeechHelper {
-    this.onStart = onStartListener
-    return this
-  }
-
-  fun onDone(onCompleteListener: () -> Unit): TextToSpeechHelper {
-    this.onDoneListener = onCompleteListener
-    return this
-  }
-
-  fun onError(onErrorListener: (String) -> Unit): TextToSpeechHelper {
-    this.onErrorListener = onErrorListener
-    return this
-  }
-
-  fun onHighlight(onHighlightListener: (Pair<Int, Int>) -> Unit): TextToSpeechHelper {
-    this.onHighlightListener = onHighlightListener
-    return this
-  }
-
-  fun setCustomActionForDestroy(action: () -> Unit): TextToSpeechHelper {
-    customActionForDestroy = action
-    return this
-  }
-
-  fun setLanguage(locale: Locale): TextToSpeechHelper {
-    ttsEngine?.setLanguage(locale)
-    return this
-  }
-
-  fun setPitchAndSpeed(
-    pitch: Float = DEF_SPEECH_AND_PITCH,
-    speed: Float = DEF_SPEECH_AND_PITCH,
-  ): TextToSpeechHelper {
-    ttsEngine?.setPitchAndSpeed(pitch, speed)
-    return this
-  }
-
-  fun resetPitchAndSpeed(): TextToSpeechHelper {
-    ttsEngine?.resetPitchAndSpeed()
-    return this
-  }
-
-  companion object {
-    private var instance: TextToSpeechHelper? = null
-
-    fun getInstance(context: Context): TextToSpeechHelper {
-      synchronized(TextToSpeechHelper::class.java) {
-        if (instance == null) {
-          instance = TextToSpeechHelper(WeakReference(context))
+        init {
+            Log.d("Init", "Init TTS")
+            initTTS()
         }
-        return instance!!
-      }
-    }
-  }
 
-  override fun onStateChanged(
-    source: LifecycleOwner,
-    event: Lifecycle.Event,
-  ) {
-    if (
-      event == Lifecycle.Event.ON_DESTROY ||
-        event == Lifecycle.Event.ON_STOP ||
-        event == Lifecycle.Event.ON_PAUSE
-    ) {
-      destroy { customActionForDestroy?.invoke() }
+        fun registerLifecycle(owner: LifecycleOwner): TextToSpeechHelper {
+            owner.lifecycle.addObserver(this)
+            return this
+        }
+
+        private fun initTTS() =
+            context.get()?.run {
+                ttsEngine =
+                    TextToSpeechEngine.getInstance()
+                        .setOnCompletionListener { onDoneListener?.invoke() }
+                        .setOnErrorListener { onErrorListener?.invoke(it) }
+                        .setOnStartListener { onStart?.invoke() }
+            }
+
+        fun speak(message: String): TextToSpeechHelper {
+            if (ttsEngine == null) {
+                initTTS()
+            }
+            this.message = message
+
+            ttsEngine?.initTTS(
+                appContext,
+                message,
+            )
+            return this
+        }
+
+        /**
+         * This method will highlight the text in the textView
+         *
+         * @exception Exception("Message can't be null for highlighting !! Call speak() first")
+         */
+        fun highlight(): TextToSpeechHelper {
+            if (message == null) {
+                throw Exception("Message can't be null for highlighting !! Call speak() first")
+            }
+            ttsEngine?.setHighlightedMessage(message!!)
+            ttsEngine?.setOnHighlightListener { i, i2 -> onHighlightListener?.invoke(Pair(i, i2)) }
+            return this
+        }
+
+        fun removeHighlight(): TextToSpeechHelper {
+            message = null
+            onHighlightListener = null
+            return this
+        }
+
+        fun destroy(action: (() -> Unit) = {}) {
+            ttsEngine?.destroy()
+            ttsEngine = null
+            action.invoke()
+            instance = null
+        }
+
+        fun onStart(onStartListener: () -> Unit): TextToSpeechHelper {
+            this.onStart = onStartListener
+            return this
+        }
+
+        fun onDone(onCompleteListener: () -> Unit): TextToSpeechHelper {
+            this.onDoneListener = onCompleteListener
+            return this
+        }
+
+        fun onError(onErrorListener: (String) -> Unit): TextToSpeechHelper {
+            this.onErrorListener = onErrorListener
+            return this
+        }
+
+        fun onHighlight(onHighlightListener: (Pair<Int, Int>) -> Unit): TextToSpeechHelper {
+            this.onHighlightListener = onHighlightListener
+            return this
+        }
+
+        fun setCustomActionForDestroy(action: () -> Unit): TextToSpeechHelper {
+            customActionForDestroy = action
+            return this
+        }
+
+        fun setLanguage(locale: Locale): TextToSpeechHelper {
+            ttsEngine?.setLanguage(locale)
+            return this
+        }
+
+        fun setPitchAndSpeed(
+            pitch: Float = DEF_SPEECH_AND_PITCH,
+            speed: Float = DEF_SPEECH_AND_PITCH,
+        ): TextToSpeechHelper {
+            ttsEngine?.setPitchAndSpeed(pitch, speed)
+            return this
+        }
+
+        fun resetPitchAndSpeed(): TextToSpeechHelper {
+            ttsEngine?.resetPitchAndSpeed()
+            return this
+        }
+
+        companion object {
+            private var instance: TextToSpeechHelper? = null
+
+            fun getInstance(context: Context): TextToSpeechHelper {
+                synchronized(TextToSpeechHelper::class.java) {
+                    if (instance == null) {
+                        instance = TextToSpeechHelper(WeakReference(context))
+                    }
+                    return instance!!
+                }
+            }
+        }
+
+        override fun onStateChanged(
+            source: LifecycleOwner,
+            event: Lifecycle.Event,
+        ) {
+            if (
+                event == Lifecycle.Event.ON_DESTROY ||
+                event == Lifecycle.Event.ON_STOP ||
+                event == Lifecycle.Event.ON_PAUSE
+            ) {
+                destroy { customActionForDestroy?.invoke() }
+            }
+        }
     }
-  }
-}

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

@@ -64,284 +64,284 @@ import com.vitorpamplona.quartz.events.ChannelMetadataEvent
 import com.vitorpamplona.quartz.events.CommunityDefinitionEvent
 import com.vitorpamplona.quartz.events.LiveActivitiesEvent
 import com.vitorpamplona.quartz.events.PrivateDmEvent
-import java.net.URLEncoder
-import java.nio.charset.StandardCharsets
-import java.util.Timer
-import kotlin.concurrent.schedule
 import kotlinx.coroutines.DelicateCoroutinesApi
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
+import java.net.URLEncoder
+import java.nio.charset.StandardCharsets
+import java.util.Timer
+import kotlin.concurrent.schedule
 
 class MainActivity : AppCompatActivity() {
-  private val isOnMobileDataState = mutableStateOf(false)
-  private val isOnWifiDataState = mutableStateOf(false)
+    private 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
+    // 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)
+    @OptIn(ExperimentalMaterial3WindowSizeClassApi::class)
+    @RequiresApi(Build.VERSION_CODES.R)
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
 
-    Log.d("Lifetime Event", "MainActivity.onCreate")
+        Log.d("Lifetime Event", "MainActivity.onCreate")
 
-    setContent {
-      val sharedPreferencesViewModel: SharedPreferencesViewModel = viewModel()
+        setContent {
+            val sharedPreferencesViewModel: SharedPreferencesViewModel = viewModel()
 
-      val displayFeatures = calculateDisplayFeatures(this)
-      val windowSizeClass = calculateWindowSizeClass(this)
+            val displayFeatures = calculateDisplayFeatures(this)
+            val windowSizeClass = calculateWindowSizeClass(this)
 
-      LaunchedEffect(key1 = sharedPreferencesViewModel) {
-        sharedPreferencesViewModel.init()
-        sharedPreferencesViewModel.updateDisplaySettings(windowSizeClass, displayFeatures)
-      }
+            LaunchedEffect(key1 = sharedPreferencesViewModel) {
+                sharedPreferencesViewModel.init()
+                sharedPreferencesViewModel.updateDisplaySettings(windowSizeClass, displayFeatures)
+            }
 
-      LaunchedEffect(isOnMobileDataState) {
-        sharedPreferencesViewModel.updateConnectivityStatusState(isOnMobileDataState)
-      }
+            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
+            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() }
+                    LaunchedEffect(key1 = Unit) { accountStateViewModel.tryLoginExistingAccountAsync() }
 
-          AccountScreen(accountStateViewModel, sharedPreferencesViewModel)
+                    AccountScreen(accountStateViewModel, sharedPreferencesViewModel)
+                }
+            }
         }
-      }
-    }
-  }
-
-  fun prepareToLaunchSigner() {
-    shouldPauseService = false
-  }
-
-  @OptIn(DelicateCoroutinesApi::class)
-  override fun onResume() {
-    super.onResume()
-
-    Log.d("Lifetime Event", "MainActivity.onResume")
-
-    // starts muted every time
-    DEFAULT_MUTED_SETTING.value = true
-
-    // Keep connection alive if it's calling the signer app
-    Log.d("shouldPauseService", "shouldPauseService onResume: $shouldPauseService")
-    if (shouldPauseService) {
-      GlobalScope.launch(Dispatchers.IO) { serviceManager.justStart() }
     }
 
-    GlobalScope.launch(Dispatchers.IO) {
-      PushNotificationUtils.init(LocalPreferences.allSavedAccounts())
+    fun prepareToLaunchSigner() {
+        shouldPauseService = false
     }
 
-    val connectivityManager =
-      (getSystemService(ConnectivityManager::class.java) as ConnectivityManager)
-    connectivityManager.registerDefaultNetworkCallback(networkCallback)
-    connectivityManager.getNetworkCapabilities(connectivityManager.activeNetwork)?.let {
-      updateNetworkCapabilities(it)
-    }
+    @OptIn(DelicateCoroutinesApi::class)
+    override fun onResume() {
+        super.onResume()
 
-    // resets state until next External Signer Call
-    Timer().schedule(350) { shouldPauseService = true }
-  }
+        Log.d("Lifetime Event", "MainActivity.onResume")
 
-  override fun onPause() {
-    Log.d("Lifetime Event", "MainActivity.onPause")
+        // starts muted every time
+        DEFAULT_MUTED_SETTING.value = true
 
-    LanguageTranslatorService.clear()
-    serviceManager.cleanObservers()
-
-    // if (BuildConfig.DEBUG) {
-    GlobalScope.launch(Dispatchers.IO) { debugState(this@MainActivity) }
-    // }
-
-    Log.d("shouldPauseService", "shouldPauseService onPause: $shouldPauseService")
-    if (shouldPauseService) {
-      GlobalScope.launch(Dispatchers.IO) { serviceManager.pauseForGood() }
-    }
-
-    (getSystemService(ConnectivityManager::class.java) as ConnectivityManager)
-      .unregisterNetworkCallback(networkCallback)
-
-    super.onPause()
-  }
-
-  override fun onStart() {
-    super.onStart()
-
-    Log.d("Lifetime Event", "MainActivity.onStart")
-  }
-
-  override fun onStop() {
-    super.onStop()
-
-    // Graph doesn't completely clear.
-    // GlobalScope.launch(Dispatchers.Default) {
-    //    serviceManager.trimMemory()
-    // }
-
-    Log.d("Lifetime Event", "MainActivity.onStop")
-  }
-
-  override fun onDestroy() {
-    Log.d("Lifetime Event", "MainActivity.onDestroy")
-
-    GlobalScope.launch(Dispatchers.Main) {
-      keepPlayingMutex?.stop()
-      keepPlayingMutex?.release()
-      keepPlayingMutex = null
-    }
-
-    super.onDestroy()
-  }
-
-  /**
-   * Release memory when the UI becomes hidden or when system resources become low.
-   *
-   * @param level the memory-related event that was raised.
-   */
-  @OptIn(DelicateCoroutinesApi::class)
-  override fun onTrimMemory(level: Int) {
-    super.onTrimMemory(level)
-    println("Trim Memory $level")
-    GlobalScope.launch(Dispatchers.Default) { serviceManager.trimMemory() }
-  }
-
-  fun updateNetworkCapabilities(networkCapabilities: NetworkCapabilities): Boolean {
-    val isOnMobileData = networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR)
-    val isOnWifi = networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_WIFI)
-
-    var changedNetwork = false
-
-    if (isOnMobileDataState.value != isOnMobileData) {
-      isOnMobileDataState.value = isOnMobileData
-
-      changedNetwork = true
-    }
-
-    if (isOnWifiDataState.value != isOnWifi) {
-      isOnWifiDataState.value = isOnWifi
-
-      changedNetwork = true
-    }
-
-    if (changedNetwork) {
-      if (isOnMobileData) {
-        HttpClient.changeTimeouts(HttpClient.DEFAULT_TIMEOUT_ON_MOBILE)
-      } else {
-        HttpClient.changeTimeouts(HttpClient.DEFAULT_TIMEOUT_ON_WIFI)
-      }
-    }
-
-    return changedNetwork
-  }
-
-  @OptIn(DelicateCoroutinesApi::class)
-  private val networkCallback =
-    object : ConnectivityManager.NetworkCallback() {
-      var lastNetwork: Network? = null
-
-      override fun onAvailable(network: Network) {
-        super.onAvailable(network)
-
-        Log.d("ServiceManager NetworkCallback", "onAvailable: $shouldPauseService")
-        if (shouldPauseService && lastNetwork != null && lastNetwork != network) {
-          GlobalScope.launch(Dispatchers.IO) { serviceManager.forceRestart() }
+        // Keep connection alive if it's calling the signer app
+        Log.d("shouldPauseService", "shouldPauseService onResume: $shouldPauseService")
+        if (shouldPauseService) {
+            GlobalScope.launch(Dispatchers.IO) { serviceManager.justStart() }
         }
 
-        lastNetwork = network
-      }
-
-      // Network capabilities have changed for the network
-      override fun onCapabilitiesChanged(
-        network: Network,
-        networkCapabilities: NetworkCapabilities,
-      ) {
-        super.onCapabilitiesChanged(network, networkCapabilities)
-
         GlobalScope.launch(Dispatchers.IO) {
-          Log.d(
-            "ServiceManager NetworkCallback",
-            "onCapabilitiesChanged: ${network.networkHandle} hasMobileData ${isOnMobileDataState.value} hasWifi ${isOnWifiDataState.value}",
-          )
-          if (updateNetworkCapabilities(networkCapabilities) && shouldPauseService) {
-            serviceManager.forceRestart()
-          }
+            PushNotificationUtils.init(LocalPreferences.allSavedAccounts())
         }
-      }
+
+        val connectivityManager =
+            (getSystemService(ConnectivityManager::class.java) as ConnectivityManager)
+        connectivityManager.registerDefaultNetworkCallback(networkCallback)
+        connectivityManager.getNetworkCapabilities(connectivityManager.activeNetwork)?.let {
+            updateNetworkCapabilities(it)
+        }
+
+        // resets state until next External Signer Call
+        Timer().schedule(350) { shouldPauseService = true }
     }
+
+    override fun onPause() {
+        Log.d("Lifetime Event", "MainActivity.onPause")
+
+        LanguageTranslatorService.clear()
+        serviceManager.cleanObservers()
+
+        // if (BuildConfig.DEBUG) {
+        GlobalScope.launch(Dispatchers.IO) { debugState(this@MainActivity) }
+        // }
+
+        Log.d("shouldPauseService", "shouldPauseService onPause: $shouldPauseService")
+        if (shouldPauseService) {
+            GlobalScope.launch(Dispatchers.IO) { serviceManager.pauseForGood() }
+        }
+
+        (getSystemService(ConnectivityManager::class.java) as ConnectivityManager)
+            .unregisterNetworkCallback(networkCallback)
+
+        super.onPause()
+    }
+
+    override fun onStart() {
+        super.onStart()
+
+        Log.d("Lifetime Event", "MainActivity.onStart")
+    }
+
+    override fun onStop() {
+        super.onStop()
+
+        // Graph doesn't completely clear.
+        // GlobalScope.launch(Dispatchers.Default) {
+        //    serviceManager.trimMemory()
+        // }
+
+        Log.d("Lifetime Event", "MainActivity.onStop")
+    }
+
+    override fun onDestroy() {
+        Log.d("Lifetime Event", "MainActivity.onDestroy")
+
+        GlobalScope.launch(Dispatchers.Main) {
+            keepPlayingMutex?.stop()
+            keepPlayingMutex?.release()
+            keepPlayingMutex = null
+        }
+
+        super.onDestroy()
+    }
+
+    /**
+     * Release memory when the UI becomes hidden or when system resources become low.
+     *
+     * @param level the memory-related event that was raised.
+     */
+    @OptIn(DelicateCoroutinesApi::class)
+    override fun onTrimMemory(level: Int) {
+        super.onTrimMemory(level)
+        println("Trim Memory $level")
+        GlobalScope.launch(Dispatchers.Default) { serviceManager.trimMemory() }
+    }
+
+    fun updateNetworkCapabilities(networkCapabilities: NetworkCapabilities): Boolean {
+        val isOnMobileData = networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR)
+        val isOnWifi = networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_WIFI)
+
+        var changedNetwork = false
+
+        if (isOnMobileDataState.value != isOnMobileData) {
+            isOnMobileDataState.value = isOnMobileData
+
+            changedNetwork = true
+        }
+
+        if (isOnWifiDataState.value != isOnWifi) {
+            isOnWifiDataState.value = isOnWifi
+
+            changedNetwork = true
+        }
+
+        if (changedNetwork) {
+            if (isOnMobileData) {
+                HttpClient.changeTimeouts(HttpClient.DEFAULT_TIMEOUT_ON_MOBILE)
+            } else {
+                HttpClient.changeTimeouts(HttpClient.DEFAULT_TIMEOUT_ON_WIFI)
+            }
+        }
+
+        return changedNetwork
+    }
+
+    @OptIn(DelicateCoroutinesApi::class)
+    private val networkCallback =
+        object : ConnectivityManager.NetworkCallback() {
+            var lastNetwork: Network? = null
+
+            override fun onAvailable(network: Network) {
+                super.onAvailable(network)
+
+                Log.d("ServiceManager NetworkCallback", "onAvailable: $shouldPauseService")
+                if (shouldPauseService && lastNetwork != null && lastNetwork != network) {
+                    GlobalScope.launch(Dispatchers.IO) { serviceManager.forceRestart() }
+                }
+
+                lastNetwork = network
+            }
+
+            // Network capabilities have changed for the network
+            override fun onCapabilitiesChanged(
+                network: Network,
+                networkCapabilities: NetworkCapabilities,
+            ) {
+                super.onCapabilitiesChanged(network, networkCapabilities)
+
+                GlobalScope.launch(Dispatchers.IO) {
+                    Log.d(
+                        "ServiceManager NetworkCallback",
+                        "onCapabilitiesChanged: ${network.networkHandle} hasMobileData ${isOnMobileDataState.value} hasWifi ${isOnWifiDataState.value}",
+                    )
+                    if (updateNetworkCapabilities(networkCapabilities) && shouldPauseService) {
+                        serviceManager.forceRestart()
+                    }
+                }
+            }
+        }
 }
 
 class GetMediaActivityResultContract : ActivityResultContracts.GetContent() {
-  @SuppressLint("MissingSuperCall")
-  override fun createIntent(
-    context: Context,
-    input: String,
-  ): Intent {
-    // Force only images and videos to be selectable
-    // Force OPEN Document because of the resulting URI must be passed to the
-    // Playback service and the picker's permissions only allow the activity to read the URI
-    return Intent(Intent.ACTION_OPEN_DOCUMENT).apply {
-      addCategory(Intent.CATEGORY_OPENABLE)
-      // Force only images and videos to be selectable
-      type = "*/*"
-      putExtra(Intent.EXTRA_MIME_TYPES, arrayOf("image/*", "video/*"))
+    @SuppressLint("MissingSuperCall")
+    override fun createIntent(
+        context: Context,
+        input: String,
+    ): Intent {
+        // Force only images and videos to be selectable
+        // Force OPEN Document because of the resulting URI must be passed to the
+        // Playback service and the picker's permissions only allow the activity to read the URI
+        return Intent(Intent.ACTION_OPEN_DOCUMENT).apply {
+            addCategory(Intent.CATEGORY_OPENABLE)
+            // Force only images and videos to be selectable
+            type = "*/*"
+            putExtra(Intent.EXTRA_MIME_TYPES, arrayOf("image/*", "video/*"))
+        }
     }
-  }
 }
 
 fun uriToRoute(uri: String?): String? {
-  return if (uri.equals("nostr:Notifications", true)) {
-    Route.Notification.route.replace("{scrollToTop}", "true")
-  } else {
-    if (uri?.startsWith("nostr:Hashtag?id=") == true) {
-      Route.Hashtag.route.replace("{id}", uri.removePrefix("nostr:Hashtag?id="))
+    return if (uri.equals("nostr:Notifications", true)) {
+        Route.Notification.route.replace("{scrollToTop}", "true")
     } else {
-      val nip19 = Nip19.uriToRoute(uri)
-      when (nip19?.type) {
-        Nip19.Type.USER -> "User/${nip19.hex}"
-        Nip19.Type.NOTE -> "Note/${nip19.hex}"
-        Nip19.Type.EVENT -> {
-          if (nip19.kind == PrivateDmEvent.KIND) {
-            nip19.author?.let { "RoomByAuthor/$it" }
-          } else if (
-            nip19.kind == ChannelMessageEvent.KIND ||
-              nip19.kind == ChannelCreateEvent.KIND ||
-              nip19.kind == ChannelMetadataEvent.KIND
-          ) {
-            "Channel/${nip19.hex}"
-          } else {
-            "Event/${nip19.hex}"
-          }
+        if (uri?.startsWith("nostr:Hashtag?id=") == true) {
+            Route.Hashtag.route.replace("{id}", uri.removePrefix("nostr:Hashtag?id="))
+        } else {
+            val nip19 = Nip19.uriToRoute(uri)
+            when (nip19?.type) {
+                Nip19.Type.USER -> "User/${nip19.hex}"
+                Nip19.Type.NOTE -> "Note/${nip19.hex}"
+                Nip19.Type.EVENT -> {
+                    if (nip19.kind == PrivateDmEvent.KIND) {
+                        nip19.author?.let { "RoomByAuthor/$it" }
+                    } else if (
+                        nip19.kind == ChannelMessageEvent.KIND ||
+                        nip19.kind == ChannelCreateEvent.KIND ||
+                        nip19.kind == ChannelMetadataEvent.KIND
+                    ) {
+                        "Channel/${nip19.hex}"
+                    } else {
+                        "Event/${nip19.hex}"
+                    }
+                }
+                Nip19.Type.ADDRESS ->
+                    if (nip19.kind == CommunityDefinitionEvent.KIND) {
+                        "Community/${nip19.hex}"
+                    } else if (nip19.kind == LiveActivitiesEvent.KIND) {
+                        "Channel/${nip19.hex}"
+                    } else {
+                        "Event/${nip19.hex}"
+                    }
+                else -> null
+            }
         }
-        Nip19.Type.ADDRESS ->
-          if (nip19.kind == CommunityDefinitionEvent.KIND) {
-            "Community/${nip19.hex}"
-          } else if (nip19.kind == LiveActivitiesEvent.KIND) {
-            "Channel/${nip19.hex}"
-          } else {
-            "Event/${nip19.hex}"
-          }
-        else -> null
-      }
+            ?: try {
+                uri?.let {
+                    Nip47WalletConnectParser.parse(it)
+                    val encodedUri = URLEncoder.encode(it, StandardCharsets.UTF_8.toString())
+                    Route.Home.base + "?nip47=" + encodedUri
+                }
+            } catch (e: Exception) {
+                null
+            }
     }
-      ?: try {
-        uri?.let {
-          Nip47WalletConnectParser.parse(it)
-          val encodedUri = URLEncoder.encode(it, StandardCharsets.UTF_8.toString())
-          Route.Home.base + "?nip47=" + encodedUri
-        }
-      } catch (e: Exception) {
-        null
-      }
-  }
 }

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

@@ -20,49 +20,49 @@
  */
 package com.vitorpamplona.amethyst.ui.actions
 
+import kotlinx.coroutines.delay
 import java.net.HttpURLConnection
 import java.net.URL
-import kotlinx.coroutines.delay
 
 class ImageDownloader {
-  suspend fun waitAndGetImage(imageUrl: String): ByteArray? {
-    var imageData: ByteArray? = null
-    var tentatives = 0
+    suspend fun waitAndGetImage(imageUrl: String): ByteArray? {
+        var imageData: ByteArray? = null
+        var tentatives = 0
 
-    // Servers are usually not ready.. so tries to download it for 15 times/seconds.
-    while (imageData == null && tentatives < 15) {
-      imageData =
-        try {
-          HttpURLConnection.setFollowRedirects(true)
-          var url = URL(imageUrl)
-          var huc = url.openConnection() as HttpURLConnection
-          huc.instanceFollowRedirects = true
-          var responseCode = huc.responseCode
+        // Servers are usually not ready.. so tries to download it for 15 times/seconds.
+        while (imageData == null && tentatives < 15) {
+            imageData =
+                try {
+                    HttpURLConnection.setFollowRedirects(true)
+                    var url = URL(imageUrl)
+                    var huc = url.openConnection() as HttpURLConnection
+                    huc.instanceFollowRedirects = true
+                    var responseCode = huc.responseCode
 
-          if (responseCode in 300..400) {
-            val newUrl: String = huc.getHeaderField("Location")
+                    if (responseCode in 300..400) {
+                        val newUrl: String = huc.getHeaderField("Location")
 
-            // open the new connnection again
-            url = URL(newUrl)
-            huc = url.openConnection() as HttpURLConnection
-            responseCode = huc.responseCode
-          }
+                        // open the new connnection again
+                        url = URL(newUrl)
+                        huc = url.openConnection() as HttpURLConnection
+                        responseCode = huc.responseCode
+                    }
 
-          if (responseCode in 200..300) {
-            huc.inputStream.use { it.readBytes() }
-          } else {
-            tentatives++
-            delay(1000)
+                    if (responseCode in 200..300) {
+                        huc.inputStream.use { it.readBytes() }
+                    } else {
+                        tentatives++
+                        delay(1000)
 
-            null
-          }
-        } catch (e: Exception) {
-          tentatives++
-          delay(1000)
-          null
+                        null
+                    }
+                } catch (e: Exception) {
+                    tentatives++
+                    delay(1000)
+                    null
+                }
         }
-    }
 
-    return imageData
-  }
+        return imageData
+    }
 }

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

@@ -31,8 +31,6 @@ import android.webkit.MimeTypeMap
 import androidx.annotation.RequiresApi
 import com.vitorpamplona.amethyst.BuildConfig
 import com.vitorpamplona.amethyst.service.HttpClient
-import java.io.File
-import java.util.UUID
 import okhttp3.Call
 import okhttp3.Callback
 import okhttp3.Request
@@ -42,168 +40,170 @@ import okio.IOException
 import okio.buffer
 import okio.sink
 import okio.source
+import java.io.File
+import java.util.UUID
 
 object ImageSaver {
-  /**
-   * Saves the image to the gallery. May require a storage permission.
-   *
-   * @see PICTURES_SUBDIRECTORY
-   */
-  fun saveImage(
-    url: String,
-    context: Context,
-    onSuccess: () -> Any?,
-    onError: (Throwable) -> Any?,
-  ) {
-    val client = HttpClient.getHttpClient()
+    /**
+     * Saves the image to the gallery. May require a storage permission.
+     *
+     * @see PICTURES_SUBDIRECTORY
+     */
+    fun saveImage(
+        url: String,
+        context: Context,
+        onSuccess: () -> Any?,
+        onError: (Throwable) -> Any?,
+    ) {
+        val client = HttpClient.getHttpClient()
 
-    val request =
-      Request.Builder()
-        .header("User-Agent", "Amethyst/${BuildConfig.VERSION_NAME}")
-        .get()
-        .url(url)
-        .build()
+        val request =
+            Request.Builder()
+                .header("User-Agent", "Amethyst/${BuildConfig.VERSION_NAME}")
+                .get()
+                .url(url)
+                .build()
 
-    client
-      .newCall(request)
-      .enqueue(
-        object : Callback {
-          override fun onFailure(
-            call: Call,
-            e: IOException,
-          ) {
+        client
+            .newCall(request)
+            .enqueue(
+                object : Callback {
+                    override fun onFailure(
+                        call: Call,
+                        e: IOException,
+                    ) {
+                        e.printStackTrace()
+                        onError(e)
+                    }
+
+                    override fun onResponse(
+                        call: Call,
+                        response: Response,
+                    ) {
+                        try {
+                            check(response.isSuccessful)
+
+                            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+                                val contentType = response.header("Content-Type")
+                                checkNotNull(contentType) { "Can't find out the content type" }
+
+                                saveContentQ(
+                                    displayName = File(url).nameWithoutExtension,
+                                    contentType = contentType,
+                                    contentSource = response.body.source(),
+                                    contentResolver = context.contentResolver,
+                                )
+                            } else {
+                                saveContentDefault(
+                                    fileName = File(url).name,
+                                    contentSource = response.body.source(),
+                                    context = context,
+                                )
+                            }
+                            onSuccess()
+                        } catch (e: Exception) {
+                            e.printStackTrace()
+                            onError(e)
+                        }
+                    }
+                },
+            )
+    }
+
+    fun saveImage(
+        localFile: File,
+        mimeType: String?,
+        context: Context,
+        onSuccess: () -> Any?,
+        onError: (Throwable) -> Any?,
+    ) {
+        try {
+            val extension =
+                mimeType?.let { MimeTypeMap.getSingleton().getExtensionFromMimeType(it) } ?: ""
+            val buffer = localFile.inputStream().source().buffer()
+
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+                saveContentQ(
+                    displayName = UUID.randomUUID().toString(),
+                    contentType = mimeType ?: "",
+                    contentSource = buffer,
+                    contentResolver = context.contentResolver,
+                )
+            } else {
+                saveContentDefault(
+                    fileName = UUID.randomUUID().toString() + ".$extension",
+                    contentSource = buffer,
+                    context = context,
+                )
+            }
+            onSuccess()
+        } catch (e: Exception) {
             e.printStackTrace()
             onError(e)
-          }
+        }
+    }
 
-          override fun onResponse(
-            call: Call,
-            response: Response,
-          ) {
-            try {
-              check(response.isSuccessful)
-
-              if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-                val contentType = response.header("Content-Type")
-                checkNotNull(contentType) { "Can't find out the content type" }
-
-                saveContentQ(
-                  displayName = File(url).nameWithoutExtension,
-                  contentType = contentType,
-                  contentSource = response.body.source(),
-                  contentResolver = context.contentResolver,
+    @RequiresApi(Build.VERSION_CODES.Q)
+    private fun saveContentQ(
+        displayName: String,
+        contentType: String,
+        contentSource: BufferedSource,
+        contentResolver: ContentResolver,
+    ) {
+        val contentValues =
+            ContentValues().apply {
+                put(MediaStore.MediaColumns.DISPLAY_NAME, displayName)
+                put(MediaStore.MediaColumns.MIME_TYPE, contentType)
+                put(
+                    MediaStore.MediaColumns.RELATIVE_PATH,
+                    Environment.DIRECTORY_PICTURES + File.separatorChar + PICTURES_SUBDIRECTORY,
                 )
-              } else {
-                saveContentDefault(
-                  fileName = File(url).name,
-                  contentSource = response.body.source(),
-                  context = context,
-                )
-              }
-              onSuccess()
-            } catch (e: Exception) {
-              e.printStackTrace()
-              onError(e)
             }
-          }
-        },
-      )
-  }
 
-  fun saveImage(
-    localFile: File,
-    mimeType: String?,
-    context: Context,
-    onSuccess: () -> Any?,
-    onError: (Throwable) -> Any?,
-  ) {
-    try {
-      val extension =
-        mimeType?.let { MimeTypeMap.getSingleton().getExtensionFromMimeType(it) } ?: ""
-      val buffer = localFile.inputStream().source().buffer()
+        val masterUri =
+            if (contentType.startsWith("image")) {
+                MediaStore.Images.Media.EXTERNAL_CONTENT_URI
+            } else {
+                MediaStore.Video.Media.EXTERNAL_CONTENT_URI
+            }
 
-      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-        saveContentQ(
-          displayName = UUID.randomUUID().toString(),
-          contentType = mimeType ?: "",
-          contentSource = buffer,
-          contentResolver = context.contentResolver,
-        )
-      } else {
-        saveContentDefault(
-          fileName = UUID.randomUUID().toString() + ".$extension",
-          contentSource = buffer,
-          context = context,
-        )
-      }
-      onSuccess()
-    } catch (e: Exception) {
-      e.printStackTrace()
-      onError(e)
-    }
-  }
+        val uri = contentResolver.insert(masterUri, contentValues)
+        checkNotNull(uri) { "Can't insert the new content" }
 
-  @RequiresApi(Build.VERSION_CODES.Q)
-  private fun saveContentQ(
-    displayName: String,
-    contentType: String,
-    contentSource: BufferedSource,
-    contentResolver: ContentResolver,
-  ) {
-    val contentValues =
-      ContentValues().apply {
-        put(MediaStore.MediaColumns.DISPLAY_NAME, displayName)
-        put(MediaStore.MediaColumns.MIME_TYPE, contentType)
-        put(
-          MediaStore.MediaColumns.RELATIVE_PATH,
-          Environment.DIRECTORY_PICTURES + File.separatorChar + PICTURES_SUBDIRECTORY,
-        )
-      }
+        try {
+            val outputStream = contentResolver.openOutputStream(uri)
+            checkNotNull(outputStream) { "Can't open the content output stream" }
 
-    val masterUri =
-      if (contentType.startsWith("image")) {
-        MediaStore.Images.Media.EXTERNAL_CONTENT_URI
-      } else {
-        MediaStore.Video.Media.EXTERNAL_CONTENT_URI
-      }
-
-    val uri = contentResolver.insert(masterUri, contentValues)
-    checkNotNull(uri) { "Can't insert the new content" }
-
-    try {
-      val outputStream = contentResolver.openOutputStream(uri)
-      checkNotNull(outputStream) { "Can't open the content output stream" }
-
-      outputStream.use { contentSource.readAll(it.sink()) }
-    } catch (e: Exception) {
-      contentResolver.delete(uri, null, null)
-      throw e
-    }
-  }
-
-  private fun saveContentDefault(
-    fileName: String,
-    contentSource: BufferedSource,
-    context: Context,
-  ) {
-    val subdirectory =
-      File(
-        Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_PICTURES),
-        PICTURES_SUBDIRECTORY,
-      )
-
-    if (!subdirectory.exists()) {
-      subdirectory.mkdirs()
+            outputStream.use { contentSource.readAll(it.sink()) }
+        } catch (e: Exception) {
+            contentResolver.delete(uri, null, null)
+            throw e
+        }
     }
 
-    val outputFile = File(subdirectory, fileName)
+    private fun saveContentDefault(
+        fileName: String,
+        contentSource: BufferedSource,
+        context: Context,
+    ) {
+        val subdirectory =
+            File(
+                Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_PICTURES),
+                PICTURES_SUBDIRECTORY,
+            )
 
-    outputFile.outputStream().use { contentSource.readAll(it.sink()) }
+        if (!subdirectory.exists()) {
+            subdirectory.mkdirs()
+        }
 
-    // Call the media scanner manually, so the image
-    // appears in the gallery faster.
-    MediaScannerConnection.scanFile(context, arrayOf(outputFile.toString()), null, null)
-  }
+        val outputFile = File(subdirectory, fileName)
 
-  private const val PICTURES_SUBDIRECTORY = "Amethyst"
+        outputFile.outputStream().use { contentSource.readAll(it.sink()) }
+
+        // Call the media scanner manually, so the image
+        // appears in the gallery faster.
+        MediaScannerConnection.scanFile(context, arrayOf(outputFile.toString()), null, null)
+    }
+
+    private const val PICTURES_SUBDIRECTORY = "Amethyst"
 }

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

@@ -41,32 +41,32 @@ import com.vitorpamplona.amethyst.ui.theme.StdHorzSpacer
 
 @Composable
 fun InformationDialog(
-  title: String,
-  textContent: String,
-  buttonColors: ButtonColors = ButtonDefaults.buttonColors(),
-  onDismiss: () -> Unit,
+    title: String,
+    textContent: String,
+    buttonColors: ButtonColors = ButtonDefaults.buttonColors(),
+    onDismiss: () -> Unit,
 ) {
-  AlertDialog(
-    onDismissRequest = onDismiss,
-    title = { Text(title) },
-    text = { SelectionContainer { Text(textContent) } },
-    confirmButton = {
-      Button(
-        onClick = onDismiss,
-        colors = buttonColors,
-        contentPadding = PaddingValues(horizontal = Size16dp),
-      ) {
-        Row(
-          verticalAlignment = Alignment.CenterVertically,
-        ) {
-          Icon(
-            imageVector = Icons.Outlined.Done,
-            contentDescription = null,
-          )
-          Spacer(StdHorzSpacer)
-          Text(stringResource(R.string.error_dialog_button_ok))
-        }
-      }
-    },
-  )
+    AlertDialog(
+        onDismissRequest = onDismiss,
+        title = { Text(title) },
+        text = { SelectionContainer { Text(textContent) } },
+        confirmButton = {
+            Button(
+                onClick = onDismiss,
+                colors = buttonColors,
+                contentPadding = PaddingValues(horizontal = Size16dp),
+            ) {
+                Row(
+                    verticalAlignment = Alignment.CenterVertically,
+                ) {
+                    Icon(
+                        imageVector = Icons.Outlined.Done,
+                        contentDescription = null,
+                    )
+                    Spacer(StdHorzSpacer)
+                    Text(stringResource(R.string.error_dialog_button_ok))
+                }
+            }
+        },
+    )
 }

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

@@ -101,338 +101,340 @@ import kotlinx.coroutines.withContext
 
 @Composable
 fun JoinUserOrChannelView(
-  onClose: () -> Unit,
-  accountViewModel: AccountViewModel,
-  nav: (String) -> Unit,
+    onClose: () -> Unit,
+    accountViewModel: AccountViewModel,
+    nav: (String) -> Unit,
 ) {
-  val searchBarViewModel: SearchBarViewModel =
-    viewModel(
-      key = "SearchBarViewModel",
-      factory =
-        SearchBarViewModel.Factory(
-          accountViewModel.account,
-        ),
-    )
+    val searchBarViewModel: SearchBarViewModel =
+        viewModel(
+            key = "SearchBarViewModel",
+            factory =
+                SearchBarViewModel.Factory(
+                    accountViewModel.account,
+                ),
+        )
 
-  JoinUserOrChannelView(
-    searchBarViewModel = searchBarViewModel,
-    onClose = onClose,
-    accountViewModel = accountViewModel,
-    nav = nav,
-  )
+    JoinUserOrChannelView(
+        searchBarViewModel = searchBarViewModel,
+        onClose = onClose,
+        accountViewModel = accountViewModel,
+        nav = nav,
+    )
 }
 
 @Composable
 fun JoinUserOrChannelView(
-  searchBarViewModel: SearchBarViewModel,
-  onClose: () -> Unit,
-  accountViewModel: AccountViewModel,
-  nav: (String) -> Unit,
+    searchBarViewModel: SearchBarViewModel,
+    onClose: () -> Unit,
+    accountViewModel: AccountViewModel,
+    nav: (String) -> Unit,
 ) {
-  Dialog(
-    onDismissRequest = {
-      NostrSearchEventOrUserDataSource.clear()
-      searchBarViewModel.clear()
-      onClose()
-    },
-    properties =
-      DialogProperties(
-        dismissOnClickOutside = false,
-      ),
-  ) {
-    Surface {
-      Column(
-        modifier = Modifier.padding(10.dp).heightIn(min = 500.dp),
-      ) {
-        Row(
-          modifier = Modifier.fillMaxWidth(),
-          horizontalArrangement = Arrangement.SpaceBetween,
-          verticalAlignment = Alignment.CenterVertically,
-        ) {
-          CloseButton(
-            onPress = {
-              searchBarViewModel.clear()
-              NostrSearchEventOrUserDataSource.clear()
-              onClose()
-            },
-          )
+    Dialog(
+        onDismissRequest = {
+            NostrSearchEventOrUserDataSource.clear()
+            searchBarViewModel.clear()
+            onClose()
+        },
+        properties =
+            DialogProperties(
+                dismissOnClickOutside = false,
+            ),
+    ) {
+        Surface {
+            Column(
+                modifier = Modifier.padding(10.dp).heightIn(min = 500.dp),
+            ) {
+                Row(
+                    modifier = Modifier.fillMaxWidth(),
+                    horizontalArrangement = Arrangement.SpaceBetween,
+                    verticalAlignment = Alignment.CenterVertically,
+                ) {
+                    CloseButton(
+                        onPress = {
+                            searchBarViewModel.clear()
+                            NostrSearchEventOrUserDataSource.clear()
+                            onClose()
+                        },
+                    )
 
-          Text(
-            text = stringResource(R.string.channel_list_join_conversation),
-            fontWeight = FontWeight.Bold,
-          )
+                    Text(
+                        text = stringResource(R.string.channel_list_join_conversation),
+                        fontWeight = FontWeight.Bold,
+                    )
 
-          Text(
-            text = "",
-            color = MaterialTheme.colorScheme.placeholderText,
-            fontWeight = FontWeight.Bold,
-          )
+                    Text(
+                        text = "",
+                        color = MaterialTheme.colorScheme.placeholderText,
+                        fontWeight = FontWeight.Bold,
+                    )
+                }
+
+                Spacer(modifier = Modifier.height(15.dp))
+
+                RenderSearch(searchBarViewModel, accountViewModel, nav)
+            }
         }
-
-        Spacer(modifier = Modifier.height(15.dp))
-
-        RenderSearch(searchBarViewModel, accountViewModel, nav)
-      }
     }
-  }
 }
 
 @Composable
 private fun RenderSearch(
-  searchBarViewModel: SearchBarViewModel,
-  accountViewModel: AccountViewModel,
-  nav: (String) -> Unit,
+    searchBarViewModel: SearchBarViewModel,
+    accountViewModel: AccountViewModel,
+    nav: (String) -> Unit,
 ) {
-  val listState = rememberLazyListState()
+    val listState = rememberLazyListState()
 
-  val lifeCycleOwner = LocalLifecycleOwner.current
+    val lifeCycleOwner = LocalLifecycleOwner.current
 
-  // Create a channel for processing search queries.
-  val searchTextChanges = remember { Channel<String>(Channel.CONFLATED) }
+    // Create a channel for processing search queries.
+    val searchTextChanges = remember { Channel<String>(Channel.CONFLATED) }
 
-  LaunchedEffect(Unit) {
-    launch(Dispatchers.IO) {
-      LocalCache.live.newEventBundles.collect {
-        checkNotInMainThread()
-        if (searchBarViewModel.isSearchingFun()) {
-          searchBarViewModel.invalidateData()
-        }
-      }
-    }
-  }
-
-  LaunchedEffect(Unit) {
-    // Wait for text changes to stop for 300 ms before firing off search.
-    withContext(Dispatchers.IO) {
-      searchTextChanges
-        .receiveAsFlow()
-        .filter { it.isNotBlank() }
-        .distinctUntilChanged()
-        .debounce(300)
-        .collectLatest {
-          if (it.length >= 2) {
-            NostrSearchEventOrUserDataSource.search(it.trim())
-          }
-
-          searchBarViewModel.invalidateData()
-
-          // makes sure to show the top of the search
-          launch(Dispatchers.Main) { listState.animateScrollToItem(0) }
+    LaunchedEffect(Unit) {
+        launch(Dispatchers.IO) {
+            LocalCache.live.newEventBundles.collect {
+                checkNotInMainThread()
+                if (searchBarViewModel.isSearchingFun()) {
+                    searchBarViewModel.invalidateData()
+                }
+            }
         }
     }
-  }
 
-  DisposableEffect(lifeCycleOwner) {
-    val observer = LifecycleEventObserver { _, event ->
-      if (event == Lifecycle.Event.ON_RESUME) {
-        println("Join Start")
-        NostrSearchEventOrUserDataSource.start()
-        searchBarViewModel.invalidateData()
-      }
-      if (event == Lifecycle.Event.ON_PAUSE) {
-        println("Join Stop")
-        NostrSearchEventOrUserDataSource.clear()
-        NostrSearchEventOrUserDataSource.stop()
-      }
+    LaunchedEffect(Unit) {
+        // Wait for text changes to stop for 300 ms before firing off search.
+        withContext(Dispatchers.IO) {
+            searchTextChanges
+                .receiveAsFlow()
+                .filter { it.isNotBlank() }
+                .distinctUntilChanged()
+                .debounce(300)
+                .collectLatest {
+                    if (it.length >= 2) {
+                        NostrSearchEventOrUserDataSource.search(it.trim())
+                    }
+
+                    searchBarViewModel.invalidateData()
+
+                    // makes sure to show the top of the search
+                    launch(Dispatchers.Main) { listState.animateScrollToItem(0) }
+                }
+        }
     }
 
-    lifeCycleOwner.lifecycle.addObserver(observer)
-    onDispose { lifeCycleOwner.lifecycle.removeObserver(observer) }
-  }
+    DisposableEffect(lifeCycleOwner) {
+        val observer =
+            LifecycleEventObserver { _, event ->
+                if (event == Lifecycle.Event.ON_RESUME) {
+                    println("Join Start")
+                    NostrSearchEventOrUserDataSource.start()
+                    searchBarViewModel.invalidateData()
+                }
+                if (event == Lifecycle.Event.ON_PAUSE) {
+                    println("Join Stop")
+                    NostrSearchEventOrUserDataSource.clear()
+                    NostrSearchEventOrUserDataSource.stop()
+                }
+            }
 
-  // LAST ROW
-  SearchEditTextForJoin(searchBarViewModel, searchTextChanges)
+        lifeCycleOwner.lifecycle.addObserver(observer)
+        onDispose { lifeCycleOwner.lifecycle.removeObserver(observer) }
+    }
 
-  RenderSearchResults(searchBarViewModel, listState, accountViewModel, nav)
+    // LAST ROW
+    SearchEditTextForJoin(searchBarViewModel, searchTextChanges)
+
+    RenderSearchResults(searchBarViewModel, listState, accountViewModel, nav)
 }
 
 @OptIn(ExperimentalComposeUiApi::class)
 @Composable
 private fun SearchEditTextForJoin(
-  searchBarViewModel: SearchBarViewModel,
-  searchTextChanges: Channel<String>,
+    searchBarViewModel: SearchBarViewModel,
+    searchTextChanges: Channel<String>,
 ) {
-  val scope = rememberCoroutineScope()
+    val scope = rememberCoroutineScope()
 
-  // initialize focus reference to be able to request focus programmatically
-  val focusRequester = remember { FocusRequester() }
-  val keyboardController = LocalSoftwareKeyboardController.current
+    // initialize focus reference to be able to request focus programmatically
+    val focusRequester = remember { FocusRequester() }
+    val keyboardController = LocalSoftwareKeyboardController.current
 
-  LaunchedEffect(Unit) {
-    launch {
-      delay(100)
-      focusRequester.requestFocus()
-    }
-  }
-
-  Row(
-    modifier = Modifier.padding(horizontal = 10.dp).fillMaxWidth(),
-    horizontalArrangement = Arrangement.SpaceBetween,
-    verticalAlignment = Alignment.CenterVertically,
-  ) {
-    OutlinedTextField(
-      label = { Text(text = stringResource(R.string.channel_list_user_or_group_id)) },
-      value = searchBarViewModel.searchValue,
-      onValueChange = {
-        searchBarViewModel.updateSearchValue(it)
-        scope.launch(Dispatchers.IO) { searchTextChanges.trySend(it) }
-      },
-      leadingIcon = { SearchIcon(modifier = Size20Modifier, Color.Unspecified) },
-      modifier =
-        Modifier.weight(1f, true)
-          .defaultMinSize(minHeight = 20.dp)
-          .focusRequester(focusRequester)
-          .onFocusChanged {
-            if (it.isFocused) {
-              keyboardController?.show()
-            }
-          },
-      placeholder = {
-        Text(
-          text = stringResource(R.string.channel_list_user_or_group_id_demo),
-          color = MaterialTheme.colorScheme.placeholderText,
-        )
-      },
-      trailingIcon = {
-        if (searchBarViewModel.isSearching) {
-          IconButton(
-            onClick = {
-              searchBarViewModel.clear()
-              NostrSearchEventOrUserDataSource.clear()
-            },
-          ) {
-            Icon(
-              imageVector = Icons.Default.Clear,
-              contentDescription = stringResource(R.string.clear),
-            )
-          }
+    LaunchedEffect(Unit) {
+        launch {
+            delay(100)
+            focusRequester.requestFocus()
         }
-      },
-    )
-  }
+    }
+
+    Row(
+        modifier = Modifier.padding(horizontal = 10.dp).fillMaxWidth(),
+        horizontalArrangement = Arrangement.SpaceBetween,
+        verticalAlignment = Alignment.CenterVertically,
+    ) {
+        OutlinedTextField(
+            label = { Text(text = stringResource(R.string.channel_list_user_or_group_id)) },
+            value = searchBarViewModel.searchValue,
+            onValueChange = {
+                searchBarViewModel.updateSearchValue(it)
+                scope.launch(Dispatchers.IO) { searchTextChanges.trySend(it) }
+            },
+            leadingIcon = { SearchIcon(modifier = Size20Modifier, Color.Unspecified) },
+            modifier =
+                Modifier.weight(1f, true)
+                    .defaultMinSize(minHeight = 20.dp)
+                    .focusRequester(focusRequester)
+                    .onFocusChanged {
+                        if (it.isFocused) {
+                            keyboardController?.show()
+                        }
+                    },
+            placeholder = {
+                Text(
+                    text = stringResource(R.string.channel_list_user_or_group_id_demo),
+                    color = MaterialTheme.colorScheme.placeholderText,
+                )
+            },
+            trailingIcon = {
+                if (searchBarViewModel.isSearching) {
+                    IconButton(
+                        onClick = {
+                            searchBarViewModel.clear()
+                            NostrSearchEventOrUserDataSource.clear()
+                        },
+                    ) {
+                        Icon(
+                            imageVector = Icons.Default.Clear,
+                            contentDescription = stringResource(R.string.clear),
+                        )
+                    }
+                }
+            },
+        )
+    }
 }
 
 @Composable
 private fun RenderSearchResults(
-  searchBarViewModel: SearchBarViewModel,
-  listState: LazyListState,
-  accountViewModel: AccountViewModel,
-  nav: (String) -> Unit,
+    searchBarViewModel: SearchBarViewModel,
+    listState: LazyListState,
+    accountViewModel: AccountViewModel,
+    nav: (String) -> Unit,
 ) {
-  if (searchBarViewModel.isSearching) {
-    val users by searchBarViewModel.searchResultsUsers.collectAsStateWithLifecycle()
-    val channels by searchBarViewModel.searchResultsChannels.collectAsStateWithLifecycle()
+    if (searchBarViewModel.isSearching) {
+        val users by searchBarViewModel.searchResultsUsers.collectAsStateWithLifecycle()
+        val channels by searchBarViewModel.searchResultsChannels.collectAsStateWithLifecycle()
 
-    val automaticallyShowProfilePicture = remember {
-      accountViewModel.settings.showProfilePictures.value
-    }
+        val automaticallyShowProfilePicture =
+            remember {
+                accountViewModel.settings.showProfilePictures.value
+            }
 
-    Row(
-      modifier = Modifier.fillMaxWidth().fillMaxHeight().padding(vertical = 10.dp),
-    ) {
-      LazyColumn(
-        modifier = Modifier.fillMaxHeight(),
-        contentPadding = FeedPadding,
-        state = listState,
-      ) {
-        itemsIndexed(
-          users,
-          key = { _, item -> "u" + item.pubkeyHex },
-        ) { _, item ->
-          UserComposeForChat(item, accountViewModel) {
-            accountViewModel.createChatRoomFor(item) { nav("Room/$it") }
+        Row(
+            modifier = Modifier.fillMaxWidth().fillMaxHeight().padding(vertical = 10.dp),
+        ) {
+            LazyColumn(
+                modifier = Modifier.fillMaxHeight(),
+                contentPadding = FeedPadding,
+                state = listState,
+            ) {
+                itemsIndexed(
+                    users,
+                    key = { _, item -> "u" + item.pubkeyHex },
+                ) { _, item ->
+                    UserComposeForChat(item, accountViewModel) {
+                        accountViewModel.createChatRoomFor(item) { nav("Room/$it") }
 
-            searchBarViewModel.clear()
-          }
+                        searchBarViewModel.clear()
+                    }
+                }
+
+                itemsIndexed(
+                    channels,
+                    key = { _, item -> "c" + item.idHex },
+                ) { _, item ->
+                    RenderChannel(item, automaticallyShowProfilePicture) {
+                        nav("Channel/${item.idHex}")
+                        searchBarViewModel.clear()
+                    }
+                }
+            }
         }
-
-        itemsIndexed(
-          channels,
-          key = { _, item -> "c" + item.idHex },
-        ) { _, item ->
-          RenderChannel(item, automaticallyShowProfilePicture) {
-            nav("Channel/${item.idHex}")
-            searchBarViewModel.clear()
-          }
-        }
-      }
     }
-  }
 }
 
 @Composable
 private fun RenderChannel(
-  item: com.vitorpamplona.amethyst.model.Channel,
-  loadProfilePicture: Boolean,
-  onClick: () -> Unit,
+    item: com.vitorpamplona.amethyst.model.Channel,
+    loadProfilePicture: Boolean,
+    onClick: () -> Unit,
 ) {
-  val hasNewMessages = remember { mutableStateOf(false) }
+    val hasNewMessages = remember { mutableStateOf(false) }
 
-  ChannelName(
-    channelIdHex = item.idHex,
-    channelPicture = item.profilePicture(),
-    channelTitle = {
-      Text(
-        item.toBestDisplayName(),
-        fontWeight = FontWeight.Bold,
-      )
-    },
-    channelLastTime = null,
-    channelLastContent = item.summary(),
-    hasNewMessages,
-    onClick = onClick,
-    loadProfilePicture = loadProfilePicture,
-  )
+    ChannelName(
+        channelIdHex = item.idHex,
+        channelPicture = item.profilePicture(),
+        channelTitle = {
+            Text(
+                item.toBestDisplayName(),
+                fontWeight = FontWeight.Bold,
+            )
+        },
+        channelLastTime = null,
+        channelLastContent = item.summary(),
+        hasNewMessages,
+        onClick = onClick,
+        loadProfilePicture = loadProfilePicture,
+    )
 }
 
 @Composable
 fun UserComposeForChat(
-  baseUser: User,
-  accountViewModel: AccountViewModel,
-  onClick: () -> Unit,
+    baseUser: User,
+    accountViewModel: AccountViewModel,
+    onClick: () -> Unit,
 ) {
-  Column(
-    modifier =
-      Modifier.clickable(
-        onClick = onClick,
-      ),
-  ) {
-    Row(
-      modifier =
-        Modifier.padding(
-          start = 12.dp,
-          end = 12.dp,
-          top = 10.dp,
-        ),
-      verticalAlignment = Alignment.CenterVertically,
+    Column(
+        modifier =
+            Modifier.clickable(
+                onClick = onClick,
+            ),
     ) {
-      ClickableUserPicture(baseUser, Size55dp, accountViewModel)
+        Row(
+            modifier =
+                Modifier.padding(
+                    start = 12.dp,
+                    end = 12.dp,
+                    top = 10.dp,
+                ),
+            verticalAlignment = Alignment.CenterVertically,
+        ) {
+            ClickableUserPicture(baseUser, Size55dp, accountViewModel)
 
-      Column(
-        modifier = Modifier.padding(start = 10.dp).weight(1f),
-      ) {
-        Row(verticalAlignment = Alignment.CenterVertically) { UsernameDisplay(baseUser) }
+            Column(
+                modifier = Modifier.padding(start = 10.dp).weight(1f),
+            ) {
+                Row(verticalAlignment = Alignment.CenterVertically) { UsernameDisplay(baseUser) }
 
-        DisplayUserAboutInfo(baseUser)
-      }
+                DisplayUserAboutInfo(baseUser)
+            }
+        }
+
+        Divider(
+            modifier = Modifier.padding(top = 10.dp),
+            thickness = DividerThickness,
+        )
     }
-
-    Divider(
-      modifier = Modifier.padding(top = 10.dp),
-      thickness = DividerThickness,
-    )
-  }
 }
 
 @Composable
 private fun DisplayUserAboutInfo(baseUser: User) {
-  val baseUserState by baseUser.live().metadata.observeAsState()
-  val about by remember(baseUserState) { derivedStateOf { baseUserState?.user?.info?.about ?: "" } }
+    val baseUserState by baseUser.live().metadata.observeAsState()
+    val about by remember(baseUserState) { derivedStateOf { baseUserState?.user?.info?.about ?: "" } }
 
-  Text(
-    text = about,
-    color = MaterialTheme.colorScheme.placeholderText,
-    maxLines = 1,
-    overflow = TextOverflow.Ellipsis,
-  )
+    Text(
+        text = about,
+        color = MaterialTheme.colorScheme.placeholderText,
+        maxLines = 1,
+        overflow = TextOverflow.Ellipsis,
+    )
 }

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

@@ -52,101 +52,101 @@ import com.vitorpamplona.amethyst.ui.theme.placeholderText
 
 @Composable
 fun NewChannelView(
-  onClose: () -> Unit,
-  accountViewModel: AccountViewModel,
-  channel: PublicChatChannel? = null,
+    onClose: () -> Unit,
+    accountViewModel: AccountViewModel,
+    channel: PublicChatChannel? = null,
 ) {
-  val postViewModel: NewChannelViewModel = viewModel()
-  postViewModel.load(accountViewModel.account, channel)
+    val postViewModel: NewChannelViewModel = viewModel()
+    postViewModel.load(accountViewModel.account, channel)
 
-  Dialog(
-    onDismissRequest = { onClose() },
-    properties =
-      DialogProperties(
-        dismissOnClickOutside = false,
-      ),
-  ) {
-    Surface {
-      Column(
-        modifier = Modifier.padding(10.dp).verticalScroll(rememberScrollState()),
-      ) {
-        Row(
-          modifier = Modifier.fillMaxWidth(),
-          horizontalArrangement = Arrangement.SpaceBetween,
-          verticalAlignment = Alignment.CenterVertically,
-        ) {
-          CloseButton(
-            onPress = {
-              postViewModel.clear()
-              onClose()
-            },
-          )
+    Dialog(
+        onDismissRequest = { onClose() },
+        properties =
+            DialogProperties(
+                dismissOnClickOutside = false,
+            ),
+    ) {
+        Surface {
+            Column(
+                modifier = Modifier.padding(10.dp).verticalScroll(rememberScrollState()),
+            ) {
+                Row(
+                    modifier = Modifier.fillMaxWidth(),
+                    horizontalArrangement = Arrangement.SpaceBetween,
+                    verticalAlignment = Alignment.CenterVertically,
+                ) {
+                    CloseButton(
+                        onPress = {
+                            postViewModel.clear()
+                            onClose()
+                        },
+                    )
 
-          PostButton(
-            onPost = {
-              postViewModel.create()
-              onClose()
-            },
-            postViewModel.channelName.value.text.isNotBlank(),
-          )
+                    PostButton(
+                        onPost = {
+                            postViewModel.create()
+                            onClose()
+                        },
+                        postViewModel.channelName.value.text.isNotBlank(),
+                    )
+                }
+
+                Spacer(modifier = Modifier.height(15.dp))
+
+                OutlinedTextField(
+                    label = { Text(text = stringResource(R.string.channel_name)) },
+                    modifier = Modifier.fillMaxWidth(),
+                    value = postViewModel.channelName.value,
+                    onValueChange = { postViewModel.channelName.value = it },
+                    placeholder = {
+                        Text(
+                            text = stringResource(R.string.my_awesome_group),
+                            color = MaterialTheme.colorScheme.placeholderText,
+                        )
+                    },
+                    keyboardOptions =
+                        KeyboardOptions.Default.copy(
+                            capitalization = KeyboardCapitalization.Sentences,
+                        ),
+                    textStyle = LocalTextStyle.current.copy(textDirection = TextDirection.Content),
+                )
+
+                Spacer(modifier = Modifier.height(15.dp))
+
+                OutlinedTextField(
+                    label = { Text(text = stringResource(R.string.picture_url)) },
+                    modifier = Modifier.fillMaxWidth(),
+                    value = postViewModel.channelPicture.value,
+                    onValueChange = { postViewModel.channelPicture.value = it },
+                    placeholder = {
+                        Text(
+                            text = "http://mygroup.com/logo.jpg",
+                            color = MaterialTheme.colorScheme.placeholderText,
+                        )
+                    },
+                )
+
+                Spacer(modifier = Modifier.height(15.dp))
+
+                OutlinedTextField(
+                    label = { Text(text = stringResource(R.string.description)) },
+                    modifier = Modifier.fillMaxWidth().height(100.dp),
+                    value = postViewModel.channelDescription.value,
+                    onValueChange = { postViewModel.channelDescription.value = it },
+                    placeholder = {
+                        Text(
+                            text = stringResource(R.string.about_us),
+                            color = MaterialTheme.colorScheme.placeholderText,
+                        )
+                    },
+                    keyboardOptions =
+                        KeyboardOptions.Default.copy(
+                            capitalization = KeyboardCapitalization.Sentences,
+                        ),
+                    textStyle = LocalTextStyle.current.copy(textDirection = TextDirection.Content),
+                    maxLines = 10,
+                )
+            }
         }
-
-        Spacer(modifier = Modifier.height(15.dp))
-
-        OutlinedTextField(
-          label = { Text(text = stringResource(R.string.channel_name)) },
-          modifier = Modifier.fillMaxWidth(),
-          value = postViewModel.channelName.value,
-          onValueChange = { postViewModel.channelName.value = it },
-          placeholder = {
-            Text(
-              text = stringResource(R.string.my_awesome_group),
-              color = MaterialTheme.colorScheme.placeholderText,
-            )
-          },
-          keyboardOptions =
-            KeyboardOptions.Default.copy(
-              capitalization = KeyboardCapitalization.Sentences,
-            ),
-          textStyle = LocalTextStyle.current.copy(textDirection = TextDirection.Content),
-        )
-
-        Spacer(modifier = Modifier.height(15.dp))
-
-        OutlinedTextField(
-          label = { Text(text = stringResource(R.string.picture_url)) },
-          modifier = Modifier.fillMaxWidth(),
-          value = postViewModel.channelPicture.value,
-          onValueChange = { postViewModel.channelPicture.value = it },
-          placeholder = {
-            Text(
-              text = "http://mygroup.com/logo.jpg",
-              color = MaterialTheme.colorScheme.placeholderText,
-            )
-          },
-        )
-
-        Spacer(modifier = Modifier.height(15.dp))
-
-        OutlinedTextField(
-          label = { Text(text = stringResource(R.string.description)) },
-          modifier = Modifier.fillMaxWidth().height(100.dp),
-          value = postViewModel.channelDescription.value,
-          onValueChange = { postViewModel.channelDescription.value = it },
-          placeholder = {
-            Text(
-              text = stringResource(R.string.about_us),
-              color = MaterialTheme.colorScheme.placeholderText,
-            )
-          },
-          keyboardOptions =
-            KeyboardOptions.Default.copy(
-              capitalization = KeyboardCapitalization.Sentences,
-            ),
-          textStyle = LocalTextStyle.current.copy(textDirection = TextDirection.Content),
-          maxLines = 10,
-        )
-      }
     }
-  }
 }