v0.72.2

Nostr.build API v2, NIP98 support

.github/workflows/create-release.yml

@@ -85,7 +85,7 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }} 
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
           asset_path: app/build/outputs/apk/play/release/app-play-universal-release-unsigned-signed.apk
           asset_name: amethyst-googleplay-universal-${{ github.ref_name }}.apk
           asset_content_type: application/zip

.idea/kotlinc.xml

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

app/build.gradle

@@ -1,7 +1,7 @@
 plugins {
     id 'com.android.application'
     id 'org.jetbrains.kotlin.android'
-    id 'org.jlleitschuh.gradle.ktlint' version "11.3.1"
+    id 'org.jlleitschuh.gradle.ktlint' version "11.5.0"
     id 'com.google.gms.google-services'
 }
 
@@ -13,21 +13,21 @@ android {
         applicationId "com.vitorpamplona.amethyst"
         minSdk 26
         targetSdk 33
-        versionCode 264
-        versionName "0.70.7"
+        versionCode 269
+        versionName "0.72.2"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {
             useSupportLibrary true
         }
-        resConfigs("ar", "cs", "de", "eo", "es", "fa", "fr", "hu", "night", "nl", "pt-rBR", "ru", "sv-rSE", "ta", "tr", "uk", "zh", "sh-rHK", "zh-rTW", "ja")
+        resourceConfigurations += ['ar', 'cs', 'de', 'eo', 'es', 'fa', 'fr', 'hu', 'night', 'nl', 'pt-rBR', 'ru', 'sv-rSE', 'ta', 'tr', 'uk', 'zh', 'sh-rHK', 'zh-rTW', 'ja']
     }
 
     buildTypes {
         release {
-            // TODO: Make sure all of JSON parsers work when activating these.
-            //minifyEnabled true
-            //proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+            //signingConfig signingConfigs.debug
+            proguardFiles getDefaultProguardFile("proguard-android-optimize.txt"), 'proguard-rules.pro'
+            minifyEnabled true
             resValue "string", "app_name", "@string/app_name_release"
         }
         debug {
@@ -37,7 +37,7 @@ android {
         }
     }
 
-    flavorDimensions "channel"
+    flavorDimensions = ["channel"]
 
     productFlavors {
         play {
@@ -73,7 +73,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion "1.4.7"
+        kotlinCompilerExtensionVersion "1.5.1"
     }
 
     packagingOptions {
@@ -96,7 +96,7 @@ dependencies {
     implementation "androidx.fragment:fragment-ktx:$fragment_version"
 
     // Navigation
-    implementation("androidx.navigation:navigation-compose:$nav_version")
+    implementation "androidx.navigation:navigation-compose:$nav_version"
 
     // Observe Live data as State
     implementation "androidx.compose.runtime:runtime-livedata:$compose_ui_version"
@@ -108,7 +108,7 @@ dependencies {
     implementation "androidx.lifecycle:lifecycle-runtime-compose:$lifecycle_version"
     implementation "androidx.lifecycle:lifecycle-viewmodel-compose:$lifecycle_version"
     implementation "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycle_version"
-    implementation "androidx.lifecycle:lifecycle-livedata:$lifecycle_version"
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version"
 
     implementation "net.engawapg.lib:zoomable:1.4.3"
 
@@ -153,7 +153,7 @@ dependencies {
     implementation "io.github.url-detector:url-detector:0.1.23"
 
     // For QR generation
-    implementation 'com.google.zxing:core:3.5.1'
+    implementation 'com.google.zxing:core:3.5.2'
     implementation 'com.journeyapps:zxing-android-embedded:4.3.0'
 
     // Markdown
@@ -191,14 +191,18 @@ dependencies {
     // immutable collections to avoid recomposition
     implementation("org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.5")
 
+    // GeoHash
+    implementation 'com.github.drfonfon:android-kotlin-geohash:1.0'
+
+    // LibSodium for XChaCha encryption
+    implementation "com.goterl:lazysodium-android:5.1.0@aar"
+    implementation 'net.java.dev.jna:jna:5.13.0@aar'
+
     // Video compression lib
     implementation 'com.github.AbedElazizShe:LightCompressor:1.3.1'
     // Image compression lib
     implementation 'id.zelory:compressor:3.0.1'
 
-    // Automatic memory leak detection
-    debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.12'
-
     testImplementation 'junit:junit:4.13.2'
     testImplementation 'io.mockk:mockk:1.13.5'
     androidTestImplementation 'androidx.test.ext:junit:1.2.0-alpha01'

app/proguard-rules.pro

@@ -5,33 +5,48 @@
 # For more details, see
 #   http://developer.android.com/guide/developing/tools/proguard.html
 
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
-# For the Secp256k1 library
+# preserve the line number information for debugging stack traces.
+-dontobfuscate
+-keepattributes LocalVariableTable
+-keepattributes LocalVariableTypeTable
+-keepattributes *Annotation*
+-keepattributes SourceFile
+-keepattributes LineNumberTable
+-keepattributes Signature
+-keepattributes Exceptions
 -keepattributes InnerClasses
+-keepattributes EnclosingMethod
+-keepattributes MethodParameters
+-keepparameternames
 
--keep class fr.acinq.secp256k1.jni.** { *; }
-# For the NostrPostr library
--keep class nostr.postr.** { *; }
+-keepdirectories libs
+
+# Keep all names
+-keepnames class ** { *; }
+
+# Keep All enums
+-keep enum ** { *; }
+
+# preserve access to native classses
+-keep class fr.acinq.secp256k1.** { *; }
+
+# GSON parsing
 -keep class com.vitorpamplona.amethyst.service.model.** { *; }
-# Json parsing
--keep class com.google.gson.reflect.** { *; }
--keep class * extends com.google.gson.reflect.TypeToken
--keep public class * implements java.lang.reflect.Type
-
--keep class com.vitorpamplona.amethyst.lnurl.** { *; }
 -keep class com.vitorpamplona.amethyst.model.** { *; }
 -keep class com.vitorpamplona.amethyst.service.** { *; }
--keep class com.vitorpamplona.amethyst.ui.** { *; }
+
+# Prevent proguard from stripping interface information from TypeAdapter, TypeAdapterFactory,
+# JsonSerializer, JsonDeserializer instances (so they can be used in @JsonAdapter)
+-keep class * extends com.google.gson.TypeAdapter
+-keep class * implements com.google.gson.TypeAdapterFactory
+-keep class * implements com.google.gson.JsonSerializer
+-keep class * implements com.google.gson.JsonDeserializer
+
+# Prevent R8 from leaving Data object members always null
+-keepclassmembers,allowobfuscation class * {
+  @com.google.gson.annotations.SerializedName <fields>;
+}
+
+# Retain generic signatures of TypeToken and its subclasses with R8 version 3.0 and higher.
+-keep,allowobfuscation,allowshrinking class com.google.gson.reflect.TypeToken
+-keep,allowobfuscation,allowshrinking class * extends com.google.gson.reflect.TypeToken

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

@@ -0,0 +1,102 @@
+package com.vitorpamplona.amethyst
+
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.vitorpamplona.amethyst.model.hexToByteArray
+import com.vitorpamplona.amethyst.model.toHexKey
+import com.vitorpamplona.amethyst.service.CryptoUtils
+import com.vitorpamplona.amethyst.service.KeyPair
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class CryptoUtilsTest {
+
+    @Test
+    fun testGetPublicFromPrivateKey() {
+        val privateKey = "f410f88bcec6cbfda04d6a273c7b1dd8bba144cd45b71e87109cfa11dd7ed561".hexToByteArray()
+        val publicKey = CryptoUtils.pubkeyCreate(privateKey).toHexKey()
+        assertEquals("7d4b8806f1fd713c287235411bf95aa81b7242ead892733ec84b3f2719845be6", publicKey)
+    }
+
+    @Test
+    fun testSharedSecretCompatibilityWithCoracle() {
+        val privateKey = "f410f88bcec6cbfda04d6a273c7b1dd8bba144cd45b71e87109cfa11dd7ed561"
+        val publicKey = "765cd7cf91d3ad07423d114d5a39c61d52b2cdbc18ba055ddbbeec71fbe2aa2f"
+
+        val key = CryptoUtils.getSharedSecretNIP24(privateKey = privateKey.hexToByteArray(), pubKey = publicKey.hexToByteArray())
+
+        assertEquals("577c966f499dddd8e8dcc34e8f352e283cc177e53ae372794947e0b8ede7cfd8", key.toHexKey())
+    }
+
+    @Test
+    fun testSharedSecret() {
+        val sender = KeyPair()
+        val receiver = KeyPair()
+
+        val sharedSecret1 = CryptoUtils.getSharedSecretNIP24(sender.privKey!!, receiver.pubKey)
+        val sharedSecret2 = CryptoUtils.getSharedSecretNIP24(receiver.privKey!!, sender.pubKey)
+
+        assertEquals(sharedSecret1.toHexKey(), sharedSecret2.toHexKey())
+
+        val secretKey1 = KeyPair(privKey = sharedSecret1)
+        val secretKey2 = KeyPair(privKey = sharedSecret2)
+
+        assertEquals(secretKey1.pubKey.toHexKey(), secretKey2.pubKey.toHexKey())
+        assertEquals(secretKey1.privKey?.toHexKey(), secretKey2.privKey?.toHexKey())
+    }
+
+    @Test
+    fun encryptDecryptNIP4Test() {
+        val msg = "Hi"
+
+        val privateKey = CryptoUtils.privkeyCreate()
+        val publicKey = CryptoUtils.pubkeyCreate(privateKey)
+
+        val encrypted = CryptoUtils.encryptNIP04(msg, privateKey, publicKey)
+        val decrypted = CryptoUtils.decryptNIP04(encrypted, privateKey, publicKey)
+
+        assertEquals(msg, decrypted)
+    }
+
+    @Test
+    fun encryptDecryptNIP24Test() {
+        val msg = "Hi"
+
+        val privateKey = CryptoUtils.privkeyCreate()
+        val publicKey = CryptoUtils.pubkeyCreate(privateKey)
+
+        val encrypted = CryptoUtils.encryptNIP24(msg, privateKey, publicKey)
+        val decrypted = CryptoUtils.decryptNIP24(encrypted, privateKey, publicKey)
+
+        assertEquals(msg, decrypted)
+    }
+
+    @Test
+    fun encryptSharedSecretDecryptNIP4Test() {
+        val msg = "Hi"
+
+        val privateKey = CryptoUtils.privkeyCreate()
+        val publicKey = CryptoUtils.pubkeyCreate(privateKey)
+        val sharedSecret = CryptoUtils.getSharedSecretNIP04(privateKey, publicKey)
+
+        val encrypted = CryptoUtils.encryptNIP04(msg, sharedSecret)
+        val decrypted = CryptoUtils.decryptNIP04(encrypted, sharedSecret)
+
+        assertEquals(msg, decrypted)
+    }
+
+    @Test
+    fun encryptSharedSecretDecryptNIP24Test() {
+        val msg = "Hi"
+
+        val privateKey = CryptoUtils.privkeyCreate()
+        val publicKey = CryptoUtils.pubkeyCreate(privateKey)
+        val sharedSecret = CryptoUtils.getSharedSecretNIP24(privateKey, publicKey)
+
+        val encrypted = CryptoUtils.encryptNIP24(msg, sharedSecret)
+        val decrypted = CryptoUtils.decryptNIP24(encrypted, sharedSecret)
+
+        assertEquals(msg, decrypted)
+    }
+}

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

@@ -0,0 +1,561 @@
+package com.vitorpamplona.amethyst
+
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.vitorpamplona.amethyst.model.HexKey
+import com.vitorpamplona.amethyst.model.hexToByteArray
+import com.vitorpamplona.amethyst.model.toHexKey
+import com.vitorpamplona.amethyst.service.CryptoUtils
+import com.vitorpamplona.amethyst.service.KeyPair
+import com.vitorpamplona.amethyst.service.model.ChatMessageEvent
+import com.vitorpamplona.amethyst.service.model.Event
+import com.vitorpamplona.amethyst.service.model.GiftWrapEvent
+import com.vitorpamplona.amethyst.service.model.Gossip
+import com.vitorpamplona.amethyst.service.model.NIP24Factory
+import com.vitorpamplona.amethyst.service.model.SealedGossipEvent
+import com.vitorpamplona.amethyst.service.relays.Client
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertNotEquals
+import org.junit.Assert.assertNotNull
+import org.junit.Assert.assertNull
+import org.junit.Assert.assertTrue
+import org.junit.Assert.fail
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class GiftWrapEventTest {
+    @Test()
+    fun testNip24Utils() {
+        val sender = KeyPair()
+        val receiver = KeyPair()
+        val message = "Hola, que tal?"
+
+        val events = NIP24Factory().createMsgNIP24(
+            message,
+            listOf(receiver.pubKey.toHexKey()),
+            sender.privKey!!
+        )
+
+        // Simulate Receiver
+        val eventsReceiverGets = events.filter { it.isTaggedUser(receiver.pubKey.toHexKey()) }
+        eventsReceiverGets.forEach {
+            val event = it.unwrap(receiver.privKey!!)
+            if (event is SealedGossipEvent) {
+                val innerData = event.unseal(receiver.privKey!!)
+                assertEquals(message, innerData?.content)
+            } else {
+                fail("Wrong Event")
+            }
+        }
+
+        // Simulate Sender
+        val eventsSenderGets = events.filter { it.isTaggedUser(sender.pubKey.toHexKey()) }
+        eventsSenderGets.forEach {
+            val event = it.unwrap(sender.privKey!!)
+            if (event is SealedGossipEvent) {
+                val innerData = event.unseal(sender.privKey!!)
+                assertEquals(message, innerData?.content)
+            } else {
+                fail("Wrong Event")
+            }
+        }
+    }
+
+    @Test()
+    fun testNip24UtilsForGroups() {
+        val sender = KeyPair()
+        val receiver1 = KeyPair()
+        val receiver2 = KeyPair()
+        val receiver3 = KeyPair()
+        val receiver4 = KeyPair()
+        val message = "Hola, que tal?"
+
+        val receivers = listOf(
+            receiver1,
+            receiver2,
+            receiver3,
+            receiver4
+        )
+
+        val events = NIP24Factory().createMsgNIP24(
+            message,
+            receivers.map { it.pubKey.toHexKey() },
+            sender.privKey!!
+        )
+
+        // Simulate Receiver
+        receivers.forEach { receiver ->
+            val eventsReceiverGets = events.filter { it.isTaggedUser(receiver.pubKey.toHexKey()) }
+            eventsReceiverGets.forEach {
+                val event = it.unwrap(receiver.privKey!!)
+                if (event is SealedGossipEvent) {
+                    val innerData = event.unseal(receiver.privKey!!)
+                    assertEquals(message, innerData?.content)
+                } else {
+                    fail("Wrong Event")
+                }
+            }
+        }
+
+        // Simulate Sender
+        val eventsSenderGets = events.filter { it.isTaggedUser(sender.pubKey.toHexKey()) }
+        eventsSenderGets.forEach {
+            val event = it.unwrap(sender.privKey!!)
+            if (event is SealedGossipEvent) {
+                val innerData = event.unseal(sender.privKey!!)
+                assertEquals(message, innerData?.content)
+            } else {
+                fail("Wrong Event")
+            }
+        }
+    }
+
+    @Test()
+    fun testInternalsSimpleMessage() {
+        val sender = KeyPair()
+        val receiver = KeyPair()
+
+        val senderMessage = ChatMessageEvent.create(
+            msg = "Hi There!",
+            to = listOf(receiver.pubKey.toHexKey()),
+            privateKey = sender.privKey!!
+        )
+
+        // MsgFor the Receiver
+
+        val encMsgFromSenderToReceiver = SealedGossipEvent.create(
+            event = senderMessage,
+            encryptTo = receiver.pubKey.toHexKey(),
+            privateKey = sender.privKey!!
+        )
+
+        // Should expose sender
+        assertEquals(encMsgFromSenderToReceiver.pubKey, sender.pubKey.toHexKey())
+        // Should not expose receiver
+        assertTrue(encMsgFromSenderToReceiver.tags.isEmpty())
+
+        val giftWrapEventToReceiver = GiftWrapEvent.create(
+            event = encMsgFromSenderToReceiver,
+            recipientPubKey = receiver.pubKey.toHexKey()
+        )
+
+        // Should not be signed by neither sender nor receiver
+        assertNotEquals(giftWrapEventToReceiver.pubKey, sender.pubKey.toHexKey())
+        assertNotEquals(giftWrapEventToReceiver.pubKey, receiver.pubKey.toHexKey())
+
+        // Should not include sender as recipient
+        assertNotEquals(giftWrapEventToReceiver.recipientPubKey(), sender.pubKey.toHexKey())
+
+        // Should be addressed to the receiver
+        assertEquals(giftWrapEventToReceiver.recipientPubKey(), receiver.pubKey.toHexKey())
+
+        // MsgFor the Sender
+
+        val encMsgFromSenderToSender = SealedGossipEvent.create(
+            event = senderMessage,
+            encryptTo = sender.pubKey.toHexKey(),
+            privateKey = sender.privKey!!
+        )
+
+        // Should expose sender
+        assertEquals(encMsgFromSenderToSender.pubKey, sender.pubKey.toHexKey())
+        // Should not expose receiver
+        assertTrue(encMsgFromSenderToSender.tags.isEmpty())
+
+        val giftWrapEventToSender = GiftWrapEvent.create(
+            event = encMsgFromSenderToSender,
+            recipientPubKey = sender.pubKey.toHexKey()
+        )
+
+        // Should not be signed by neither the sender, not the receiver
+        assertNotEquals(giftWrapEventToSender.pubKey, sender.pubKey.toHexKey())
+        assertNotEquals(giftWrapEventToSender.pubKey, receiver.pubKey.toHexKey())
+
+        // Should not be addressed to the receiver
+        assertNotEquals(giftWrapEventToSender.recipientPubKey(), receiver.pubKey.toHexKey())
+        // Should be addressed to the sender
+        assertEquals(giftWrapEventToSender.recipientPubKey(), sender.pubKey.toHexKey())
+
+        // Done
+
+        println(senderMessage.toJson())
+        println(encMsgFromSenderToReceiver.toJson())
+        println(giftWrapEventToReceiver.toJson())
+        println(giftWrapEventToSender.toJson())
+
+        // Receiver's side
+        // Unwrapping
+
+        val unwrappedMsgForSenderBySender = giftWrapEventToSender.unwrap(sender.privKey!!)
+        val unwrappedMsgForReceiverBySender = giftWrapEventToReceiver.unwrap(sender.privKey!!)
+
+        assertNotNull(unwrappedMsgForSenderBySender)
+        assertNull(unwrappedMsgForReceiverBySender)
+
+        val unwrappedMsgForSenderByReceiver = giftWrapEventToSender.unwrap(receiver.privKey!!)
+        val unwrappedMsgForReceiverByReceiver = giftWrapEventToReceiver.unwrap(receiver.privKey!!)
+
+        assertNull(unwrappedMsgForSenderByReceiver)
+        assertNotNull(unwrappedMsgForReceiverByReceiver)
+
+        assertEquals(SealedGossipEvent.kind, unwrappedMsgForSenderBySender?.kind)
+        assertEquals(SealedGossipEvent.kind, unwrappedMsgForReceiverByReceiver?.kind)
+
+        assertTrue(unwrappedMsgForSenderBySender is SealedGossipEvent)
+        assertTrue(unwrappedMsgForReceiverByReceiver is SealedGossipEvent)
+
+        if (unwrappedMsgForSenderBySender is SealedGossipEvent &&
+            unwrappedMsgForReceiverByReceiver is SealedGossipEvent
+        ) {
+            val unwrappedGossipToSenderByReceiver = unwrappedMsgForSenderBySender.unseal(receiver.privKey!!)
+            val unwrappedGossipToReceiverByReceiver = unwrappedMsgForReceiverByReceiver.unseal(receiver.privKey!!)
+
+            assertNull(unwrappedGossipToSenderByReceiver)
+            assertNotNull(unwrappedGossipToReceiverByReceiver)
+
+            val unwrappedGossipToSenderBySender = unwrappedMsgForSenderBySender.unseal(sender.privKey!!)
+            val unwrappedGossipToReceiverBySender = unwrappedMsgForReceiverByReceiver.unseal(sender.privKey!!)
+
+            assertNotNull(unwrappedGossipToSenderBySender)
+            assertNull(unwrappedGossipToReceiverBySender)
+
+            assertEquals("Hi There!", unwrappedGossipToReceiverByReceiver?.content)
+            assertEquals("Hi There!", unwrappedGossipToSenderBySender?.content)
+        } else {
+            fail()
+        }
+    }
+
+    @Test()
+    fun testInternalsGroupMessage() {
+        val sender = KeyPair()
+        val receiverA = KeyPair()
+        val receiverB = KeyPair()
+
+        val senderMessage = ChatMessageEvent.create(
+            msg = "Who is going to the party tonight?",
+            to = listOf(receiverA.pubKey.toHexKey(), receiverB.pubKey.toHexKey()),
+            privateKey = sender.privKey!!
+        )
+
+        val encMsgFromSenderToReceiverA = SealedGossipEvent.create(
+            event = senderMessage,
+            encryptTo = receiverA.pubKey.toHexKey(),
+            privateKey = sender.privKey!!
+        )
+
+        val encMsgFromSenderToReceiverB = SealedGossipEvent.create(
+            event = senderMessage,
+            encryptTo = receiverB.pubKey.toHexKey(),
+            privateKey = sender.privKey!!
+        )
+
+        val encMsgFromSenderToSender = SealedGossipEvent.create(
+            event = senderMessage,
+            encryptTo = sender.pubKey.toHexKey(),
+            privateKey = sender.privKey!!
+        )
+
+        // Should expose sender
+        assertEquals(encMsgFromSenderToReceiverA.pubKey, sender.pubKey.toHexKey())
+        // Should not expose receiver
+        assertTrue(encMsgFromSenderToReceiverA.tags.isEmpty())
+
+        // Should expose sender
+        assertEquals(encMsgFromSenderToReceiverB.pubKey, sender.pubKey.toHexKey())
+        // Should not expose receiver
+        assertTrue(encMsgFromSenderToReceiverB.tags.isEmpty())
+
+        // Should expose sender
+        assertEquals(encMsgFromSenderToSender.pubKey, sender.pubKey.toHexKey())
+        // Should not expose receiver
+        assertTrue(encMsgFromSenderToSender.tags.isEmpty())
+
+        val giftWrapEventForReceiverA = GiftWrapEvent.create(
+            event = encMsgFromSenderToReceiverA,
+            recipientPubKey = receiverA.pubKey.toHexKey()
+        )
+
+        val giftWrapEventForReceiverB = GiftWrapEvent.create(
+            event = encMsgFromSenderToReceiverB,
+            recipientPubKey = receiverB.pubKey.toHexKey()
+        )
+
+        // Should not be signed by neither sender nor receiver
+        assertNotEquals(giftWrapEventForReceiverA.pubKey, sender.pubKey.toHexKey())
+        assertNotEquals(giftWrapEventForReceiverA.pubKey, receiverA.pubKey.toHexKey())
+        assertNotEquals(giftWrapEventForReceiverA.pubKey, receiverB.pubKey.toHexKey())
+
+        // Should not include sender as recipient
+        assertNotEquals(giftWrapEventForReceiverA.recipientPubKey(), sender.pubKey.toHexKey())
+
+        // Should be addressed to the receiver
+        assertEquals(giftWrapEventForReceiverA.recipientPubKey(), receiverA.pubKey.toHexKey())
+
+        // Should not be signed by neither sender nor receiver
+        assertNotEquals(giftWrapEventForReceiverB.pubKey, sender.pubKey.toHexKey())
+        assertNotEquals(giftWrapEventForReceiverB.pubKey, receiverA.pubKey.toHexKey())
+        assertNotEquals(giftWrapEventForReceiverB.pubKey, receiverB.pubKey.toHexKey())
+
+        // Should not include sender as recipient
+        assertNotEquals(giftWrapEventForReceiverB.recipientPubKey(), sender.pubKey.toHexKey())
+
+        // Should be addressed to the receiver
+        assertEquals(giftWrapEventForReceiverB.recipientPubKey(), receiverB.pubKey.toHexKey())
+
+        val giftWrapEventToSender = GiftWrapEvent.create(
+            event = encMsgFromSenderToSender,
+            recipientPubKey = sender.pubKey.toHexKey()
+        )
+
+        // Should not be signed by neither the sender, not the receiver
+        assertNotEquals(giftWrapEventToSender.pubKey, sender.pubKey.toHexKey())
+        assertNotEquals(giftWrapEventToSender.pubKey, receiverA.pubKey.toHexKey())
+        assertNotEquals(giftWrapEventToSender.pubKey, receiverB.pubKey.toHexKey())
+
+        // Should not be addressed to the receiver
+        assertNotEquals(giftWrapEventToSender.recipientPubKey(), receiverA.pubKey.toHexKey())
+        assertNotEquals(giftWrapEventToSender.recipientPubKey(), receiverB.pubKey.toHexKey())
+        // Should be addressed to the sender
+        assertEquals(giftWrapEventToSender.recipientPubKey(), sender.pubKey.toHexKey())
+
+        println(senderMessage.toJson())
+        println(encMsgFromSenderToReceiverA.toJson())
+        println(encMsgFromSenderToReceiverB.toJson())
+        println(giftWrapEventForReceiverA.toJson())
+        println(giftWrapEventForReceiverB.toJson())
+        println(giftWrapEventToSender.toJson())
+
+        val unwrappedMsgForSenderBySender = giftWrapEventToSender.unwrap(sender.privKey!!)
+        val unwrappedMsgForReceiverBySenderA = giftWrapEventForReceiverA.unwrap(sender.privKey!!)
+        val unwrappedMsgForReceiverBySenderB = giftWrapEventForReceiverB.unwrap(sender.privKey!!)
+
+        assertNotNull(unwrappedMsgForSenderBySender)
+        assertNull(unwrappedMsgForReceiverBySenderA)
+        assertNull(unwrappedMsgForReceiverBySenderB)
+
+        val unwrappedMsgForSenderByReceiverA = giftWrapEventToSender.unwrap(receiverA.privKey!!)
+        val unwrappedMsgForReceiverAByReceiverA = giftWrapEventForReceiverA.unwrap(receiverA.privKey!!)
+        val unwrappedMsgForReceiverBByReceiverA = giftWrapEventForReceiverB.unwrap(receiverA.privKey!!)
+
+        assertNull(unwrappedMsgForSenderByReceiverA)
+        assertNotNull(unwrappedMsgForReceiverAByReceiverA)
+        assertNull(unwrappedMsgForReceiverBByReceiverA)
+
+        val unwrappedMsgForSenderByReceiverB = giftWrapEventToSender.unwrap(receiverB.privKey!!)
+        val unwrappedMsgForReceiverAByReceiverB = giftWrapEventForReceiverA.unwrap(receiverB.privKey!!)
+        val unwrappedMsgForReceiverBByReceiverB = giftWrapEventForReceiverB.unwrap(receiverB.privKey!!)
+
+        assertNull(unwrappedMsgForSenderByReceiverB)
+        assertNull(unwrappedMsgForReceiverAByReceiverB)
+        assertNotNull(unwrappedMsgForReceiverBByReceiverB)
+
+        assertEquals(SealedGossipEvent.kind, unwrappedMsgForSenderBySender?.kind)
+        assertEquals(SealedGossipEvent.kind, unwrappedMsgForReceiverAByReceiverA?.kind)
+        assertEquals(SealedGossipEvent.kind, unwrappedMsgForReceiverBByReceiverB?.kind)
+
+        assertTrue(unwrappedMsgForSenderBySender is SealedGossipEvent)
+        assertTrue(unwrappedMsgForReceiverAByReceiverA is SealedGossipEvent)
+        assertTrue(unwrappedMsgForReceiverBByReceiverB is SealedGossipEvent)
+
+        if (unwrappedMsgForSenderBySender is SealedGossipEvent &&
+            unwrappedMsgForReceiverAByReceiverA is SealedGossipEvent &&
+            unwrappedMsgForReceiverBByReceiverB is SealedGossipEvent
+        ) {
+            val unwrappedGossipToSenderByReceiverA = unwrappedMsgForSenderBySender.unseal(receiverA.privKey!!)
+            val unwrappedGossipToReceiverAByReceiverA = unwrappedMsgForReceiverAByReceiverA.unseal(receiverA.privKey!!)
+            val unwrappedGossipToReceiverBByReceiverA = unwrappedMsgForReceiverBByReceiverB.unseal(receiverA.privKey!!)
+
+            assertNull(unwrappedGossipToSenderByReceiverA)
+            assertNotNull(unwrappedGossipToReceiverAByReceiverA)
+            assertNull(unwrappedGossipToReceiverBByReceiverA)
+
+            val unwrappedGossipToSenderByReceiverB = unwrappedMsgForSenderBySender.unseal(receiverB.privKey!!)
+            val unwrappedGossipToReceiverAByReceiverB = unwrappedMsgForReceiverAByReceiverA.unseal(receiverB.privKey!!)
+            val unwrappedGossipToReceiverBByReceiverB = unwrappedMsgForReceiverBByReceiverB.unseal(receiverB.privKey!!)
+
+            assertNull(unwrappedGossipToSenderByReceiverB)
+            assertNull(unwrappedGossipToReceiverAByReceiverB)
+            assertNotNull(unwrappedGossipToReceiverBByReceiverB)
+
+            val unwrappedGossipToSenderBySender = unwrappedMsgForSenderBySender.unseal(sender.privKey!!)
+            val unwrappedGossipToReceiverABySender = unwrappedMsgForReceiverAByReceiverA.unseal(sender.privKey!!)
+            val unwrappedGossipToReceiverBBySender = unwrappedMsgForReceiverBByReceiverB.unseal(sender.privKey!!)
+
+            assertNotNull(unwrappedGossipToSenderBySender)
+            assertNull(unwrappedGossipToReceiverABySender)
+            assertNull(unwrappedGossipToReceiverBBySender)
+
+            assertEquals("Who is going to the party tonight?", unwrappedGossipToReceiverAByReceiverA?.content)
+            assertEquals("Who is going to the party tonight?", unwrappedGossipToReceiverBByReceiverB?.content)
+            assertEquals("Who is going to the party tonight?", unwrappedGossipToSenderBySender?.content)
+        } else {
+            fail()
+        }
+    }
+
+    @Test
+    fun testCaseFromAmethyst1() {
+        val json = """
+ {
+    "content":"{\"ciphertext\":\"AaTN5Mt7AOeMosjHeLfai89kmvW/qJ7W2VMttAwuh6hwRGV+ylJhpDbdVRhVmkCotbDjBgS6xioLrSDcdSngFOiVMHS5dTAP0MkQv09aZlBh/NgdmyfHHd24YlHPkDuF5Yb4Vmz7kq/vmjsNZvDrTen3TG2DcEoTV9GKexdMEqyBA4LsB2DLnWfpvOi0olDkGjPGSteTaU1nCdOtN8knoEKumrxwevvbygKphorvKX/j3ojMMb0AceJM6Cr6TRIvSsQnKGEv5V8qbC/uIrQoH3N108Fd/2SY2MWuyLKRnuak9F/w82MV13elq8ngyjcktLYM5yrPg5nrxZlyJsV8D7V/g/bvhoL+UmWe0XoCR5LXzy77SfIkgA1ePKEfGp5sD2CVIzXt9zHdFwGxAKZuyB4qwrRaAFrS2xx+Bw4nnEmF6V9NhfheSCmGzTILuTePx4ubvnYw/j8Hmqd6UvM3DBNnlJ3D6po0blirfWvMe/ea+Em4CMXfq8Iq+7r4gRx8azADygKeJ+C89GTBEvS9EvgrXCVfTMVTcFc44YAZhekOqYY1BOZgfxIV4gUiJfpMMd4B9MQv/tmnewrpTsq1reSQQcEW/mXT2cnMeCZbAIJSPg8usZ30QlrH+np+YSzFKWYDP1kThcV0ElEE2Ne8KaUUFIRE5KmhBQc/qtORefCpne5s7V7J5vLjT5rinsDzzENB1XVlmY1Icx42raP5tGAL1gOK5gRHLvtcgFQR3WcDRYaNqELiYxx41j9w9lz5e00Ttla255rZkb760KSLaBFBss6wYGiYCabVgtBNpkExpCFPPEd5eAZa5rNK2QrnojYsdxEnlicF6A+zSChLy/TbzxYwyQywDfoF9F8kBakPZkAhsciQViCii2KlieRq4OgJFZGndmnS82hyPqsoJIm22vWr1iqMvSBHo/9cLj/r+lfmGVOdgM62JHckPZjOLS0QWIb9gQiT+zXZG22+eZElMYbGXVpR1dyMaQtde8ivEVVLas6kMCVKaDTHEFglaCBXjJ3RNJv73HsG1kb0rMmOj8ltbBakjHpv7M59amavuu6SReYt\",\"nonce\":\"6anNjUdNwW6MNfoKzRZcz1R09N1h8G4L\",\"v\":1}",
+    "created_at":1690660515,
+    "id":"d90739741c2f5a8c1a03aab5dc219c0b708ed6b0566044495731cd0307cf19a5",
+    "kind":1059,
+    "pubkey":"a79b7162f8ebb9c9f7aa65a48977ab7f32aa097520bc543e4d625812154ff6af",
+    "sig":"9b012504e779632a2a1f55562fa9a85f8ae6245cbc149b83d25b2971249053abc77f65cc068e5d025b871d743678265fede70de4eaf5af642e675a5b6210077d",
+    "tags":[
+       [
+          "p",
+          "c55f0b0cb4dd180dd4395867b28dd4c208b709144a69fb7c31a46c369a5ad1c6"
+       ]
+    ]
+ }
+        """.trimIndent()
+
+        val privateKey = "de6152a85a0dea3b09a08a6f8139a314d498a7b52f7e5c28858b64270abd4c70"
+        val gossip = unwrapUnsealGossip(json, privateKey)
+
+        assertNotNull(gossip)
+        assertEquals("Hola, que tal?", gossip?.content)
+    }
+
+    @Test
+    fun testCaseFromAmethyst2() {
+        val json = """
+{
+    "content":"{\"ciphertext\":\"Zb0ZNYAcDG5y7BiCWgbxY/i7rN7TxPwr3Oaste6em4VcetuenaMu2SyH6OuCCxxmIa7kFennJD8ZCrev0086azsPNutl9I6OCoOfDQb2GoFaLoJAkE/FuW0uEoEJuN72KsKj05HEjOM6nqL2KiW0pxTCNmlGpweMwpXQdm2ItWkybNpq8+b4NJUDee2czBUd9Kr2ELbPISTYzA17z1IzPXGQw8c73NL+QX9I/QZjM/agqX2x5q11SU52xiRyVd9zHf7TMctZI4QEsqDB6xi54D1bAeZlMhVdcpQRpGDfqRz3KXFlhB3Bwdc8GLgY0aLTn6tJs4qrHP3mQkxFYk0mju0afoc0rloMEUHcBVtM18S9OrTPqfmSqFTQsjaT8g+PkmeiLBo1sXsMCS62w0abSZD9OzQtciMz70ZpcWoLjx5f8panjFClvg4tJ8czMURIHM/IFS1uKAUHBArGN8QpCw8MXQBblpyLDiEkFcSX334Zdps0OIw4z328JSdeejyRh4ks+NHDt9FcjC4iicEqfEh8OTkXuKqEAVkRyfAioNQxWQPnXDzMX0Q+BXvKzBA7NaEBDpbV36H/KnrpBBQwokV9/Byb6Seh3g6GSqRAWD3U6Nk2aBMXkD0xY8vnIqMckBeYHxn8BW7k1FdXFC9lE5xCxWZHkmksJ4f0NVaF37O6d8qOe6RK7bfUeF8/SouJEu+eEX1f4KCMboslwkdk8QA8bThGcRGn8GQBMrPKrpZwHYNyyH8jwt9pywigXJejRLDDnDp3FH/3dbZy5CfuNH6KGydf/O5xx1r316so1UPO1mL5LHJUFZVIaMaMMUsgq12gpI0lLEh5NJPpsi9e3ibkzEZGf7FlAJjJQURbQ8xacN7R+w3GWKbJNHiQbUZ2lXo6fwz33t0DrSqEW970yWPHlqxcpd27EI+qqb5IqfklQZ3RObZZBhzDvImaCPG+U7SmgLhPxnilpGjd5lw/ttiqJhPG9mYFMf1eJXSG+Q9VVkGzN7jxXYtx0q0WGjVq98ZGv5RSnF1d9+QVGCd1fiPS3rsaWdYWly8l0y2quYObJ6Mv3Wh3\",\"nonce\":\"/Q2UTTjVZthm/atcCuDjU1e4reF+ZSgZ\",\"v\":1}",
+    "created_at":1690660515,
+    "id":"087d9627d63135a5050758a69222e566c86702e930c9905f0b93ccd6bebeca3f",
+    "kind":1059,
+    "pubkey":"e59c00796ae2aa9077fc8bcd57fe8d32c0fc363f7c8b93d055c70804ffff3772",
+    "sig":"807cb641c314ca6910aaeefadcf87d859137520be1039eb40e39832ed59d456fdd800c5f88bba09e1b395ee90c66d5330847bdd010b63be9919bf091adbc2c2a",
+    "tags":[
+       [
+          "p",
+          "f85f315c06aaf19c2b30a96ca80d9644720655ee8d3ec43b84657a7c98f36a23"
+       ]
+    ]
+}
+        """.trimIndent()
+
+        val privateKey = "409ff7654141eaa16cd2161fe5bd127aeaef71f270c67587474b78998a8e3533"
+        val gossip = unwrapUnsealGossip(json, privateKey)
+
+        assertNotNull(gossip)
+        assertEquals("Hola, que tal?", gossip?.content)
+    }
+
+    @Test
+    fun testDecryptFromCoracle() {
+        val json = """
+{
+  "content": "{\"ciphertext\":\"fo0/Ywyfu86cXKoOOeFFlMRv+LYM6GJUL+F/J4ARv6EcAufOZP46vimlurPBLPjNgzuGemGjlTFfC3vtq84AqIsqFo3dqKunq8Vp+mmubvxIQUDzOGYvM0WE/XOiW5LEe3U3Vq399Dq07xRpXELcp4EZxGyu4Fowv2Ppb4SKpH8g+9N3z2+bwYcSxBvI6SrL+hgmVMrRlgvsUHN1d53ni9ehRseBqrLj/DqyyEiygsKm6vnEZAPKnl1MrBaVOBZmGsyjAa/G4SBVVmk78sW7xWWvo4cV+C22FluDWUOdj/bYabH4aR4scnBX3GLYqfLuzGnuQlRNsb5unXVX41+39uXzROrmNP6iYVyYxy5tfoyN7PPZ4osoKpLDUGldmXHD6RjMcAFuou4hXt2JlTPmXpj/x8qInXId5mkmU4nTGiasvsCIpJljbCujwCjbjLTcD4QrjuhMdtSsAzjT0CDv5Lmc632eKRYtDu/9B+lkqBBkp7amhzbqp8suNTnybkvbGFQQGEQnsLfNJw/GGopAuthfi8zkTgUZR/LxFR7ZKAX73G+5PQSDSjPuGH/dQEnsFo45zsh1Xro8SfUQBsPphbX2GS31Lwu5vA30O922T4UiWuU+EdNgZR0JankQ5NPgvr1uS56C3v84VwdrNWQUCwC4eYJl4Mb/OdpEy9qwsisisppq6uuzxmxd1qx3JfocnGsvB7h2g2sG+0lyZADDSobOEZEKHaBP3w+dRcJW9D95EmzPym9GO0n+33OfqFQbda7G0rzUWfPDV0gXIuZcKs/HmDqepgIZN8FG7JhRBeAv0bCbKQACre0c8tzVEn5yCYemltScdKop3pC/r6gH50jRhAlFAiIKx8R+XwuMmJRqOcH4WfkpZlfVU85/I0XJOCHWKk6BnJi/NPP9zYiZiJe+5LecqMUVjtO0YAlv138+U/3FIT/anQ4H5bjVWBZmajwf\",\"nonce\":\"Mv70S6jgrs4D1rlqV9b5DddiymGAcVVe\",\"v\":1}",
+  "created_at": 1690528373,
+  "id": "6b108e4236c3c338236ee589388ce0f91f921e1532ae52e75d1d2add6f8e691a",
+  "kind": 1059,
+  "pubkey": "627dc0248335e2bf9adac14be9494139ebbeb12c422d7df5b0e3cd72d04c209c",
+  "sig": "be11da487196db298e4ffb7a03e74176c37441c88b39c95b518fadce6fd02f23c58b2c435ca38c24d512713935ab719dae80bf952267630809e1f84be8e95174",
+  "tags": [
+    [
+      "p",
+      "e7764a227c12ac1ef2db79ae180392c90903b2cec1e37f5c1a4afed38117185e"
+    ]
+  ],
+  "seenOn": [
+    "wss://relay.damus.io/"
+  ]
+}
+        """.trimIndent()
+
+        val privateKey = "09e0051fdf5fdd9dd7a54713583006442cbdbf87bdcdab1a402f26e527d56771"
+        val gossip = unwrapUnsealGossip(json, privateKey)
+
+        assertNotNull(gossip)
+        assertEquals("test", gossip?.content)
+    }
+
+    @Test
+    fun testFromCoracle2() {
+        val json = """
+{
+  "content": "{\"ciphertext\":\"Hn/dHo/I8Qk6QWWAiKyo/SfKJqQfHdV0O5tMmgqMyfHrsFoDY6IhGQP2EgCJ/6HsNQyO/8EMAmLW8w0PbDKlBKYGKGpaMwCA6B1r0rLjvu+149RJZuggRNm9rd7tNVNkNs38iqt1KYD++bohePm52q+VhAQikbX2gTONV82ROwZylAg9vjvMnYkDt45g6N97s9FRB6V7YMiUEtJnneMixa6klucpUuenQ4569tyt5vnUMD2VNhKYCc2jit2hf7k0DIhvZrVC3OdopUvxIuYYWr3r7XpuEB3HJ6Ji3ajHPzgGeFcItBR7uKZ9s6XU34F3keyZbxrv3yWHFM5NrOctAdZexSGpqWRW93M0KZUAp9HgQh3YzMLl8xt0mcrVywCgjU6Kx8IwkI0bjPU+Am8acY3cItted6hZQ4Vy1xFITdKVfPWDl3Ab59iBg9+IkY5C31wqsKPgPVVycwQE6UpaGW74gy3qZshwyoo01owvEIbVvrSJWXH7EUVvndDPvUbo+f+EVa84IEwVjPmY2oR7VsxVfqRBdmPg23OSw/9rzVybmruqaQHd3xrTTEcnG0qBc/ugCXsiuILTeScOovEnqIlKKK3KB36jMtdScdJB+b4YrzJInY1AvqU7IAgqe0vmo1LdbMtj7kjuxkXJhhQsunAbTvPigTrsOfJ08P9l7r/95kpxudgagEaW7XAjYVfLphseJT3Iy1IuQEyG5sshQ+pl/CYvkGide7ykHwm9pjSBVkD9Mdcn5X6lSnLNJEcwY43pz43r6Kq3L09qneILY3DSKyQ16Zcu1MiAMAM5r6JGvpAHqcMmixi9ORuiryjteTmY4L0vI7b3W/0RSUblXxUrb8IpeysBrFmiKJBgCoU0r/D/8tgR+Eewyp1qxKI4SfKG5GFH40zZ2oVvKyoHAR4x1oVDp/MttcnxkzAsCFL6QuJC9A/vImjsumpmYB/EChcZCOAsfqkuzH4VSjZx\",\"nonce\":\"K537d+7m5tUcXZfkr3Qk2J2G86vdBMmY\",\"v\":1}",
+  "created_at": 1690655012,
+  "id": "c4f97c6332b0a63912c44c9e1f8c7b23581dc67a8489ec1522ec205fea7133db",
+  "kind": 1059,
+  "pubkey": "8def03a22b1039256a3883d46c7ccd5562f61743100db401344284547de7ec61",
+  "sig": "25dcf24bdda99c04abc72274d9f7a30538a4a00a70ac4b39db4082b73823979858df93cd649c25edfb759857eac46ed70bb9ad0598f2e011d733a5a382bc4def",
+  "tags": [
+    [
+      "p",
+      "e7764a227c12ac1ef2db79ae180392c90903b2cec1e37f5c1a4afed38117185e"
+    ]
+  ]
+}
+        """.trimIndent()
+
+        val privateKey = "09e0051fdf5fdd9dd7a54713583006442cbdbf87bdcdab1a402f26e527d56771"
+
+        val gossip = unwrapUnsealGossip(json, privateKey)
+
+        assertEquals("asdfasdfasdf", gossip?.content)
+        assertEquals(1690659269L, gossip?.createdAt)
+        assertEquals("827ba09d32ab81d62c60f657b350198c8aaba84372dab9ad3f4f6b8b7274b707", gossip?.id)
+        assertEquals(14, gossip?.kind)
+        assertEquals("subject", gossip?.tags?.firstOrNull()?.get(0))
+        assertEquals("test", gossip?.tags?.firstOrNull()?.get(1))
+    }
+
+    @Test
+    fun testFromCoracle3() {
+        val json = """
+{
+  "content": "{\"ciphertext\":\"PGCodiacmCB/sClw0C6DQRpP/XIfNAKCVZdKLQpOqytgbFryhs9Z+cPldq2FajXzxs3jQsF7/EVQyWpuV8pXetvFT9tvzjg4Xcm7ZcooLUnAeAo2xZNcJontN4cGubuDqKuXy5n59yXP1fIxfnJxRTRRdCZ2edhsKeNR5NSByUi+StjV10rnfHt8AhZCpiXiZ/giTOsC4wdaeONPgMzMeljaJWLvl6n11VjmXhkx1mXIQt43CNB1hIqO3p89Mbd9p+nlLrOsR+Xs0TB4DCh4XTPbvgf7B7Z+PgOfl3GZfJy9x6TciLcF4E3Ba1zrPe4f79czCIEiJ1yrIKrzzYvv+it35DZQ8fgveFXpyHnNL29hml8PNjyOsFbCHVYLMGw88evI5PijOcpe1TtdoioX8kX5kVEQSKJXuoSjTorvbRPCgGzaa1m0J0uTpzri5VD22a/Jh2CcAnubg6w4JDdUWCogdSV3NqiJllo7ZF7WnZ3apPdRD23MEfphVBJrcLBUNlmwajnY5IvVTKTkZOP50r9dBapvMWXIo6M6zhy/5vVWJz57863pelYCRG4upaXZuNK9sMBtbiphxmFR83i8RML8KN8Q391Cd/xBN7TxJNo5p2YU25VeGZUAmHY8DYlMQDm8Br0nStAXp3T+DzTRL8FTECa8DJV+KTAPoCxqhv3B28Ehr0XAP75CsHoLU00G48cR7h3vQ0CnfKh6KXU6nnDA5OWfpMYpirACCpsnpSD0OaCQ3gkQp3zZNMS3HcOpnPK/IY7R0esbzgAkvNhkyxaIfPDdf+eRUSOA9+2Ji28MwjjY8Dw3SLdUqCOzIDjQeR/T5oNmaQJm3lZ8G0FxxC6ejD4VJX/NI/x+STeB9jWHWmHZvqKzV6JHNh6qmZb6TKSIPOHpafWFoeJFOmiiigf46sju9vRXmVEAx59HXWnvnvCBNJg877yCMulB6xyQuSdVDuotQU4tQZwCKedTHJ6GqjesM98UlJrDtdWQURwwW1qc7N8tS6PukmUVEf0jmbIWVIBmUlkcVuiSs1g1h1kjt8c4MnGTz3CSgpOd1MqxLrl9WwrTqM+YnE+yeZYUjFoewyKZIQ==\",\"nonce\":\"OdCZczJiUGR4bOGIElQ4UUH4dQmG5U/3\",\"v\":1}",
+  "kind": 1059,
+  "created_at": 1690772945,
+  "pubkey": "e01475e87896800b7285eb0daf263c59f811c8fc5bc8daa105d2c98b6d7c4952",
+  "tags": [
+    [
+      "p",
+      "b08d8857a92b4d6aa580ff55cc3c18c4edf313c83388c34abc118621f74f1a78"
+    ]
+  ],
+  "id": "d9fc85ece892ce45ffa737b3ddc0f8b752623181d75363b966191f8c03d2debe",
+  "sig": "1b20416b83f4b5b8eead11e29c185f46b5e76d1960e4505210ddd00f7a6973cc11268f52a8989e3799b774d5f3a55db95bed4d66a1b6e88ab54becec5c771c17"
+}
+        """.trimIndent()
+
+        val privateKey = "7dd22cafc512c0bc363a259f6dcda515b13ae3351066d7976fd0bb79cbd0d700"
+
+        val gossip = unwrapUnsealGossip(json, privateKey)
+
+        assertEquals("8d1a56008d4e31dae2fb8bef36b3efea519eff75f57033107e2aa16702466ef2", gossip?.id)
+        assertEquals("Howdy", gossip?.content)
+        assertEquals(1690833960L, gossip?.createdAt)
+        assertEquals(14, gossip?.kind)
+        assertEquals("p", gossip?.tags?.firstOrNull()?.get(0))
+        assertEquals("b08d8857a92b4d6aa580ff55cc3c18c4edf313c83388c34abc118621f74f1a78", gossip?.tags?.firstOrNull()?.get(1))
+        assertEquals("subject", gossip?.tags?.getOrNull(1)?.get(0))
+        assertEquals("Stuff", gossip?.tags?.getOrNull(1)?.get(1))
+    }
+
+    fun unwrapUnsealGossip(json: String, privateKey: HexKey): Gossip? {
+        val pkBytes = privateKey.hexToByteArray()
+
+        val wrap = Event.fromJson(json, Client.lenient) as GiftWrapEvent
+        wrap.checkSignature()
+
+        assertEquals(CryptoUtils.pubkeyCreate(pkBytes).toHexKey(), wrap.recipientPubKey())
+
+        val event = wrap.unwrap(pkBytes)
+        assertNotNull(event)
+
+        return if (event is SealedGossipEvent) {
+            return event.unseal(pkBytes)
+        } else {
+            println(event?.toJson())
+            fail("Event is not a Sealed Gossip")
+            null
+        }
+    }
+}

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

@@ -668,7 +668,7 @@ class RichTextParserTest {
     fun testTextToParse() {
         val state = RichTextParser().parseText(textToParse, ImmutableListOfLists())
         Assert.assertEquals(
-            "relay.shitforce.one, relayable.org, universe.nostrich.land, nos.lol, universe.nostrich.land?lang=zh, universe.nostrich.land?lang=en, relay.damus.io, relay.nostr.wirednet.jp, offchain.pub, nostr.rocks, relay.wellorder.net, nostr.oxtr.dev, universe.nostrich.land?lang=ja, relay.mostr.pub, nostr.bitcoiner.social, ⚡41.7M, Nostr-Check.com, MR.Rabbit, Ancap.su, ⚡️satscoinsv@getalby.com, miceliomad@miceliomad.github.io/nostr/, zapper.lol, smies.me, baller.hodl",
+            "relay.shitforce.one, relayable.org, universe.nostrich.land, nos.lol, universe.nostrich.land?lang=zh, universe.nostrich.land?lang=en, relay.damus.io, relay.nostr.wirednet.jp, offchain.pub, nostr.rocks, relay.wellorder.net, nostr.oxtr.dev, universe.nostrich.land?lang=ja, relay.mostr.pub, nostr.bitcoiner.social, Nostr-Check.com, MR.Rabbit, Ancap.su, zapper.lol, smies.me, baller.hodl",
             state.urlSet.joinToString(", ")
         )
 
@@ -806,134 +806,101 @@ class RichTextParserTest {
             "HashTag(#bitcoin,)",
             "RegularText(1.7K,)",
             "RegularText(109)",
-            "RegularText()",
             "HashTag(#concussion,)",
             "RegularText(1.1K,)",
             "RegularText(25)",
-            "RegularText()",
             "HashTag(#press,)",
             "RegularText(0.9K,)",
             "RegularText(65)",
-            "RegularText()",
             "HashTag(#france,)",
             "RegularText(492,)",
             "RegularText(46)",
-            "RegularText()",
             "HashTag(#presse,)",
             "RegularText(480,)",
             "RegularText(42)",
-            "RegularText()",
             "HashTag(#covid19,)",
             "RegularText(465,)",
             "RegularText(65)",
-            "RegularText()",
             "HashTag(#nostr,)",
             "RegularText(414,)",
             "RegularText(109)",
-            "RegularText()",
             "HashTag(#zapathon,)",
             "RegularText(386,)",
             "RegularText(76)",
-            "RegularText()",
             "HashTag(#rssfeed,)",
             "RegularText(309,)",
             "RegularText(53)",
-            "RegularText()",
             "HashTag(#btc,)",
             "RegularText(299,)",
             "RegularText(109)",
-            "RegularText()",
             "HashTag(#news,)",
             "RegularText(294,)",
             "RegularText(91)",
-            "RegularText()",
             "HashTag(#zap,)",
             "RegularText(283,)",
             "RegularText(109)",
-            "RegularText()",
             "HashTag(#linux,)",
             "RegularText(253,)",
             "RegularText(88)",
-            "RegularText()",
             "HashTag(#respond,)",
             "RegularText(246,)",
             "RegularText(90)",
-            "RegularText()",
             "HashTag(#kompost,)",
             "RegularText(240,)",
             "RegularText(31)",
-            "RegularText()",
             "HashTag(#plebchain,)",
             "RegularText(236,)",
             "RegularText(109)",
-            "RegularText()",
             "HashTag(#gardenaward,)",
             "RegularText(236,)",
             "RegularText(31)",
-            "RegularText()",
             "HashTag(#start,)",
             "RegularText(236,)",
             "RegularText(31)",
-            "RegularText()",
             "HashTag(#unicef,)",
             "RegularText(233,)",
             "RegularText(32)",
-            "RegularText()",
             "HashTag(#coronavirus,)",
             "RegularText(233,)",
             "RegularText(33)",
-            "RegularText()",
             "HashTag(#bew,)",
             "RegularText(229,)",
             "RegularText(31)",
-            "RegularText()",
             "HashTag(#balkon,)",
             "RegularText(229,)",
             "RegularText(31)",
-            "RegularText()",
             "HashTag(#terrasse,)",
             "RegularText(229,)",
             "RegularText(31)",
-            "RegularText()",
             "HashTag(#braininjuryawareness,)",
             "RegularText(229,)",
             "RegularText(24)",
-            "RegularText()",
             "HashTag(#garten,)",
             "RegularText(220,)",
             "RegularText(21)",
-            "RegularText()",
             "HashTag(#smart,)",
             "RegularText(220,)",
             "RegularText(21)",
-            "RegularText()",
             "HashTag(#nsfw,)",
             "RegularText(211,)",
             "RegularText(85)",
-            "RegularText()",
             "HashTag(#protoncalendar,)",
             "RegularText(206,)",
             "RegularText(31)",
-            "RegularText()",
             "HashTag(#stacksats,)",
             "RegularText(195,)",
             "RegularText(99)",
-            "RegularText()",
             "HashTag(#nokyc,)",
             "RegularText(179,)",
             "RegularText(98)",
             "RegularText()",
-            "RegularText()",
             "RegularText(Emoji sentiment today)",
             "RegularText()",
             "RegularText(⚡ (1.6K) 👉 (1.4K) 🇪🇺 (1.2K) 🫂 (1.2K) 🇺🇸 (1.1K) 💜 (875) 🧠 (858) 😂 (830) 🔥 (690) 🤣 (566) 🤙 (525) ☕ (444) 👇 (443) 🙌🏻 (425) ☀ (307) 😎 (305) 🥳 (301) 🤔 (276) 🌻 (270) 🧡 (270) 🥇 (269) 🗓 (269) 🙏 (268) 🏆 (267) 🌱 (264) 📰 (230) 🏉 (221) 😭 (220) 💰 (219) 🔗 (209) 👀 (201) 😅 (199) ✨ (193) 🇷🇺 (182) 💪 (167) ✅ (164) 💤 (163) 🐶 (151) 🇨🇭 (141) 📝 (137) 😁 (136) 🌞 (136) 🐾 (136) ❤ (132) 💻 (126) 🚀 (125) 👍 (125) 🇧🇷 (125) 😊 (121) 📚 (120) ➡ (120) 👏 (118) 🎉 (117) 🎮 (115) 🤷 (113) 👋 (112) 💃 (108) 🕺🏻 (106) 💡 (104) 🚨 (99) 😆 (97) 💯 (95) ⚠ (92) 📢 (92) 🤗 (89) 😴 (87) 🔁 (83) 🐰 (81) 😀 (79) 🎟 (78) ⛏ (78) 🐦 (76) 💸 (76) ✌🏻 (75) 🤍 (73) 🇬🇧 (73) 🌽 (70) 🤡 (69) 🤮 (69) ❗ (66) 🤝 (65) 😉 (65) 🙇 (65) 🍻 (64) 🌍 (64) 💕 (63) 🌸 (62) 💬 (61) ☺ (61) 🇦🇷 (59) 🇮🇩 (57) 😳 (57) 😄 (57) 🎶 (57) 🥷🏻 (56) 🎵 (56) 😃 (56) 🔍 (55) 💥 (55) 🎲 (54) ✍ (54) 🕒 (53) ⬇ (53) 💙 (51) 🔒 (50) 📈 (50) 🪙 (50) 🌧 (50) 🥰 (50) 🕸 (50) 🌐 (50) 💭 (49) 🌙 (49) 😍 (49) 📱 (48) 🌟 (48) 🤩 (48) 💔 (47) 🔌 (47) 😋 (47) 🎖 (47) 🍣 (46) 📷 (46) 💼 (45) ⭐ (45) 🥔 (45) 🥺 (45) 👌 (44) 👷🏼 (43) 😱 (43) 📅 (43) 🤖 (43) 📸 (42) 📊 (42) 🦑 (40) 💵 (40) 🤦 (39) ❣ (38) 💎 (38) 🖤 (38) 📺 (37) 🇵🇱 (37) 🇯🇵 (36) 🔧 (36) 🤘 (36) 💖 (36) ‼ (35) 😢 (35) 😺 (34) 🔊 (34) 😏 (34) 🇸🇰 (34) 🏃 (34) 👩‍👧 (34) ⏰ (33) 👨‍💻 (33) 👑 (33) 👥 (32) 🖥 (32) 💨 (32) 💗 (31) 🇲🇽 (31) 📖 (31) 🚫 (31) 👊🏻 (31) 😡 (31) 🌎 (31) 👁 (30) 🗞 (30) 🍀 (30) 🍽 (29) 🐸 (29) 🥚 (29) 💩 (29) ✊🏾 (29) 😮 (29) 🌡 (29) 🙃 (28) 🔔 (28) 🇻🇪 (28) 💦 (28) 🎯 (28) 🎨 (28) 🍛 (28) 🖼 (27) ☝🏻 (27) 🛑 (27) 🙄 (27) 🧑🏻‍🤝‍🧑🏽 (27) 🌈 (27) 🥂 (26) 🇫🇮 (26) 🎥 (26) 😬 (26) 🥲 (25) 🦾 (24) 🤜 (24) 🙂 (24) 🖕 (24) 😩 (24) )",
             "RegularText()",
             "RegularText(Zap economy)",
             "RegularText()",
-            "Link(⚡41.7M)",
-            "RegularText(sats)",
-            "RegularText((₿0.417))",
-            "RegularText()",
+            "RegularText(⚡41.7M sats (₿0.417) )",
             "RegularText(1,816 zappers & 920 zapped (unique pubkeys))",
             "RegularText(🌩️ 33,248 zaps, 1,253 sats per zap (avg))",
             "RegularText()",
@@ -2248,7 +2215,7 @@ class RichTextParserTest {
             "HashTag(#214)",
             "RegularText(2%)",
             "RegularText(Satscoinsv,)",
-            "Link(⚡️satscoinsv@getalby.com)",
+            "RegularText(⚡️satscoinsv@getalby.com)",
             "RegularText(-)",
             "RegularText(80db64657ea0358c5332c5cca01565eeddd4b8799688b1c46d3cb2d7c966671f)",
             "HashTag(#215)",
@@ -2458,7 +2425,7 @@ class RichTextParserTest {
             "HashTag(#249)",
             "RegularText(2%)",
             "RegularText(micmad,)",
-            "Link(miceliomad@miceliomad.github.io/nostr/)",
+            "RegularText(miceliomad@miceliomad.github.io/nostr/)",
             "RegularText(-)",
             "RegularText(cd806edcf8ff40ea94fa574ea9cd97da16e5beb2b85aac6e1d648b8388504343)",
             "HashTag(#250)",
@@ -3805,7 +3772,7 @@ class RichTextParserTest {
             "HashTag(#471)",
             "RegularText(1%)",
             "RegularText(leonwankum,)",
-            "SchemelessUrl(@leonawankum@BitcoinNostr.com)",
+            "RegularText(@leonawankum@BitcoinNostr.com)",
             "RegularText()",
             "RegularText(-)",
             "RegularText(652d58acafa105af8475c0fe8029a52e7ddbc337b2bd9c98bb17a111dc4cde60)",
@@ -4098,7 +4065,6 @@ https://nostr.build/i/fd53fcf5ad950fbe45127e4bcee1b59e8301d41de6beee211f45e344db
             "RegularText(here:)",
             "Link(https://lnshort.it/live-stream-embeds/)",
             "RegularText()",
-            "RegularText()",
             "Image(https://nostr.build/i/fd53fcf5ad950fbe45127e4bcee1b59e8301d41de6beee211f45e344db214e8a.jpg)"
         )
 
@@ -4110,6 +4076,57 @@ https://nostr.build/i/fd53fcf5ad950fbe45127e4bcee1b59e8301d41de6beee211f45e344db
         }
     }
 
+    @Test
+    fun testNewLineAfterImage() {
+        val text = "That’s it ! That’s the #note https://cdn.nostr.build/i/1dc0726b6cb0f94a92bd66765ffb90f6c67e90c17bb957fc3d5d4782cbd73de7.jpg "
+
+        val state = RichTextParser().parseText(text, ImmutableListOfLists())
+
+        printStateForDebug(state)
+
+        val expectedResult = listOf<String>(
+            "RegularText(That’s)",
+            "RegularText(it)",
+            "RegularText(!)",
+            "RegularText(That’s)",
+            "RegularText(the)",
+            "HashTag(#note)",
+            "Image(https://cdn.nostr.build/i/1dc0726b6cb0f94a92bd66765ffb90f6c67e90c17bb957fc3d5d4782cbd73de7.jpg)"
+        )
+
+        state.paragraphs.map { it.words }.flatten().forEachIndexed { index, seg ->
+            Assert.assertEquals(
+                expectedResult[index],
+                "${seg.javaClass.simpleName.replace("Segment", "")}(${seg.segmentText})"
+            )
+        }
+    }
+
+    @Test
+    fun testSapceAfterImage() {
+        val text = "That’s it! https://cdn.nostr.build/i/1dc0726b6cb0f94a92bd66765ffb90f6c67e90c17bb957fc3d5d4782cbd73de7.jpg That’s the #note"
+
+        val state = RichTextParser().parseText(text, ImmutableListOfLists())
+
+        printStateForDebug(state)
+
+        val expectedResult = listOf<String>(
+            "RegularText(That’s)",
+            "RegularText(it!)",
+            "Image(https://cdn.nostr.build/i/1dc0726b6cb0f94a92bd66765ffb90f6c67e90c17bb957fc3d5d4782cbd73de7.jpg)",
+            "RegularText(That’s)",
+            "RegularText(the)",
+            "HashTag(#note)"
+        )
+
+        state.paragraphs.map { it.words }.flatten().forEachIndexed { index, seg ->
+            Assert.assertEquals(
+                expectedResult[index],
+                "${seg.javaClass.simpleName.replace("Segment", "")}(${seg.segmentText})"
+            )
+        }
+    }
+
     private fun printStateForDebug(state: RichTextViewerState) {
         state.paragraphs.forEachIndexed { index, paragraph ->
             paragraph.words.forEach { seg ->

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

@@ -99,4 +99,13 @@ class TranslationsTest {
             "en"
         )
     }
+
+    @Test
+    fun testEmoji() {
+        assertTranslateContains(
+            "https://cdn.nostr.build/i/df3783dcdf7dd289ba02ba538dc039c8fe1d4db055e580b81604ed88c6af4ee0.jpg",
+            "\uD83E\uDD23 https://cdn.nostr.build/i/df3783dcdf7dd289ba02ba538dc039c8fe1d4db055e580b81604ed88c6af4ee0.jpg ",
+            "pt"
+        )
+    }
 }

app/src/main/AndroidManifest.xml

@@ -34,6 +34,12 @@
     <!-- Keeps screen on while playing videos -->
     <uses-permission android:name="android.permission.WAKE_LOCK" />
 
+    <!-- This notification permission is needed for some phones -->
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
+
+    <!-- Adds Geohash to posts if active -->
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+
     <!-- Old permission to access media -->
     <uses-permission
         android:name="android.permission.WRITE_EXTERNAL_STORAGE"

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

@@ -6,10 +6,13 @@ import android.os.StrictMode.ThreadPolicy
 import android.os.StrictMode.VmPolicy
 
 class Amethyst : Application() {
+    @androidx.annotation.OptIn(androidx.media3.common.util.UnstableApi::class)
     override fun onCreate() {
         super.onCreate()
         instance = this
 
+        VideoCache.initFileCache(instance)
+
         if (BuildConfig.DEBUG) {
             StrictMode.setThreadPolicy(
                 ThreadPolicy.Builder()

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

@@ -10,7 +10,9 @@ import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.ConnectivityType
 import com.vitorpamplona.amethyst.model.GLOBAL_FOLLOWS
 import com.vitorpamplona.amethyst.model.KIND3_FOLLOWS
+import com.vitorpamplona.amethyst.model.Nip47URI
 import com.vitorpamplona.amethyst.model.RelaySetupInfo
+import com.vitorpamplona.amethyst.model.ServersAvailable
 import com.vitorpamplona.amethyst.model.Settings
 import com.vitorpamplona.amethyst.model.hexToByteArray
 import com.vitorpamplona.amethyst.model.parseConnectivityType
@@ -22,8 +24,6 @@ import com.vitorpamplona.amethyst.service.model.Event
 import com.vitorpamplona.amethyst.service.model.Event.Companion.getRefinedEvent
 import com.vitorpamplona.amethyst.service.model.LnZapEvent
 import com.vitorpamplona.amethyst.service.toNpub
-import com.vitorpamplona.amethyst.ui.actions.ServersAvailable
-import com.vitorpamplona.amethyst.ui.note.Nip47URI
 import fr.acinq.secp256k1.Hex
 import java.io.File
 import java.util.Locale

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

@@ -33,8 +33,11 @@ object PlaybackClientController {
 
             controllerFuture.addListener(
                 {
-                    val controller = controllerFuture.get()
-                    onReady(controller)
+                    try {
+                        onReady(controllerFuture.get())
+                    } catch (e: Exception) {
+                        Log.e("Playback Client", "Failed to load Playback Client for $videoUri", e)
+                    }
                 },
                 MoreExecutors.directExecutor()
             )

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

@@ -6,14 +6,9 @@ import androidx.media3.datasource.okhttp.OkHttpDataSource
 import androidx.media3.exoplayer.hls.HlsMediaSource
 import androidx.media3.exoplayer.source.MediaSource
 import androidx.media3.exoplayer.source.ProgressiveMediaSource
-import androidx.media3.session.DefaultMediaNotificationProvider
 import androidx.media3.session.MediaSession
 import androidx.media3.session.MediaSessionService
 import com.vitorpamplona.amethyst.service.HttpClient
-import kotlinx.coroutines.DelicateCoroutinesApi
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.launch
 
 @UnstableApi // Extend MediaSessionService
 class PlaybackService : MediaSessionService() {
@@ -28,39 +23,36 @@ class PlaybackService : MediaSessionService() {
     }
 
     fun newProgressiveDataSource(): MediaSource.Factory {
-        return ProgressiveMediaSource.Factory(VideoCache.get(applicationContext, HttpClient.getHttpClient()))
+        return ProgressiveMediaSource.Factory(VideoCache.get(Amethyst.instance, HttpClient.getHttpClient()))
     }
 
     // Create your Player and MediaSession in the onCreate lifecycle event
-    @kotlin.OptIn(DelicateCoroutinesApi::class)
     @OptIn(UnstableApi::class)
     override fun onCreate() {
         super.onCreate()
 
-        GlobalScope.launch(Dispatchers.IO) {
-            managerHls = MultiPlayerPlaybackManager(newHslDataSource(), videoViewedPositionCache)
-            managerProgressive = MultiPlayerPlaybackManager(newProgressiveDataSource(), videoViewedPositionCache)
-            managerLocal = MultiPlayerPlaybackManager(cachedPositions = videoViewedPositionCache)
+        managerHls = MultiPlayerPlaybackManager(newHslDataSource(), videoViewedPositionCache)
+        managerProgressive = MultiPlayerPlaybackManager(newProgressiveDataSource(), videoViewedPositionCache)
+        managerLocal = MultiPlayerPlaybackManager(cachedPositions = videoViewedPositionCache)
 
-            // Stop all videos and recreates all managers when the proxy changes.
-            HttpClient.proxyChangeListeners.add {
-                val toDestroyHls = managerHls
-                val toDestroyProgressive = managerProgressive
+        // Stop all videos and recreates all managers when the proxy changes.
+        HttpClient.proxyChangeListeners.add(this@PlaybackService::onProxyUpdated)
+    }
 
-                managerHls = MultiPlayerPlaybackManager(newHslDataSource(), videoViewedPositionCache)
-                managerProgressive = MultiPlayerPlaybackManager(newProgressiveDataSource(), videoViewedPositionCache)
+    private fun onProxyUpdated() {
+        val toDestroyHls = managerHls
+        val toDestroyProgressive = managerProgressive
 
-                toDestroyHls?.releaseAppPlayers()
-                toDestroyProgressive?.releaseAppPlayers()
-            }
+        managerHls = MultiPlayerPlaybackManager(newHslDataSource(), videoViewedPositionCache)
+        managerProgressive = MultiPlayerPlaybackManager(newProgressiveDataSource(), videoViewedPositionCache)
 
-            setMediaNotificationProvider(
-                DefaultMediaNotificationProvider.Builder(applicationContext).build()
-            )
-        }
+        toDestroyHls?.releaseAppPlayers()
+        toDestroyProgressive?.releaseAppPlayers()
     }
 
     override fun onDestroy() {
+        HttpClient.proxyChangeListeners.remove(this@PlaybackService::onProxyUpdated)
+
         managerHls?.releaseAppPlayers()
         managerLocal?.releaseAppPlayers()
         managerProgressive?.releaseAppPlayers()

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

@@ -8,6 +8,8 @@ import coil.ImageLoader
 import coil.decode.GifDecoder
 import coil.decode.ImageDecoderDecoder
 import coil.decode.SvgDecoder
+import coil.disk.DiskCache
+import coil.util.DebugLogger
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.service.HttpClient
@@ -17,6 +19,7 @@ import com.vitorpamplona.amethyst.service.NostrChatroomDataSource
 import com.vitorpamplona.amethyst.service.NostrChatroomListDataSource
 import com.vitorpamplona.amethyst.service.NostrCommunityDataSource
 import com.vitorpamplona.amethyst.service.NostrDiscoveryDataSource
+import com.vitorpamplona.amethyst.service.NostrGeohashDataSource
 import com.vitorpamplona.amethyst.service.NostrHashtagDataSource
 import com.vitorpamplona.amethyst.service.NostrHomeDataSource
 import com.vitorpamplona.amethyst.service.NostrSearchEventOrUserDataSource
@@ -28,6 +31,7 @@ import com.vitorpamplona.amethyst.service.NostrUserProfileDataSource
 import com.vitorpamplona.amethyst.service.NostrVideoDataSource
 import com.vitorpamplona.amethyst.service.relays.Client
 import com.vitorpamplona.amethyst.ui.actions.ImageUploader
+import java.io.File
 
 object ServiceManager {
     private var account: Account? = null
@@ -54,7 +58,8 @@ object ServiceManager {
                     add(GifDecoder.Factory())
                 }
                 add(SvgDecoder.Factory())
-            } // .logger(DebugLogger())
+            }.logger(DebugLogger())
+                .diskCache { SingletonDiskCache.get(context.applicationContext) }
                 .okHttpClient { HttpClient.getHttpClient() }
                 .respectCacheHeaders(false)
                 .build()
@@ -97,6 +102,7 @@ object ServiceManager {
 
         NostrCommunityDataSource.stop()
         NostrHashtagDataSource.stop()
+        NostrGeohashDataSource.stop()
         NostrSearchEventOrUserDataSource.stop()
         NostrSingleChannelDataSource.stop()
         NostrSingleEventDataSource.stop()
@@ -115,7 +121,32 @@ object ServiceManager {
             LocalCache.pruneOldAndHiddenMessages(it)
             LocalCache.pruneHiddenMessages(it)
             LocalCache.pruneContactLists(it)
-            // LocalCache.pruneNonFollows(it)
+            LocalCache.pruneRepliesAndReactions(it)
         }
     }
 }
+
+object SingletonDiskCache {
+
+    private const val DIRECTORY = "image_cache"
+    private var instance: DiskCache? = null
+
+    @Synchronized
+    fun get(context: Context): DiskCache {
+        return instance ?: run {
+            // Create the singleton disk cache instance.
+            DiskCache.Builder()
+                .directory(context.safeCacheDir.resolve(DIRECTORY))
+                .maxSizePercent(0.2)
+                .maximumMaxSizeBytes(500L * 1024 * 1024) // 250MB
+                .build()
+                .also { instance = it }
+        }
+    }
+}
+
+internal val Context.safeCacheDir: File
+    get() {
+        val cacheDir = checkNotNull(cacheDir) { "cacheDir == null" }
+        return cacheDir.apply { mkdirs() }
+    }

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

@@ -8,6 +8,7 @@ import androidx.media3.datasource.cache.LeastRecentlyUsedCacheEvictor
 import androidx.media3.datasource.cache.SimpleCache
 import androidx.media3.datasource.okhttp.OkHttpDataSource
 import okhttp3.OkHttpClient
+import java.io.File
 
 @UnstableApi object VideoCache {
 
@@ -21,17 +22,14 @@ import okhttp3.OkHttpClient
     lateinit var cacheDataSourceFactory: CacheDataSource.Factory
 
     @Synchronized
-    @androidx.annotation.OptIn(androidx.media3.common.util.UnstableApi::class)
-    private fun init(context: Context, client: OkHttpClient) {
+    fun initFileCache(context: Context) {
         exoDatabaseProvider = StandaloneDatabaseProvider(context)
 
         simpleCache = SimpleCache(
-            context.cacheDir,
+            File(context.cacheDir, "exoplayer"),
             leastRecentlyUsedCacheEvictor,
             exoDatabaseProvider
         )
-
-        renewCacheFactory(client)
     }
 
     // This method should be called when proxy setting changes.
@@ -46,9 +44,12 @@ import okhttp3.OkHttpClient
 
     fun get(context: Context, client: OkHttpClient): CacheDataSource.Factory {
         if (!this::simpleCache.isInitialized) {
-            init(context, client)
+            initFileCache(context)
         }
 
+        // Renews the factory because OkHttpMight have changed.
+        renewCacheFactory(client)
+
         return cacheDataSourceFactory
     }
 }

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

@@ -18,9 +18,7 @@ import com.vitorpamplona.amethyst.service.relays.Constants
 import com.vitorpamplona.amethyst.service.relays.FeedType
 import com.vitorpamplona.amethyst.service.relays.Relay
 import com.vitorpamplona.amethyst.service.relays.RelayPool
-import com.vitorpamplona.amethyst.ui.actions.ServersAvailable
 import com.vitorpamplona.amethyst.ui.components.BundledUpdate
-import com.vitorpamplona.amethyst.ui.note.Nip47URI
 import com.vitorpamplona.amethyst.ui.note.combineWith
 import kotlinx.collections.immutable.ImmutableSet
 import kotlinx.collections.immutable.persistentSetOf
@@ -174,6 +172,7 @@ class Account(
             val event = ContactListEvent.createFromScratch(
                 followUsers = listOf(),
                 followTags = listOf(),
+                followGeohashes = listOf(),
                 followCommunities = listOf(),
                 followEvents = DefaultChannels.toList(),
                 relayUse = relays,
@@ -453,6 +452,7 @@ class Account(
             ContactListEvent.createFromScratch(
                 followUsers = listOf(Contact(user.pubkeyHex, null)),
                 followTags = emptyList(),
+                followGeohashes = emptyList(),
                 followCommunities = emptyList(),
                 followEvents = DefaultChannels.toList(),
                 relayUse = Constants.defaultRelays.associate { it.url to ContactListEvent.ReadWrite(it.read, it.write) },
@@ -475,6 +475,7 @@ class Account(
             ContactListEvent.createFromScratch(
                 followUsers = emptyList(),
                 followTags = emptyList(),
+                followGeohashes = emptyList(),
                 followCommunities = emptyList(),
                 followEvents = DefaultChannels.toList().plus(channel.idHex),
                 relayUse = Constants.defaultRelays.associate { it.url to ContactListEvent.ReadWrite(it.read, it.write) },
@@ -498,6 +499,7 @@ class Account(
             ContactListEvent.createFromScratch(
                 followUsers = emptyList(),
                 followTags = emptyList(),
+                followGeohashes = emptyList(),
                 followCommunities = listOf(community.address),
                 followEvents = DefaultChannels.toList(),
                 relayUse = relays,
@@ -509,7 +511,7 @@ class Account(
         LocalCache.consume(event)
     }
 
-    fun follow(tag: String) {
+    fun followHashtag(tag: String) {
         if (!isWriteable()) return
 
         val contactList = migrateCommunitiesAndChannelsIfNeeded(userProfile().latestContactList)
@@ -524,6 +526,34 @@ class Account(
             ContactListEvent.createFromScratch(
                 followUsers = emptyList(),
                 followTags = listOf(tag),
+                followGeohashes = emptyList(),
+                followCommunities = emptyList(),
+                followEvents = DefaultChannels.toList(),
+                relayUse = Constants.defaultRelays.associate { it.url to ContactListEvent.ReadWrite(it.read, it.write) },
+                privateKey = keyPair.privKey!!
+            )
+        }
+
+        Client.send(event)
+        LocalCache.consume(event)
+    }
+
+    fun followGeohash(geohash: String) {
+        if (!isWriteable()) return
+
+        val contactList = migrateCommunitiesAndChannelsIfNeeded(userProfile().latestContactList)
+
+        val event = if (contactList != null) {
+            ContactListEvent.followGeohash(
+                contactList,
+                geohash,
+                keyPair.privKey!!
+            )
+        } else {
+            ContactListEvent.createFromScratch(
+                followUsers = emptyList(),
+                followTags = emptyList(),
+                followGeohashes = listOf(geohash),
                 followCommunities = emptyList(),
                 followEvents = DefaultChannels.toList(),
                 relayUse = Constants.defaultRelays.associate { it.url to ContactListEvent.ReadWrite(it.read, it.write) },
@@ -552,7 +582,7 @@ class Account(
         }
     }
 
-    fun unfollow(tag: String) {
+    fun unfollowHashtag(tag: String) {
         if (!isWriteable()) return
 
         val contactList = migrateCommunitiesAndChannelsIfNeeded(userProfile().latestContactList)
@@ -569,6 +599,23 @@ class Account(
         }
     }
 
+    fun unfollowGeohash(geohash: String) {
+        if (!isWriteable()) return
+
+        val contactList = migrateCommunitiesAndChannelsIfNeeded(userProfile().latestContactList)
+
+        if (contactList != null && contactList.tags.isNotEmpty()) {
+            val event = ContactListEvent.unfollowGeohash(
+                contactList,
+                geohash,
+                keyPair.privKey!!
+            )
+
+            Client.send(event)
+            LocalCache.consume(event)
+        }
+    }
+
     fun unfollow(channel: Channel) {
         if (!isWriteable()) return
 
@@ -671,7 +718,8 @@ class Account(
         replyingTo: String?,
         root: String?,
         directMentions: Set<HexKey>,
-        relayList: List<Relay>? = null
+        relayList: List<Relay>? = null,
+        geohash: String? = null
     ) {
         if (!isWriteable()) return
 
@@ -691,6 +739,7 @@ class Account(
             replyingTo = replyingTo,
             root = root,
             directMentions = directMentions,
+            geohash = geohash,
             privateKey = keyPair.privKey!!
         )
 
@@ -710,7 +759,8 @@ class Account(
         zapReceiver: String? = null,
         wantsToMarkAsSensitive: Boolean,
         zapRaiserAmount: Long? = null,
-        relayList: List<Relay>? = null
+        relayList: List<Relay>? = null,
+        geohash: String? = null
     ) {
         if (!isWriteable()) return
 
@@ -731,14 +781,15 @@ class Account(
             closedAt = closedAt,
             zapReceiver = zapReceiver,
             markAsSensitive = wantsToMarkAsSensitive,
-            zapRaiserAmount = zapRaiserAmount
+            zapRaiserAmount = zapRaiserAmount,
+            geohash = geohash
         )
         // println("Sending new PollNoteEvent: %s".format(signedEvent.toJson()))
         Client.send(signedEvent, relayList = relayList)
         LocalCache.consume(signedEvent)
     }
 
-    fun sendChannelMessage(message: String, toChannel: String, replyTo: List<Note>?, mentions: List<User>?, zapReceiver: String? = null, wantsToMarkAsSensitive: Boolean, zapRaiserAmount: Long? = null) {
+    fun sendChannelMessage(message: String, toChannel: String, replyTo: List<Note>?, mentions: List<User>?, zapReceiver: String? = null, wantsToMarkAsSensitive: Boolean, zapRaiserAmount: Long? = null, geohash: String? = null) {
         if (!isWriteable()) return
 
         // val repliesToHex = listOfNotNull(replyingTo?.idHex).ifEmpty { null }
@@ -753,13 +804,14 @@ class Account(
             zapReceiver = zapReceiver,
             markAsSensitive = wantsToMarkAsSensitive,
             zapRaiserAmount = zapRaiserAmount,
+            geohash = geohash,
             privateKey = keyPair.privKey!!
         )
         Client.send(signedEvent)
         LocalCache.consume(signedEvent, null)
     }
 
-    fun sendLiveMessage(message: String, toChannel: ATag, replyTo: List<Note>?, mentions: List<User>?, zapReceiver: String? = null, wantsToMarkAsSensitive: Boolean, zapRaiserAmount: Long? = null) {
+    fun sendLiveMessage(message: String, toChannel: ATag, replyTo: List<Note>?, mentions: List<User>?, zapReceiver: String? = null, wantsToMarkAsSensitive: Boolean, zapRaiserAmount: Long? = null, geohash: String? = null) {
         if (!isWriteable()) return
 
         // val repliesToHex = listOfNotNull(replyingTo?.idHex).ifEmpty { null }
@@ -774,13 +826,14 @@ class Account(
             zapReceiver = zapReceiver,
             markAsSensitive = wantsToMarkAsSensitive,
             zapRaiserAmount = zapRaiserAmount,
+            geohash = geohash,
             privateKey = keyPair.privKey!!
         )
         Client.send(signedEvent)
         LocalCache.consume(signedEvent, null)
     }
 
-    fun sendPrivateMessage(message: String, toUser: User, replyingTo: Note? = null, mentions: List<User>?, zapReceiver: String? = null, wantsToMarkAsSensitive: Boolean, zapRaiserAmount: Long? = null) {
+    fun sendPrivateMessage(message: String, toUser: User, replyingTo: Note? = null, mentions: List<User>?, zapReceiver: String? = null, wantsToMarkAsSensitive: Boolean, zapRaiserAmount: Long? = null, geohash: String? = null) {
         if (!isWriteable()) return
 
         val repliesToHex = listOfNotNull(replyingTo?.idHex).ifEmpty { null }
@@ -795,6 +848,7 @@ class Account(
             zapReceiver = zapReceiver,
             markAsSensitive = wantsToMarkAsSensitive,
             zapRaiserAmount = zapRaiserAmount,
+            geohash = geohash,
             privateKey = keyPair.privKey!!,
             advertiseNip18 = false
         )
@@ -1215,6 +1269,30 @@ class Account(
         }
     }
 
+    fun selectedGeohashesFollowList(listName: String?): Set<String>? {
+        if (listName == GLOBAL_FOLLOWS) return null
+        if (listName == KIND3_FOLLOWS) return userProfile().cachedFollowingGeohashSet()
+
+        val privKey = keyPair.privKey
+
+        return if (listName != null) {
+            val aTag = ATag(PeopleListEvent.kind, userProfile().pubkeyHex, listName, null).toTag()
+            val list = LocalCache.addressables[aTag]
+            if (list != null) {
+                val publicAddresses = list.event?.geohashes() ?: emptySet()
+                val privateAddresses = privKey?.let {
+                    (list.event as? GeneralListEvent)?.privateGeohashes(it)
+                } ?: emptySet()
+
+                (publicAddresses + privateAddresses).toSet()
+            } else {
+                emptySet()
+            }
+        } else {
+            emptySet()
+        }
+    }
+
     fun selectedCommunitiesFollowList(listName: String?): Set<String>? {
         if (listName == GLOBAL_FOLLOWS) return null
         if (listName == KIND3_FOLLOWS) return userProfile().cachedFollowingCommunitiesSet()
@@ -1436,9 +1514,9 @@ class Account(
 
     private fun isAcceptableDirect(note: Note): Boolean {
         if (!warnAboutPostsWithReports) {
-            return note.reportsBy(userProfile()).isEmpty()
+            return !note.hasReportsBy(userProfile())
         }
-        return note.reportsBy(userProfile()).isEmpty() && // if user has not reported this post
+        return !note.hasReportsBy(userProfile()) && // if user has not reported this post
             note.countReportAuthorsBy(followingKeySet()) < 5 // if it has 5 reports by reliable users
     }
 

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

@@ -1086,7 +1086,7 @@ object LocalCache {
         }
 
         try {
-            val cachePath = File(Amethyst.instance.applicationContext.externalCacheDir, "NIP95")
+            val cachePath = File(Amethyst.instance.applicationContext.cacheDir, "NIP95")
             cachePath.mkdirs()
             val file = File(cachePath, event.id)
             if (!file.exists()) {
@@ -1110,6 +1110,57 @@ object LocalCache {
         refreshObservers(note)
     }
 
+    private fun consume(event: ChatMessageEvent, relay: Relay?) {
+        val note = getOrCreateNote(event.id)
+        val author = getOrCreateUser(event.pubKey)
+
+        if (relay != null) {
+            author.addRelayBeingUsed(relay, event.createdAt)
+            note.addRelay(relay)
+        }
+
+        // Already processed this event.
+        if (note.event != null) return
+
+        note.loadEvent(event, author, emptyList())
+
+        refreshObservers(note)
+    }
+
+    private fun consume(event: SealedGossipEvent, relay: Relay?) {
+        val note = getOrCreateNote(event.id)
+        val author = getOrCreateUser(event.pubKey)
+
+        if (relay != null) {
+            author.addRelayBeingUsed(relay, event.createdAt)
+            note.addRelay(relay)
+        }
+
+        // Already processed this event.
+        if (note.event != null) return
+
+        note.loadEvent(event, author, emptyList())
+
+        refreshObservers(note)
+    }
+
+    private fun consume(event: GiftWrapEvent, relay: Relay?) {
+        val note = getOrCreateNote(event.id)
+        val author = getOrCreateUser(event.pubKey)
+
+        if (relay != null) {
+            author.addRelayBeingUsed(relay, event.createdAt)
+            note.addRelay(relay)
+        }
+
+        // Already processed this event.
+        if (note.event != null) return
+
+        note.loadEvent(event, author, emptyList())
+
+        refreshObservers(note)
+    }
+
     fun consume(event: LnZapPaymentRequestEvent) {
         // Does nothing without a response callback.
     }
@@ -1185,13 +1236,12 @@ object LocalCache {
         }
 
         return notes.values.filter {
-            (it.event is TextNoteEvent && it.event?.content()?.contains(text, true) ?: false) ||
-                (it.event is PollNoteEvent && it.event?.content()?.contains(text, true) ?: false) ||
-                (it.event is ChannelMessageEvent && it.event?.content()?.contains(text, true) ?: false) ||
+            it.event?.content()?.contains(text, true) ?: false ||
+                it.event?.matchTag1With(text) ?: false ||
                 it.idHex.startsWith(text, true) ||
                 it.idNote().startsWith(text, true)
         } + addressables.values.filter {
-            (it.event as? LongTextNoteEvent)?.content?.contains(text, true) ?: false ||
+            it.event?.content()?.contains(text, true) ?: false ||
                 it.event?.matchTag1With(text) ?: false ||
                 it.idHex.startsWith(text, true)
         }
@@ -1222,6 +1272,10 @@ object LocalCache {
             it.value.clearLive()
         }
 
+        addressables.forEach {
+            it.value.clearLive()
+        }
+
         users.forEach {
             it.value.clearLive()
         }
@@ -1233,6 +1287,8 @@ object LocalCache {
         channels.forEach { it ->
             val toBeRemoved = it.value.pruneOldAndHiddenMessages(account)
 
+            val childrenToBeRemoved = mutableListOf<Note>()
+
             toBeRemoved.forEach {
                 notes.remove(it.idHex)
                 // Doesn't need to clean up the replies and mentions.. Too small to matter.
@@ -1241,17 +1297,84 @@ object LocalCache {
                 it.replyTo?.forEach { _ ->
                     it.removeReply(it)
                 }
+
+                childrenToBeRemoved.addAll(it.removeAllChildNotes())
             }
 
+            removeChildrenOf(childrenToBeRemoved)
+
             if (toBeRemoved.size > 100 || it.value.notes.size > 100) {
                 println("PRUNE: ${toBeRemoved.size} messages removed from ${it.value.toBestDisplayName()}. ${it.value.notes.size} kept")
             }
         }
+
+        users.forEach { userPair ->
+            userPair.value.privateChatrooms.values.map {
+                val toBeRemoved = it.pruneMessagesToTheLatestOnly()
+
+                val childrenToBeRemoved = mutableListOf<Note>()
+
+                toBeRemoved.forEach {
+                    notes.remove(it.idHex)
+
+                    // Counts the replies
+                    it.replyTo?.forEach { _ ->
+                        it.removeReply(it)
+                    }
+
+                    childrenToBeRemoved.addAll(it.removeAllChildNotes())
+                }
+
+                removeChildrenOf(childrenToBeRemoved)
+
+                if (toBeRemoved.size > 1) {
+                    println("PRUNE: ${toBeRemoved.size} private messages with ${userPair.value.toBestDisplayName()} removed. ${it.roomMessages.size} kept")
+                }
+            }
+        }
+    }
+
+    fun pruneRepliesAndReactions(account: Account) {
+        checkNotInMainThread()
+        val user = account.userProfile()
+
+        val toBeRemoved = notes.filter {
+            (
+                (it.value.event is TextNoteEvent && !it.value.isNewThread()) ||
+                    it.value.event is ReactionEvent || it.value.event is LnZapEvent || it.value.event is LnZapRequestEvent ||
+                    it.value.event is ReportEvent || it.value.event is GenericRepostEvent
+                ) &&
+                it.value.liveSet?.isInUse() != true && // don't delete if observing.
+                it.value.author != user && // don't delete if it is the logged in account
+                it.value.event?.isTaggedUser(user.pubkeyHex) != true // don't delete if it's a notification to the logged in user
+        }.values
+
+        val childrenToBeRemoved = mutableListOf<Note>()
+
+        toBeRemoved.forEach {
+            notes.remove(it.idHex)
+
+            it.replyTo?.forEach { masterNote ->
+                masterNote.removeReply(it)
+                masterNote.removeBoost(it)
+                masterNote.removeReaction(it)
+                masterNote.removeZap(it)
+                masterNote.clearEOSE() // allows reloading of these events
+            }
+
+            childrenToBeRemoved.addAll(it.removeAllChildNotes())
+        }
+
+        if (toBeRemoved.size > 1) {
+            println("PRUNE: ${toBeRemoved.size} thread replies removed.")
+        }
     }
 
     fun pruneHiddenMessages(account: Account) {
         checkNotInMainThread()
 
+        val childrenToBeRemoved = mutableListOf<Note>()
+
         val toBeRemoved = account.hiddenUsers.map { userHex ->
             (
                 notes.values.filter {
@@ -1273,11 +1396,30 @@ object LocalCache {
             }
 
             notes.remove(it.idHex)
+
+            childrenToBeRemoved.addAll(it.removeAllChildNotes())
         }
 
+        removeChildrenOf(childrenToBeRemoved)
+
         println("PRUNE: ${toBeRemoved.size} messages removed because they were Hidden")
     }
 
+    fun removeChildrenOf(nextToBeRemoved: List<Note>) {
+        nextToBeRemoved.forEach { note ->
+            if (note.event is LnZapEvent) {
+                (note.event as LnZapEvent).zappedAuthor().mapNotNull { getUserIfExists(it)?.removeZap(note) }
+            }
+            if (note.event is LnZapRequestEvent) {
+                (note.event as LnZapRequestEvent).zappedAuthor().mapNotNull { getUserIfExists(it)?.removeZap(note) }
+            }
+            if (note.event is ReportEvent) {
+                (note.event as ReportEvent).reportedAuthor().mapNotNull { getUserIfExists(it.key)?.removeZap(note) }
+            }
+            notes.remove(note.idHex)
+        }
+    }
+
     fun pruneContactLists(userAccount: Account) {
         checkNotInMainThread()
 
@@ -1325,6 +1467,7 @@ object LocalCache {
                 is ChannelMessageEvent -> consume(event, relay)
                 is ChannelMetadataEvent -> consume(event)
                 is ChannelMuteUserEvent -> consume(event)
+                is ChatMessageEvent -> consume(event, relay)
                 is ClassifiedsEvent -> consume(event)
                 is CommunityDefinitionEvent -> consume(event, relay)
                 is CommunityPostApprovalEvent -> {
@@ -1337,10 +1480,12 @@ object LocalCache {
                 is DeletionEvent -> consume(event)
                 is EmojiPackEvent -> consume(event)
                 is EmojiPackSelectionEvent -> consume(event)
+                is SealedGossipEvent -> consume(event, relay)
 
                 is FileHeaderEvent -> consume(event, relay)
                 is FileStorageEvent -> consume(event, relay)
                 is FileStorageHeaderEvent -> consume(event, relay)
+                is GiftWrapEvent -> consume(event, relay)
                 is HighlightEvent -> consume(event, relay)
                 is LiveActivitiesEvent -> consume(event, relay)
                 is LiveActivitiesChatMessageEvent -> consume(event, relay)

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

@@ -0,0 +1,3 @@
+package com.vitorpamplona.amethyst.model
+
+data class Nip47URI(val pubKeyHex: HexKey, val relayUri: String?, val secret: HexKey?)

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

@@ -51,20 +51,20 @@ open class Note(val idHex: String) {
     var replyTo: List<Note>? = null
 
     // These fields are updated every time an event related to this note is received.
-    var replies = setOf<Note>()
+    var replies = listOf<Note>()
         private set
-    var reactions = mapOf<String, Set<Note>>()
+    var reactions = mapOf<String, List<Note>>()
         private set
-    var boosts = setOf<Note>()
+    var boosts = listOf<Note>()
         private set
-    var reports = mapOf<User, Set<Note>>()
+    var reports = mapOf<User, List<Note>>()
         private set
     var zaps = mapOf<Note, Note?>()
         private set
     var zapPayments = mapOf<Note, Note?>()
         private set
 
-    var relays = setOf<String>()
+    var relays = listOf<String>()
         private set
 
     var lastReactionsDownloadTime: Map<String, EOSETime> = emptyMap()
@@ -151,27 +151,63 @@ open class Note(val idHex: String) {
     }
 
     fun removeReply(note: Note) {
-        replies = replies - note
-        liveSet?.replies?.invalidateData()
+        if (note in replies) {
+            replies = replies - note
+            liveSet?.replies?.invalidateData()
+        }
     }
+
     fun removeBoost(note: Note) {
-        boosts = boosts - note
-        liveSet?.boosts?.invalidateData()
+        if (note in boosts) {
+            boosts = boosts - note
+            liveSet?.boosts?.invalidateData()
+        }
     }
+
+    fun removeAllChildNotes(): List<Note> {
+        val toBeRemoved = replies +
+            reactions.values.flatten() +
+            boosts +
+            reports.values.flatten() +
+            zaps.keys +
+            zaps.values.filterNotNull() +
+            zapPayments.keys +
+            zapPayments.values.filterNotNull()
+
+        replies = listOf<Note>()
+        reactions = mapOf<String, List<Note>>()
+        boosts = listOf<Note>()
+        reports = mapOf<User, List<Note>>()
+        zaps = mapOf<Note, Note?>()
+        zapPayments = mapOf<Note, Note?>()
+        relays = listOf<String>()
+        lastReactionsDownloadTime = emptyMap()
+
+        liveSet?.replies?.invalidateData()
+        liveSet?.reactions?.invalidateData()
+        liveSet?.boosts?.invalidateData()
+        liveSet?.reports?.invalidateData()
+        liveSet?.zaps?.invalidateData()
+
+        return toBeRemoved
+    }
+
     fun removeReaction(note: Note) {
         val tags = note.event?.tags() ?: emptyList()
         val reaction = note.event?.content()?.firstFullCharOrEmoji(ImmutableListOfLists(tags)) ?: "+"
 
         if (reaction in reactions.keys && reactions[reaction]?.contains(note) == true) {
             reactions[reaction]?.let {
-                val newList = it.minus(note)
-                if (newList.isEmpty()) {
-                    reactions = reactions.minus(reaction)
-                } else {
-                    reactions = reactions + Pair(reaction, newList)
-                }
+                if (note in it) {
+                    val newList = it.minus(note)
+                    if (newList.isEmpty()) {
+                        reactions = reactions.minus(reaction)
+                    } else {
+                        reactions = reactions + Pair(reaction, newList)
+                    }
 
-                liveSet?.reactions?.invalidateData()
+                    liveSet?.reactions?.invalidateData()
+                }
             }
         }
     }
@@ -277,7 +313,7 @@ open class Note(val idHex: String) {
         val reaction = note.event?.content()?.firstFullCharOrEmoji(ImmutableListOfLists(tags)) ?: "+"
 
         if (reaction !in reactions.keys) {
-            reactions = reactions + Pair(reaction, setOf(note))
+            reactions = reactions + Pair(reaction, listOf(note))
             liveSet?.reactions?.invalidateData()
         } else if (reactions[reaction]?.contains(note) == false) {
             reactions = reactions + Pair(reaction, (reactions[reaction] ?: emptySet()) + note)
@@ -289,7 +325,7 @@ open class Note(val idHex: String) {
         val author = note.author ?: return
 
         if (author !in reports.keys) {
-            reports = reports + Pair(author, setOf(note))
+            reports = reports + Pair(author, listOf(note))
             liveSet?.reports?.invalidateData()
         } else if (reports[author]?.contains(note) == false) {
             reports = reports + Pair(author, (reports[author] ?: emptySet()) + note)
@@ -382,8 +418,8 @@ open class Note(val idHex: String) {
         return boosts.any { it.author?.pubkeyHex == user.pubkeyHex }
     }
 
-    fun reportsBy(user: User): Set<Note> {
-        return reports[user] ?: emptySet()
+    fun hasReportsBy(user: User): Boolean {
+        return reports[user]?.isNotEmpty() ?: false
     }
 
     fun reportAuthorsBy(users: Set<HexKey>): List<User> {
@@ -547,13 +583,17 @@ open class Note(val idHex: String) {
         }
 
         replyTo = null
-        replies = emptySet()
+        replies = emptyList()
         reactions = emptyMap()
-        boosts = emptySet()
+        boosts = emptyList()
         reports = emptyMap()
         zaps = emptyMap()
     }
 
+    fun clearEOSE() {
+        lastReactionsDownloadTime = emptyMap()
+    }
+
     var liveSet: NoteLiveSet? = null
 
     fun live(): NoteLiveSet {
@@ -613,6 +653,8 @@ class NoteLiveData(val note: Note) : LiveData<NoteState>(NoteState(note)) {
     private val bundler = BundledUpdate(500, Dispatchers.IO)
 
     fun invalidateData() {
+        if (!hasObservers()) return
+
         checkNotInMainThread()
 
         bundler.invalidate() {

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

@@ -0,0 +1,16 @@
+package com.vitorpamplona.amethyst.model
+
+enum class ServersAvailable {
+    // IMGUR,
+    NOSTR_BUILD,
+    NOSTRIMG,
+    NOSTRFILES_DEV,
+    NOSTRCHECK_ME,
+
+    // IMGUR_NIP_94,
+    NOSTRIMG_NIP_94,
+    NOSTR_BUILD_NIP_94,
+    NOSTRFILES_DEV_NIP_94,
+    NOSTRCHECK_ME_NIP_94,
+    NIP95
+}

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

@@ -1,13 +1,17 @@
 package com.vitorpamplona.amethyst.model
 
 object TimeUtils {
-    const val fiveMinutes = 60 * 5
-    const val oneHour = 60 * 60
-    const val oneDay = 24 * 60 * 60
+    const val oneMinute = 60
+    const val fiveMinutes = 5 * oneMinute
+    const val oneHour = 60 * oneMinute
+    const val eightHours = 8 * oneHour
+    const val oneDay = 24 * oneHour
+    const val oneWeek = 7 * oneDay
 
     fun now() = System.currentTimeMillis() / 1000
     fun fiveMinutesAgo() = now() - fiveMinutes
     fun oneHourAgo() = now() - oneHour
     fun oneDayAgo() = now() - oneDay
-    fun eightHoursAgo() = now() - (oneHour * 8)
+    fun eightHoursAgo() = now() - eightHours
+    fun oneWeekAgo() = now() - oneWeek
 }

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

@@ -2,33 +2,35 @@ package com.vitorpamplona.amethyst.model
 
 import android.util.LruCache
 import androidx.compose.runtime.Stable
-import com.vitorpamplona.amethyst.service.checkNotInMainThread
 import com.vitorpamplona.amethyst.service.previews.BahaUrlPreview
 import com.vitorpamplona.amethyst.service.previews.IUrlPreviewCallback
 import com.vitorpamplona.amethyst.service.previews.UrlInfoItem
 import com.vitorpamplona.amethyst.ui.components.UrlPreviewState
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
 
 @Stable
 object UrlCachedPreviewer {
     var cache = LruCache<String, UrlPreviewState>(100)
         private set
 
-    fun previewInfo(url: String, onReady: (UrlPreviewState) -> Unit) {
-        checkNotInMainThread()
-
+    suspend fun previewInfo(
+        url: String,
+        onReady: suspend (UrlPreviewState) -> Unit
+    ) = withContext(Dispatchers.IO) {
         cache[url]?.let {
             onReady(it)
-            return
+            return@withContext
         }
 
         BahaUrlPreview(
             url,
             object : IUrlPreviewCallback {
-                override fun onComplete(urlInfo: UrlInfoItem) {
+                override suspend fun onComplete(urlInfo: UrlInfoItem) = withContext(Dispatchers.IO) {
                     cache[url]?.let {
                         if (it is UrlPreviewState.Loaded || it is UrlPreviewState.Empty) {
                             onReady(it)
-                            return
+                            return@withContext
                         }
                     }
 
@@ -42,10 +44,10 @@ object UrlCachedPreviewer {
                     onReady(state)
                 }
 
-                override fun onFailed(throwable: Throwable) {
+                override suspend fun onFailed(throwable: Throwable) = withContext(Dispatchers.IO) {
                     cache[url]?.let {
                         onReady(it)
-                        return
+                        return@withContext
                     }
 
                     val state = UrlPreviewState.Error(throwable.message ?: "Error Loading url preview")

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

@@ -137,6 +137,16 @@ class User(val pubkeyHex: String) {
         }
     }
 
+    fun removeZap(zapRequestOrZapEvent: Note) {
+        if (zapRequestOrZapEvent in zaps.keys) {
+            zaps = zaps.minus(zapRequestOrZapEvent)
+            liveSet?.zaps?.invalidateData()
+        } else if (zapRequestOrZapEvent in zaps.values) {
+            zaps = zaps.filter { it.value != zapRequestOrZapEvent }
+            liveSet?.zaps?.invalidateData()
+        }
+    }
+
     fun zappedAmount(): BigDecimal {
         return zaps.mapNotNull { it.value?.event }
             .filterIsInstance<LnZapEvent>()
@@ -249,6 +259,12 @@ class User(val pubkeyHex: String) {
         } ?: false
     }
 
+    fun isFollowingGeohashCached(geoTag: String): Boolean {
+        return latestContactList?.verifiedFollowGeohashSet?.let {
+            return geoTag.lowercase() in it
+        } ?: false
+    }
+
     fun isFollowingCached(user: User): Boolean {
         return latestContactList?.verifiedFollowKeySet?.let {
             return user.pubkeyHex in it
@@ -277,6 +293,10 @@ class User(val pubkeyHex: String) {
         return latestContactList?.verifiedFollowTagSet ?: emptySet()
     }
 
+    fun cachedFollowingGeohashSet(): Set<HexKey> {
+        return latestContactList?.verifiedFollowGeohashSet ?: emptySet()
+    }
+
     fun cachedFollowingCommunitiesSet(): Set<HexKey> {
         return latestContactList?.verifiedFollowCommunitySet ?: emptySet()
     }
@@ -373,6 +393,22 @@ class Chatroom() {
             roomMessages = roomMessages + msg
         }
     }
+
+    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
+    }
 }
 
 @Stable
@@ -439,6 +475,7 @@ class UserLiveData(val user: User) : LiveData<UserState>(UserState(user)) {
     private val bundler = BundledUpdate(500, Dispatchers.IO)
 
     fun invalidateData() {
+        if (!hasObservers()) return
         checkNotInMainThread()
 
         bundler.invalidate() {

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

@@ -54,7 +54,7 @@ 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}])*\\/?)(.*)")
+    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-]+)*\\/?)(.*)")
 }
@@ -119,7 +119,7 @@ class RichTextParser() {
 
             val isRTL = isArabic(paragraph)
 
-            val wordList = paragraph.split(' ')
+            val wordList = paragraph.trimEnd().split(' ')
             wordList.forEach { word ->
                 val wordSegment = wordIdentifier(word, images, urls, emojis, tags)
                 if (wordSegment !is RegularTextSegment) {
@@ -182,8 +182,8 @@ class RichTextParser() {
         } else if (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.matches(word)) {
+            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)

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

@@ -80,16 +80,17 @@ class CashuProcessor {
                 .post(requestBody)
                 .build()
 
-            val response = client.newCall(request).execute()
-            val body = response.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("Redeemed ${token.totalAmount} Sats" + " (Fees: ${token.fees} Sats)")
-            } else {
-                onError(tree?.get("detail")?.asText()?.split('.')?.getOrNull(0) ?: "Cashu: Tokens already spent.")
+                if (successful) {
+                    onSuccess("Redeemed ${token.totalAmount} Sats" + " (Fees: ${token.fees} Sats)")
+                } else {
+                    onError(tree?.get("detail")?.asText()?.split('.')?.getOrNull(0) ?: "Cashu: Tokens already spent.")
+                }
             }
         } catch (e: Exception) {
             onError("Token melt failure: " + e.message)

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

@@ -1,5 +1,7 @@
 package com.vitorpamplona.amethyst.service
 
+import com.goterl.lazysodium.SodiumAndroid
+import com.goterl.lazysodium.utils.Key
 import fr.acinq.secp256k1.Hex
 import fr.acinq.secp256k1.Secp256k1
 import java.security.MessageDigest
@@ -28,36 +30,6 @@ object CryptoUtils {
     fun sign(data: ByteArray, privKey: ByteArray): ByteArray =
         secp256k1.signSchnorr(data, privKey, null)
 
-    fun encrypt(msg: String, privateKey: ByteArray, pubKey: ByteArray): String {
-        val sharedSecret = getSharedSecret(privateKey, pubKey)
-        return encrypt(msg, sharedSecret)
-    }
-
-    fun encrypt(msg: String, sharedSecret: ByteArray): String {
-        val iv = ByteArray(16)
-        random.nextBytes(iv)
-        val cipher = Cipher.getInstance("AES/CBC/PKCS5Padding")
-        cipher.init(Cipher.ENCRYPT_MODE, SecretKeySpec(sharedSecret, "AES"), IvParameterSpec(iv))
-        val ivBase64 = Base64.getEncoder().encodeToString(iv)
-        val encryptedMsg = cipher.doFinal(msg.toByteArray())
-        val encryptedMsgBase64 = Base64.getEncoder().encodeToString(encryptedMsg)
-        return "$encryptedMsgBase64?iv=$ivBase64"
-    }
-
-    fun decrypt(msg: String, privateKey: ByteArray, pubKey: ByteArray): String {
-        val sharedSecret = getSharedSecret(privateKey, pubKey)
-        return decrypt(msg, sharedSecret)
-    }
-
-    fun decrypt(msg: String, sharedSecret: ByteArray): String {
-        val parts = msg.split("?iv=")
-        val iv = parts[1].run { Base64.getDecoder().decode(this) }
-        val encryptedMsg = parts.first().run { Base64.getDecoder().decode(this) }
-        val cipher = Cipher.getInstance("AES/CBC/PKCS5Padding")
-        cipher.init(Cipher.DECRYPT_MODE, SecretKeySpec(sharedSecret, "AES"), IvParameterSpec(iv))
-        return String(cipher.doFinal(encryptedMsg))
-    }
-
     fun verifySignature(
         signature: ByteArray,
         hash: ByteArray,
@@ -74,14 +46,87 @@ object CryptoUtils {
     /**
      * @return 32B shared secret
      */
-    fun getSharedSecret(privateKey: ByteArray, pubKey: ByteArray): ByteArray =
+    fun getSharedSecretNIP04(privateKey: ByteArray, pubKey: ByteArray): ByteArray =
         secp256k1.pubKeyTweakMul(Hex.decode("02") + pubKey, privateKey).copyOfRange(1, 33)
+
+    fun encryptNIP04(msg: String, privateKey: ByteArray, pubKey: ByteArray): String {
+        val sharedSecret = getSharedSecretNIP04(privateKey, pubKey)
+        return encryptNIP04(msg, sharedSecret)
+    }
+
+    fun encryptNIP04(msg: String, sharedSecret: ByteArray): String {
+        val iv = ByteArray(16)
+        random.nextBytes(iv)
+        val cipher = Cipher.getInstance("AES/CBC/PKCS5Padding")
+        cipher.init(Cipher.ENCRYPT_MODE, SecretKeySpec(sharedSecret, "AES"), IvParameterSpec(iv))
+        val ivBase64 = Base64.getEncoder().encodeToString(iv)
+        val encryptedMsg = cipher.doFinal(msg.toByteArray())
+        val encryptedMsgBase64 = Base64.getEncoder().encodeToString(encryptedMsg)
+        return "$encryptedMsgBase64?iv=$ivBase64"
+    }
+
+    fun decryptNIP04(msg: String, privateKey: ByteArray, pubKey: ByteArray): String {
+        val sharedSecret = getSharedSecretNIP04(privateKey, pubKey)
+        return decryptNIP04(msg, sharedSecret)
+    }
+
+    fun decryptNIP04(msg: String, sharedSecret: ByteArray): String {
+        val parts = msg.split("?iv=")
+        val iv = parts[1].run { Base64.getDecoder().decode(this) }
+        val encryptedMsg = parts.first().run { Base64.getDecoder().decode(this) }
+        val cipher = Cipher.getInstance("AES/CBC/PKCS5Padding")
+        cipher.init(Cipher.DECRYPT_MODE, SecretKeySpec(sharedSecret, "AES"), IvParameterSpec(iv))
+        return String(cipher.doFinal(encryptedMsg))
+    }
+
+    fun encryptNIP24(msg: String, privateKey: ByteArray, pubKey: ByteArray): EncryptedInfo {
+        val sharedSecret = getSharedSecretNIP24(privateKey, pubKey)
+        return encryptNIP24(msg, sharedSecret)
+    }
+
+    fun encryptNIP24(msg: String, sharedSecret: ByteArray): EncryptedInfo {
+        val nonce = ByteArray(24)
+        random.nextBytes(nonce)
+
+        val cipher = SodiumAndroid().cryptoStreamXChaCha20Xor(
+            messageBytes = msg.toByteArray(),
+            nonce = nonce,
+            key = Key.fromBytes(sharedSecret)
+        )
+
+        val cipherBase64 = Base64.getEncoder().encodeToString(cipher)
+        val nonceBase64 = Base64.getEncoder().encodeToString(nonce)
+
+        return EncryptedInfo(
+            ciphertext = cipherBase64,
+            nonce = nonceBase64,
+            v = Nip44Version.XChaCha20.versionCode
+        )
+    }
+
+    fun decryptNIP24(encryptedInfo: EncryptedInfo, privateKey: ByteArray, pubKey: ByteArray): String? {
+        val sharedSecret = getSharedSecretNIP24(privateKey, pubKey)
+        return decryptNIP24(encryptedInfo, sharedSecret)
+    }
+
+    fun decryptNIP24(encryptedInfo: EncryptedInfo, sharedSecret: ByteArray): String? {
+        return SodiumAndroid().cryptoStreamXChaCha20Xor(
+            messageBytes = Base64.getDecoder().decode(encryptedInfo.ciphertext),
+            nonce = Base64.getDecoder().decode(encryptedInfo.nonce),
+            key = Key.fromBytes(sharedSecret)
+        )?.decodeToString()
+    }
+
+    /**
+     * @return 32B shared secret
+     */
+    fun getSharedSecretNIP24(privateKey: ByteArray, pubKey: ByteArray): ByteArray =
+        sha256(secp256k1.pubKeyTweakMul(Hex.decode("02") + pubKey, privateKey).copyOfRange(1, 33))
 }
 
-fun Int.toByteArray(): ByteArray {
-    val bytes = ByteArray(4)
-    (0..3).forEach {
-        bytes[3 - it] = ((this ushr (8 * it)) and 0xFFFF).toByte()
-    }
-    return bytes
+data class EncryptedInfo(val ciphertext: String, val nonce: String, val v: Int)
+
+enum class Nip44Version(val versionCode: Int) {
+    Reserved(0),
+    XChaCha20(1)
 }

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

@@ -0,0 +1,79 @@
+package com.vitorpamplona.amethyst.service
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.location.Geocoder
+import android.location.Location
+import android.location.LocationListener
+import android.location.LocationManager
+import android.os.HandlerThread
+import androidx.compose.runtime.MutableState
+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)
+        }
+        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(", ")
+            }
+        } catch (e: Exception) {
+            e.printStackTrace()
+            return null
+        }
+    }
+}

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

@@ -1,12 +1,10 @@
 package com.vitorpamplona.amethyst.ui.note
 
 import android.net.Uri
-import com.vitorpamplona.amethyst.model.HexKey
+import com.vitorpamplona.amethyst.model.Nip47URI
 import com.vitorpamplona.amethyst.model.decodePublicKey
 import com.vitorpamplona.amethyst.model.toHexKey
 
-data class Nip47URI(val pubKeyHex: HexKey, val relayUri: String?, val secret: HexKey?)
-
 // Rename to the corect nip number when ready.
 object Nip47 {
     fun parse(uri: String): Nip47URI {

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

@@ -2,6 +2,7 @@ package com.vitorpamplona.amethyst.service
 
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.User
+import com.vitorpamplona.amethyst.service.model.GiftWrapEvent
 import com.vitorpamplona.amethyst.service.model.PrivateDmEvent
 import com.vitorpamplona.amethyst.service.relays.FeedType
 import com.vitorpamplona.amethyst.service.relays.JsonFilter
@@ -24,7 +25,7 @@ object NostrChatroomDataSource : NostrDataSource("ChatroomFeed") {
             TypedFilter(
                 types = setOf(FeedType.PRIVATE_DMS),
                 filter = JsonFilter(
-                    kinds = listOf(PrivateDmEvent.kind),
+                    kinds = listOf(PrivateDmEvent.kind, GiftWrapEvent.kind),
                     authors = listOf(myPeer.pubkeyHex),
                     tags = mapOf("p" to listOf(account.userProfile().pubkeyHex))
                 )

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

@@ -4,6 +4,7 @@ import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.service.model.ChannelCreateEvent
 import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
 import com.vitorpamplona.amethyst.service.model.ChannelMetadataEvent
+import com.vitorpamplona.amethyst.service.model.GiftWrapEvent
 import com.vitorpamplona.amethyst.service.model.PrivateDmEvent
 import com.vitorpamplona.amethyst.service.relays.COMMON_FEED_TYPES
 import com.vitorpamplona.amethyst.service.relays.EOSEAccount
@@ -20,7 +21,7 @@ object NostrChatroomListDataSource : NostrDataSource("MailBoxFeed") {
     fun createMessagesToMeFilter() = TypedFilter(
         types = setOf(FeedType.PRIVATE_DMS),
         filter = JsonFilter(
-            kinds = listOf(PrivateDmEvent.kind),
+            kinds = listOf(PrivateDmEvent.kind, GiftWrapEvent.kind),
             tags = mapOf("p" to listOf(account.userProfile().pubkeyHex)),
             since = latestEOSEs.users[account.userProfile()]?.followList?.get(chatRoomList)?.relayList
         )

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

@@ -92,6 +92,26 @@ object NostrDiscoveryDataSource : NostrDataSource("DiscoveryFeed") {
         )
     }
 
+    fun createLiveStreamGeohashesFilter(): TypedFilter? {
+        val hashToLoad = account.selectedGeohashesFollowList(account.defaultDiscoveryFollowList)
+
+        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)?.relayList
+            )
+        )
+    }
+
     fun createPublicChatsTagsFilter(): TypedFilter? {
         val hashToLoad = account.selectedTagsFollowList(account.defaultDiscoveryFollowList)
 
@@ -112,6 +132,26 @@ object NostrDiscoveryDataSource : NostrDataSource("DiscoveryFeed") {
         )
     }
 
+    fun createPublicChatsGeohashesFilter(): TypedFilter? {
+        val hashToLoad = account.selectedGeohashesFollowList(account.defaultDiscoveryFollowList)
+
+        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)?.relayList
+            )
+        )
+    }
+
     fun createCommunitiesTagsFilter(): TypedFilter? {
         val hashToLoad = account.selectedTagsFollowList(account.defaultDiscoveryFollowList)
 
@@ -132,6 +172,26 @@ object NostrDiscoveryDataSource : NostrDataSource("DiscoveryFeed") {
         )
     }
 
+    fun createCommunitiesGeohashesFilter(): TypedFilter? {
+        val hashToLoad = account.selectedGeohashesFollowList(account.defaultDiscoveryFollowList)
+
+        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)?.relayList
+            )
+        )
+    }
+
     val discoveryFeedChannel = requestNewChannel() { time, relayUrl ->
         latestEOSEs.addOrUpdate(account.userProfile(), account.defaultDiscoveryFollowList, relayUrl, time)
     }
@@ -143,7 +203,10 @@ object NostrDiscoveryDataSource : NostrDataSource("DiscoveryFeed") {
             createCommunitiesFilter(),
             createLiveStreamTagsFilter(),
             createPublicChatsTagsFilter(),
-            createCommunitiesTagsFilter()
+            createCommunitiesTagsFilter(),
+            createCommunitiesGeohashesFilter(),
+            createPublicChatsGeohashesFilter(),
+            createLiveStreamGeohashesFilter()
         ).ifEmpty { null }
     }
 }

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

@@ -0,0 +1,46 @@
+package com.vitorpamplona.amethyst.service
+
+import com.vitorpamplona.amethyst.service.model.AudioTrackEvent
+import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
+import com.vitorpamplona.amethyst.service.model.ClassifiedsEvent
+import com.vitorpamplona.amethyst.service.model.HighlightEvent
+import com.vitorpamplona.amethyst.service.model.LiveActivitiesChatMessageEvent
+import com.vitorpamplona.amethyst.service.model.LongTextNoteEvent
+import com.vitorpamplona.amethyst.service.model.PollNoteEvent
+import com.vitorpamplona.amethyst.service.model.TextNoteEvent
+import com.vitorpamplona.amethyst.service.relays.COMMON_FEED_TYPES
+import com.vitorpamplona.amethyst.service.relays.JsonFilter
+import com.vitorpamplona.amethyst.service.relays.TypedFilter
+
+object NostrGeohashDataSource : NostrDataSource("SingleGeoHashFeed") {
+    private var geohashToWatch: String? = null
+
+    fun createLoadHashtagFilter(): TypedFilter? {
+        val hashToLoad = geohashToWatch ?: return null
+
+        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),
+                limit = 200
+            )
+        )
+    }
+
+    val loadGeohashChannel = requestNewChannel()
+
+    override fun updateChannelFilters() {
+        loadGeohashChannel.typedFilters = listOfNotNull(createLoadHashtagFilter()).ifEmpty { null }
+    }
+
+    fun loadHashtag(tag: String?) {
+        geohashToWatch = tag
+
+        invalidateFilters()
+    }
+}

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

@@ -1,7 +1,11 @@
 package com.vitorpamplona.amethyst.service
 
 import androidx.compose.ui.text.capitalize
+import com.vitorpamplona.amethyst.service.model.AudioTrackEvent
 import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
+import com.vitorpamplona.amethyst.service.model.ClassifiedsEvent
+import com.vitorpamplona.amethyst.service.model.HighlightEvent
+import com.vitorpamplona.amethyst.service.model.LiveActivitiesChatMessageEvent
 import com.vitorpamplona.amethyst.service.model.LongTextNoteEvent
 import com.vitorpamplona.amethyst.service.model.PollNoteEvent
 import com.vitorpamplona.amethyst.service.model.TextNoteEvent
@@ -26,7 +30,7 @@ object NostrHashtagDataSource : NostrDataSource("SingleHashtagFeed") {
                         hashToLoad.capitalize()
                     )
                 ),
-                kinds = listOf(TextNoteEvent.kind, ChannelMessageEvent.kind, LongTextNoteEvent.kind, LongTextNoteEvent.kind, PollNoteEvent.kind),
+                kinds = listOf(TextNoteEvent.kind, ChannelMessageEvent.kind, LongTextNoteEvent.kind, PollNoteEvent.kind, LiveActivitiesChatMessageEvent.kind, ClassifiedsEvent.kind, HighlightEvent.kind, AudioTrackEvent.kind),
                 limit = 200
             )
         )

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

@@ -104,6 +104,26 @@ object NostrHomeDataSource : NostrDataSource("HomeFeed") {
         )
     }
 
+    fun createFollowGeohashesFilter(): TypedFilter? {
+        val hashToLoad = account.selectedGeohashesFollowList(account.defaultHomeFollowList) ?: emptySet()
+
+        if (hashToLoad.isEmpty()) return null
+
+        return TypedFilter(
+            types = setOf(FeedType.FOLLOWS),
+            filter = JsonFilter(
+                kinds = listOf(TextNoteEvent.kind, LongTextNoteEvent.kind, ClassifiedsEvent.kind, HighlightEvent.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)?.relayList
+            )
+        )
+    }
+
     fun createFollowCommunitiesFilter(): TypedFilter? {
         val communitiesToLoad = account.selectedCommunitiesFollowList(account.defaultHomeFollowList) ?: emptySet()
 
@@ -135,6 +155,11 @@ object NostrHomeDataSource : NostrDataSource("HomeFeed") {
     }
 
     override fun updateChannelFilters() {
-        followAccountChannel.typedFilters = listOfNotNull(createFollowAccountsFilter(), createFollowCommunitiesFilter(), createFollowTagsFilter()).ifEmpty { null }
+        followAccountChannel.typedFilters = listOfNotNull(
+            createFollowAccountsFilter(),
+            createFollowCommunitiesFilter(),
+            createFollowTagsFilter(),
+            createFollowGeohashesFilter()
+        ).ifEmpty { null }
     }
 }

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

@@ -9,7 +9,7 @@ import com.vitorpamplona.amethyst.service.relays.JsonFilter
 import com.vitorpamplona.amethyst.service.relays.TypedFilter
 import fr.acinq.secp256k1.Hex
 
-object NostrSearchEventOrUserDataSource : NostrDataSource("SingleEventFeed") {
+object NostrSearchEventOrUserDataSource : NostrDataSource("SearchEventFeed") {
     private var searchString: String? = null
 
     private fun createAnythingWithIDFilter(): List<TypedFilter>? {
@@ -54,6 +54,28 @@ object NostrSearchEventOrUserDataSource : NostrDataSource("SingleEventFeed") {
             TypedFilter(
                 types = setOf(FeedType.SEARCH),
                 filter = JsonFilter(
+                    kinds = listOf(
+                        TextNoteEvent.kind, LongTextNoteEvent.kind, BadgeDefinitionEvent.kind,
+                        PeopleListEvent.kind, BookmarkListEvent.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
                 )

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

@@ -12,7 +12,7 @@ object NostrSingleEventDataSource : NostrDataSource("SingleEventFeed") {
     private var eventsToWatch = setOf<Note>()
     private var addressesToWatch = setOf<Note>()
 
-    private fun createTagToAddressFilter(): List<TypedFilter>? {
+    private fun createReactionsToWatchInAddressFilter(): List<TypedFilter>? {
         val addressesToWatch = eventsToWatch.filter { it.address() != null } + addressesToWatch
 
         if (addressesToWatch.isEmpty()) {
@@ -25,12 +25,15 @@ object NostrSingleEventDataSource : NostrDataSource("SingleEventFeed") {
                     types = COMMON_FEED_TYPES,
                     filter = JsonFilter(
                         kinds = listOf(
-                            TextNoteEvent.kind, LongTextNoteEvent.kind,
-                            ReactionEvent.kind, RepostEvent.kind, GenericRepostEvent.kind, ReportEvent.kind,
-                            LnZapEvent.kind, LnZapRequestEvent.kind,
-                            BadgeAwardEvent.kind, BadgeDefinitionEvent.kind, BadgeProfilesEvent.kind,
-                            PollNoteEvent.kind, AudioTrackEvent.kind, PinListEvent.kind,
-                            PeopleListEvent.kind, BookmarkListEvent.kind
+                            TextNoteEvent.kind,
+                            ReactionEvent.kind,
+                            RepostEvent.kind,
+                            GenericRepostEvent.kind,
+                            ReportEvent.kind,
+                            LnZapEvent.kind,
+                            PollNoteEvent.kind,
+                            CommunityPostApprovalEvent.kind,
+                            LiveActivitiesChatMessageEvent.kind
                         ),
                         tags = mapOf("a" to listOf(aTag.toTag())),
                         since = it.lastReactionsDownloadTime,
@@ -55,7 +58,8 @@ object NostrSingleEventDataSource : NostrDataSource("SingleEventFeed") {
                         types = COMMON_FEED_TYPES,
                         filter = JsonFilter(
                             kinds = listOf(aTag.kind),
-                            authors = listOf(aTag.pubKeyHex)
+                            authors = listOf(aTag.pubKeyHex),
+                            limit = 1000 // Max amount of "replies" to download on a specific event.
                         )
                     )
                 } else {
@@ -64,7 +68,8 @@ object NostrSingleEventDataSource : NostrDataSource("SingleEventFeed") {
                         filter = JsonFilter(
                             kinds = listOf(aTag.kind),
                             tags = mapOf("d" to listOf(aTag.dTag)),
-                            authors = listOf(aTag.pubKeyHex)
+                            authors = listOf(aTag.pubKeyHex),
+                            limit = 1000 // Max amount of "replies" to download on a specific event.
                         )
                     )
                 }
@@ -85,17 +90,12 @@ object NostrSingleEventDataSource : NostrDataSource("SingleEventFeed") {
                 filter = JsonFilter(
                     kinds = listOf(
                         TextNoteEvent.kind,
-                        LongTextNoteEvent.kind,
                         ReactionEvent.kind,
                         RepostEvent.kind,
                         GenericRepostEvent.kind,
                         ReportEvent.kind,
                         LnZapEvent.kind,
-                        LnZapRequestEvent.kind,
-                        PollNoteEvent.kind,
-                        HighlightEvent.kind,
-                        AudioTrackEvent.kind,
-                        PinListEvent.kind
+                        PollNoteEvent.kind
                     ),
                     tags = mapOf("e" to listOf(it.idHex)),
                     since = it.lastReactionsDownloadTime,
@@ -154,7 +154,7 @@ object NostrSingleEventDataSource : NostrDataSource("SingleEventFeed") {
         val reactions = createRepliesAndReactionsFilter()
         val missing = createLoadEventsIfNotLoadedFilter()
         val addresses = createAddressFilter()
-        val addressReactions = createTagToAddressFilter()
+        val addressReactions = createReactionsToWatchInAddressFilter()
 
         singleEventChannel.typedFilters = listOfNotNull(missing, addresses, reactions, addressReactions).flatten().ifEmpty { null }
     }

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

@@ -51,11 +51,35 @@ object NostrVideoDataSource : NostrDataSource("VideoFeed") {
         )
     }
 
+    fun createFollowGeohashesFilter(): TypedFilter? {
+        val hashToLoad = account.selectedGeohashesFollowList(account.defaultStoriesFollowList)
+
+        if (hashToLoad.isNullOrEmpty()) 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)?.relayList
+            )
+        )
+    }
+
     val videoFeedChannel = requestNewChannel() { time, relayUrl ->
         latestEOSEs.addOrUpdate(account.userProfile(), account.defaultStoriesFollowList, relayUrl, time)
     }
 
     override fun updateChannelFilters() {
-        videoFeedChannel.typedFilters = listOfNotNull(createContextualFilter(), createFollowTagsFilter()).ifEmpty { null }
+        videoFeedChannel.typedFilters = listOfNotNull(
+            createContextualFilter(),
+            createFollowTagsFilter(),
+            createFollowGeohashesFilter()
+        ).ifEmpty { null }
     }
 }

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

@@ -28,7 +28,9 @@ object OnlineChecker {
                 .get()
                 .build()
 
-            val result = HttpClient.getHttpClient().newCall(request).execute().code == 200
+            val result = HttpClient.getHttpClient().newCall(request).execute().use {
+                it.isSuccessful
+            }
             checkOnlineCache.put(url, OnlineCheckResult(System.currentTimeMillis(), result))
             result
         } catch (e: Exception) {

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

@@ -0,0 +1,75 @@
+package com.vitorpamplona.amethyst.service
+
+import com.goterl.lazysodium.Sodium
+import com.goterl.lazysodium.SodiumAndroid
+import com.goterl.lazysodium.utils.Key
+
+fun Sodium.crypto_stream_xchacha20_xor_ic(
+    cipher: ByteArray,
+    message: ByteArray,
+    messageLen: Long,
+    nonce: ByteArray,
+    ic: Long,
+    key: ByteArray
+): Int {
+    /**
+     * C++ Code:
+     *
+     * unsigned char k2[crypto_core_hchacha20_OUTPUTBYTES];
+     * crypto_core_hchacha20(k2, n, k, NULL);
+     * return crypto_stream_chacha20_xor_ic(
+     * c, m, mlen, n + crypto_core_hchacha20_INPUTBYTES, ic, k2);
+     */
+    val k2 = ByteArray(32)
+
+    val nonceChaCha = nonce.drop(16).toByteArray()
+    assert(nonceChaCha.size == 8)
+
+    crypto_core_hchacha20(k2, nonce, key, null)
+    return crypto_stream_chacha20_xor_ic(
+        cipher,
+        message,
+        messageLen,
+        nonceChaCha,
+        ic,
+        k2
+    )
+}
+
+fun Sodium.crypto_stream_xchacha20_xor(
+    cipher: ByteArray,
+    message: ByteArray,
+    messageLen: Long,
+    nonce: ByteArray,
+    key: ByteArray
+): Int {
+    return crypto_stream_xchacha20_xor_ic(cipher, message, messageLen, nonce, 0, key)
+}
+
+fun SodiumAndroid.cryptoStreamXChaCha20Xor(
+    cipher: ByteArray,
+    message: ByteArray,
+    messageLen: Long,
+    nonce: ByteArray,
+    key: ByteArray
+): Boolean {
+    require(!(messageLen < 0 || messageLen > message.size)) { "messageLen out of bounds: $messageLen" }
+    return crypto_stream_xchacha20_xor(
+        cipher,
+        message,
+        messageLen,
+        nonce,
+        key
+    ) == 0
+}
+
+fun SodiumAndroid.cryptoStreamXChaCha20Xor(
+    messageBytes: ByteArray,
+    nonce: ByteArray,
+    key: Key
+): ByteArray? {
+    val mLen = messageBytes.size
+    val cipher = ByteArray(mLen)
+    val sucessful = cryptoStreamXChaCha20Xor(cipher, messageBytes, mLen.toLong(), nonce, key.asBytes)
+    return if (sucessful) cipher else null
+}

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

@@ -3,7 +3,6 @@ package com.vitorpamplona.amethyst.service
 import com.vitorpamplona.amethyst.ui.actions.ImmutableListOfLists
 
 fun String.isUTF16Char(pos: Int): Boolean {
-    println("Test $pos ${Character.charCount(this.codePointAt(pos))}")
     return Character.charCount(this.codePointAt(pos)) == 2
 }
 

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

@@ -6,7 +6,7 @@ import com.vitorpamplona.amethyst.model.hexToByteArray
 import com.vitorpamplona.amethyst.model.toHexKey
 import com.vitorpamplona.amethyst.service.bechToBytes
 import com.vitorpamplona.amethyst.service.nip19.Tlv
-import com.vitorpamplona.amethyst.service.toByteArray
+import com.vitorpamplona.amethyst.service.nip19.toByteArray
 import com.vitorpamplona.amethyst.service.toNAddress
 import fr.acinq.secp256k1.Hex
 

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

@@ -36,7 +36,8 @@ class ChannelMessageEvent(
             privateKey: ByteArray,
             createdAt: Long = TimeUtils.now(),
             markAsSensitive: Boolean,
-            zapRaiserAmount: Long?
+            zapRaiserAmount: Long?,
+            geohash: String? = null
         ): ChannelMessageEvent {
             val content = message
             val pubKey = CryptoUtils.pubkeyCreate(privateKey).toHexKey()
@@ -58,6 +59,9 @@ class ChannelMessageEvent(
             zapRaiserAmount?.let {
                 tags.add(listOf("zapraiser", "$it"))
             }
+            geohash?.let {
+                tags.add(listOf("g", it))
+            }
 
             val id = generateId(pubKey, createdAt, kind, tags, content)
             val sig = CryptoUtils.sign(id, privateKey)

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

@@ -0,0 +1,72 @@
+package com.vitorpamplona.amethyst.service.model
+
+import androidx.compose.runtime.Immutable
+import com.vitorpamplona.amethyst.model.HexKey
+import com.vitorpamplona.amethyst.model.TimeUtils
+import com.vitorpamplona.amethyst.model.toHexKey
+import com.vitorpamplona.amethyst.service.CryptoUtils
+
+@Immutable
+class ChatMessageEvent(
+    id: HexKey,
+    pubKey: HexKey,
+    createdAt: Long,
+    tags: List<List<String>>,
+    content: String,
+    sig: HexKey
+) : Event(id, pubKey, createdAt, kind, tags, content, sig) {
+    /**
+     * Recepients intended to receive this conversation
+     */
+    private fun recipientsPubKey() = tags.mapNotNull {
+        if (it.size > 1 && it[0] == "p") it[1] else null
+    }
+
+    fun replyTo() = tags.firstOrNull { it.size > 1 && it[0] == "e" }?.get(1)
+
+    companion object {
+        const val kind = 14
+
+        fun create(
+            msg: String,
+            to: List<String>? = null,
+            replyTos: List<String>? = null,
+            mentions: List<String>? = null,
+            zapReceiver: String? = null,
+            markAsSensitive: Boolean = false,
+            zapRaiserAmount: Long? = null,
+            geohash: String? = null,
+            privateKey: ByteArray,
+            createdAt: Long = TimeUtils.now()
+        ): ChatMessageEvent {
+            val content = msg
+            val tags = mutableListOf<List<String>>()
+            to?.forEach {
+                tags.add(listOf("p", it))
+            }
+            replyTos?.forEach {
+                tags.add(listOf("e", it))
+            }
+            mentions?.forEach {
+                tags.add(listOf("p", it, "", "mention"))
+            }
+            zapReceiver?.let {
+                tags.add(listOf("zap", it))
+            }
+            if (markAsSensitive) {
+                tags.add(listOf("content-warning", ""))
+            }
+            zapRaiserAmount?.let {
+                tags.add(listOf("zapraiser", "$it"))
+            }
+            geohash?.let {
+                tags.add(listOf("g", it))
+            }
+
+            val pubKey = CryptoUtils.pubkeyCreate(privateKey).toHexKey()
+            val id = generateId(pubKey, createdAt, ClassifiedsEvent.kind, tags, content)
+            val sig = CryptoUtils.sign(id, privateKey)
+            return ChatMessageEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())
+        }
+    }
+}

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

@@ -39,6 +39,10 @@ class ContactListEvent(
         unverifiedFollowTagSet().map { it.lowercase() }.toSet()
     }
 
+    val verifiedFollowGeohashSet: Set<String> by lazy {
+        unverifiedFollowGeohashSet().map { it.lowercase() }.toSet()
+    }
+
     val verifiedFollowCommunitySet: Set<String> by lazy {
         unverifiedFollowAddressSet().toSet()
     }
@@ -49,6 +53,7 @@ class ContactListEvent(
 
     fun unverifiedFollowKeySet() = tags.filter { it[0] == "p" }.mapNotNull { it.getOrNull(1) }
     fun unverifiedFollowTagSet() = tags.filter { it[0] == "t" }.mapNotNull { it.getOrNull(1) }
+    fun unverifiedFollowGeohashSet() = tags.filter { it[0] == "g" }.mapNotNull { it.getOrNull(1) }
 
     fun unverifiedFollowAddressSet() = tags.filter { it[0] == "a" }.mapNotNull { it.getOrNull(1) }
 
@@ -82,6 +87,7 @@ class ContactListEvent(
         fun createFromScratch(
             followUsers: List<Contact>,
             followTags: List<String>,
+            followGeohashes: List<String>,
             followCommunities: List<ATag>,
             followEvents: List<String>,
             relayUse: Map<String, ReadWrite>?,
@@ -110,6 +116,8 @@ class ContactListEvent(
                 } else {
                     listOf("a", it.toTag())
                 }
+            } + followGeohashes.map {
+                listOf("g", it)
             }
 
             return create(
@@ -164,6 +172,28 @@ class ContactListEvent(
             )
         }
 
+        fun followGeohash(earlierVersion: ContactListEvent, hashtag: String, privateKey: ByteArray, createdAt: Long = TimeUtils.now()): ContactListEvent {
+            if (earlierVersion.isTaggedGeoHash(hashtag)) return earlierVersion
+
+            return create(
+                content = earlierVersion.content,
+                tags = earlierVersion.tags.plus(element = listOf("g", hashtag)),
+                privateKey = privateKey,
+                createdAt = createdAt
+            )
+        }
+
+        fun unfollowGeohash(earlierVersion: ContactListEvent, hashtag: String, privateKey: ByteArray, createdAt: Long = TimeUtils.now()): ContactListEvent {
+            if (!earlierVersion.isTaggedGeoHash(hashtag)) return earlierVersion
+
+            return create(
+                content = earlierVersion.content,
+                tags = earlierVersion.tags.filter { it.size > 1 && it[1] != hashtag },
+                privateKey = privateKey,
+                createdAt = createdAt
+            )
+        }
+
         fun followEvent(earlierVersion: ContactListEvent, idHex: String, privateKey: ByteArray, createdAt: Long = TimeUtils.now()): ContactListEvent {
             if (earlierVersion.isTaggedEvent(idHex)) return earlierVersion
 

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

@@ -9,8 +9,8 @@ import com.vitorpamplona.amethyst.model.TimeUtils
 import com.vitorpamplona.amethyst.model.toHexKey
 import com.vitorpamplona.amethyst.service.CryptoUtils
 import com.vitorpamplona.amethyst.service.nip19.Nip19
+import com.vitorpamplona.amethyst.service.relays.bytesUsedInMemory
 import fr.acinq.secp256k1.Hex
-import fr.acinq.secp256k1.Secp256k1
 import java.lang.reflect.Type
 import java.math.BigDecimal
 import java.util.*
@@ -25,6 +25,16 @@ open class Event(
     val content: String,
     val sig: HexKey
 ) : EventInterface {
+
+    override fun countMemory(): Long {
+        return 12L +
+            id.bytesUsedInMemory() +
+            pubKey.bytesUsedInMemory() +
+            tags.sumOf { it.sumOf { it.bytesUsedInMemory() } } +
+            content.bytesUsedInMemory() +
+            sig.bytesUsedInMemory()
+    }
+
     override fun id(): HexKey = id
 
     override fun pubKey(): HexKey = pubKey
@@ -70,6 +80,7 @@ open class Event(
     }
 
     override fun hashtags() = tags.filter { it.size > 1 && it[0] == "t" }.map { it[1] }
+    override fun geohashes() = tags.filter { it.size > 1 && it[0] == "g" }.map { it[1] }
 
     override fun matchTag1With(text: String) = tags.any { it.size > 1 && it[1].contains(text, true) }
 
@@ -82,7 +93,10 @@ open class Event(
     override fun isTaggedAddressableNotes(idHexes: Set<String>) = tags.any { it.size > 1 && it[0] == "a" && it[1] in idHexes }
 
     override fun isTaggedHash(hashtag: String) = tags.any { it.size > 1 && it[0] == "t" && it[1].equals(hashtag, true) }
+
+    override fun isTaggedGeoHash(hashtag: String) = tags.any { it.size > 1 && it[0] == "g" && it[1].startsWith(hashtag, true) }
     override fun isTaggedHashes(hashtags: Set<String>) = tags.any { it.size > 1 && it[0] == "t" && it[1].lowercase() in hashtags }
+    override fun isTaggedGeoHashes(hashtags: Set<String>) = tags.any { it.size > 1 && it[0] == "g" && it[1].lowercase() in hashtags }
     override fun firstIsTaggedHashes(hashtags: Set<String>) = tags.firstOrNull { it.size > 1 && it[0] == "t" && it[1].lowercase() in hashtags }?.getOrNull(1)
 
     override fun firstIsTaggedAddressableNote(addressableNotes: Set<String>) = tags.firstOrNull { it.size > 1 && it[0] == "a" && it[1] in addressableNotes }?.getOrNull(1)
@@ -123,6 +137,10 @@ open class Event(
         return rank
     }
 
+    override fun getGeoHash(): String? {
+        return tags.firstOrNull { it.size > 1 && it[0] == "g" }?.get(1)?.ifBlank { null }
+    }
+
     override fun getReward(): BigDecimal? {
         return try {
             tags.firstOrNull { it.size > 1 && it[0] == "reward" }?.get(1)?.let { BigDecimal(it) }
@@ -253,8 +271,6 @@ open class Event(
     }
 
     companion object {
-        private val secp256k1 = Secp256k1.get()
-
         val gson: Gson = GsonBuilder()
             .disableHtmlEscaping()
             .registerTypeAdapter(Event::class.java, EventSerializer())
@@ -269,52 +285,8 @@ open class Event(
 
         fun fromJson(json: JsonElement, lenient: Boolean = false): Event = gson.fromJson(json, Event::class.java).getRefinedEvent(lenient)
 
-        fun Event.getRefinedEvent(lenient: Boolean = false): Event = when (kind) {
-            AppDefinitionEvent.kind -> AppDefinitionEvent(id, pubKey, createdAt, tags, content, sig)
-            AppRecommendationEvent.kind -> AppRecommendationEvent(id, pubKey, createdAt, tags, content, sig)
-            AudioTrackEvent.kind -> AudioTrackEvent(id, pubKey, createdAt, tags, content, sig)
-            BadgeAwardEvent.kind -> BadgeAwardEvent(id, pubKey, createdAt, tags, content, sig)
-            BadgeDefinitionEvent.kind -> BadgeDefinitionEvent(id, pubKey, createdAt, tags, content, sig)
-            BadgeProfilesEvent.kind -> BadgeProfilesEvent(id, pubKey, createdAt, tags, content, sig)
-            BookmarkListEvent.kind -> BookmarkListEvent(id, pubKey, createdAt, tags, content, sig)
-            ChannelCreateEvent.kind -> ChannelCreateEvent(id, pubKey, createdAt, tags, content, sig)
-            ChannelHideMessageEvent.kind -> ChannelHideMessageEvent(id, pubKey, createdAt, tags, content, sig)
-            ChannelMessageEvent.kind -> ChannelMessageEvent(id, pubKey, createdAt, tags, content, sig)
-            ChannelMetadataEvent.kind -> ChannelMetadataEvent(id, pubKey, createdAt, tags, content, sig)
-            ChannelMuteUserEvent.kind -> ChannelMuteUserEvent(id, pubKey, createdAt, tags, content, sig)
-            ClassifiedsEvent.kind -> ClassifiedsEvent(id, pubKey, createdAt, tags, content, sig)
-            CommunityDefinitionEvent.kind -> CommunityDefinitionEvent(id, pubKey, createdAt, tags, content, sig)
-            CommunityPostApprovalEvent.kind -> CommunityPostApprovalEvent(id, pubKey, createdAt, tags, content, sig)
-            ContactListEvent.kind -> ContactListEvent(id, pubKey, createdAt, tags, content, sig)
-            DeletionEvent.kind -> DeletionEvent(id, pubKey, createdAt, tags, content, sig)
-            EmojiPackEvent.kind -> EmojiPackEvent(id, pubKey, createdAt, tags, content, sig)
-            EmojiPackSelectionEvent.kind -> EmojiPackSelectionEvent(id, pubKey, createdAt, tags, content, sig)
-
-            FileHeaderEvent.kind -> FileHeaderEvent(id, pubKey, createdAt, tags, content, sig)
-            FileStorageEvent.kind -> FileStorageEvent(id, pubKey, createdAt, tags, content, sig)
-            FileStorageHeaderEvent.kind -> FileStorageHeaderEvent(id, pubKey, createdAt, tags, content, sig)
-            GenericRepostEvent.kind -> GenericRepostEvent(id, pubKey, createdAt, tags, content, sig)
-            HighlightEvent.kind -> HighlightEvent(id, pubKey, createdAt, tags, content, sig)
-            LiveActivitiesEvent.kind -> LiveActivitiesEvent(id, pubKey, createdAt, tags, content, sig)
-            LiveActivitiesChatMessageEvent.kind -> LiveActivitiesChatMessageEvent(id, pubKey, createdAt, tags, content, sig)
-            LnZapEvent.kind -> LnZapEvent(id, pubKey, createdAt, tags, content, sig)
-            LnZapPaymentRequestEvent.kind -> LnZapPaymentRequestEvent(id, pubKey, createdAt, tags, content, sig)
-            LnZapPaymentResponseEvent.kind -> LnZapPaymentResponseEvent(id, pubKey, createdAt, tags, content, sig)
-            LnZapRequestEvent.kind -> LnZapRequestEvent(id, pubKey, createdAt, tags, content, sig)
-            LongTextNoteEvent.kind -> LongTextNoteEvent(id, pubKey, createdAt, tags, content, sig)
-            MetadataEvent.kind -> MetadataEvent(id, pubKey, createdAt, tags, content, sig)
-            NNSEvent.kind -> NNSEvent(id, pubKey, createdAt, tags, content, sig)
-            PeopleListEvent.kind -> PeopleListEvent(id, pubKey, createdAt, tags, content, sig)
-            PinListEvent.kind -> PinListEvent(id, pubKey, createdAt, tags, content, sig)
-            PollNoteEvent.kind -> PollNoteEvent(id, pubKey, createdAt, tags, content, sig)
-            PrivateDmEvent.kind -> PrivateDmEvent(id, pubKey, createdAt, tags, content, sig)
-            ReactionEvent.kind -> ReactionEvent(id, pubKey, createdAt, tags, content, sig)
-            RecommendRelayEvent.kind -> RecommendRelayEvent(id, pubKey, createdAt, tags, content, sig, lenient)
-            RelaySetEvent.kind -> RelaySetEvent(id, pubKey, createdAt, tags, content, sig)
-            ReportEvent.kind -> ReportEvent(id, pubKey, createdAt, tags, content, sig)
-            RepostEvent.kind -> RepostEvent(id, pubKey, createdAt, tags, content, sig)
-            TextNoteEvent.kind -> TextNoteEvent(id, pubKey, createdAt, tags, content, sig)
-            else -> this
+        fun Event.getRefinedEvent(lenient: Boolean = false): Event {
+            return EventFactory.create(id, pubKey, createdAt, kind, tags, content, sig, lenient)
         }
 
         fun generateId(pubKey: HexKey, createdAt: Long, kind: Int, tags: List<List<String>>, content: String): ByteArray {

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

@@ -0,0 +1,106 @@
+package com.vitorpamplona.amethyst.service.model
+
+import com.vitorpamplona.amethyst.model.toHexKey
+
+class EventFactory {
+    companion object {
+        fun create(
+            id: String,
+            pubKey: String,
+            createdAt: Long,
+            kind: Int,
+            tags: List<List<String>>,
+            content: String,
+            sig: String,
+            lenient: Boolean
+        ): Event {
+            val internedTags = tags.map {
+                it.map {
+                    it.intern()
+                }
+            }
+
+            return internedCreate(
+                id = id.intern(),
+                pubKey = pubKey.intern(),
+                createdAt = createdAt,
+                kind = kind,
+                tags = internedTags,
+                content = content,
+                sig = sig,
+                lenient = lenient
+            )
+        }
+
+        fun internedCreate(
+            id: String,
+            pubKey: String,
+            createdAt: Long,
+            kind: Int,
+            tags: List<List<String>>,
+            content: String,
+            sig: String,
+            lenient: Boolean
+        ) = when (kind) {
+            AppDefinitionEvent.kind -> AppDefinitionEvent(id, pubKey, createdAt, tags, content, sig)
+            AppRecommendationEvent.kind -> AppRecommendationEvent(id, pubKey, createdAt, tags, content, sig)
+            AudioTrackEvent.kind -> AudioTrackEvent(id, pubKey, createdAt, tags, content, sig)
+            BadgeAwardEvent.kind -> BadgeAwardEvent(id, pubKey, createdAt, tags, content, sig)
+            BadgeDefinitionEvent.kind -> BadgeDefinitionEvent(id, pubKey, createdAt, tags, content, sig)
+            BadgeProfilesEvent.kind -> BadgeProfilesEvent(id, pubKey, createdAt, tags, content, sig)
+            BookmarkListEvent.kind -> BookmarkListEvent(id, pubKey, createdAt, tags, content, sig)
+            ChannelCreateEvent.kind -> ChannelCreateEvent(id, pubKey, createdAt, tags, content, sig)
+            ChannelHideMessageEvent.kind -> ChannelHideMessageEvent(id, pubKey, createdAt, tags, content, sig)
+            ChannelMessageEvent.kind -> ChannelMessageEvent(id, pubKey, createdAt, tags, content, sig)
+            ChannelMetadataEvent.kind -> ChannelMetadataEvent(id, pubKey, createdAt, tags, content, sig)
+            ChannelMuteUserEvent.kind -> ChannelMuteUserEvent(id, pubKey, createdAt, tags, content, sig)
+            ChatMessageEvent.kind -> {
+                if (id.isBlank()) {
+                    val id = Event.generateId(pubKey, createdAt, kind, tags, content).toHexKey()
+                    ChatMessageEvent(id, pubKey, createdAt, tags, content, sig)
+                } else {
+                    ChatMessageEvent(id, pubKey, createdAt, tags, content, sig)
+                }
+            }
+            ClassifiedsEvent.kind -> ClassifiedsEvent(id, pubKey, createdAt, tags, content, sig)
+            CommunityDefinitionEvent.kind -> CommunityDefinitionEvent(id, pubKey, createdAt, tags, content, sig)
+            CommunityPostApprovalEvent.kind -> CommunityPostApprovalEvent(id, pubKey, createdAt, tags, content, sig)
+            ContactListEvent.kind -> ContactListEvent(id, pubKey, createdAt, tags, content, sig)
+            DeletionEvent.kind -> DeletionEvent(id, pubKey, createdAt, tags, content, sig)
+
+            // Will never happen.
+            // DirectMessageEvent.kind -> DirectMessageEvent(createdAt, tags, content)
+
+            EmojiPackEvent.kind -> EmojiPackEvent(id, pubKey, createdAt, tags, content, sig)
+            EmojiPackSelectionEvent.kind -> EmojiPackSelectionEvent(id, pubKey, createdAt, tags, content, sig)
+            SealedGossipEvent.kind -> SealedGossipEvent(id, pubKey, createdAt, tags, content, sig)
+
+            FileHeaderEvent.kind -> FileHeaderEvent(id, pubKey, createdAt, tags, content, sig)
+            FileStorageEvent.kind -> FileStorageEvent(id, pubKey, createdAt, tags, content, sig)
+            FileStorageHeaderEvent.kind -> FileStorageHeaderEvent(id, pubKey, createdAt, tags, content, sig)
+            GenericRepostEvent.kind -> GenericRepostEvent(id, pubKey, createdAt, tags, content, sig)
+            GiftWrapEvent.kind -> GiftWrapEvent(id, pubKey, createdAt, tags, content, sig)
+            HighlightEvent.kind -> HighlightEvent(id, pubKey, createdAt, tags, content, sig)
+            LiveActivitiesEvent.kind -> LiveActivitiesEvent(id, pubKey, createdAt, tags, content, sig)
+            LiveActivitiesChatMessageEvent.kind -> LiveActivitiesChatMessageEvent(id, pubKey, createdAt, tags, content, sig)
+            LnZapEvent.kind -> LnZapEvent(id, pubKey, createdAt, tags, content, sig)
+            LnZapPaymentRequestEvent.kind -> LnZapPaymentRequestEvent(id, pubKey, createdAt, tags, content, sig)
+            LnZapPaymentResponseEvent.kind -> LnZapPaymentResponseEvent(id, pubKey, createdAt, tags, content, sig)
+            LnZapRequestEvent.kind -> LnZapRequestEvent(id, pubKey, createdAt, tags, content, sig)
+            LongTextNoteEvent.kind -> LongTextNoteEvent(id, pubKey, createdAt, tags, content, sig)
+            MetadataEvent.kind -> MetadataEvent(id, pubKey, createdAt, tags, content, sig)
+            NNSEvent.kind -> NNSEvent(id, pubKey, createdAt, tags, content, sig)
+            PeopleListEvent.kind -> PeopleListEvent(id, pubKey, createdAt, tags, content, sig)
+            PinListEvent.kind -> PinListEvent(id, pubKey, createdAt, tags, content, sig)
+            PollNoteEvent.kind -> PollNoteEvent(id, pubKey, createdAt, tags, content, sig)
+            PrivateDmEvent.kind -> PrivateDmEvent(id, pubKey, createdAt, tags, content, sig)
+            ReactionEvent.kind -> ReactionEvent(id, pubKey, createdAt, tags, content, sig)
+            RecommendRelayEvent.kind -> RecommendRelayEvent(id, pubKey, createdAt, tags, content, sig, lenient)
+            RelaySetEvent.kind -> RelaySetEvent(id, pubKey, createdAt, tags, content, sig)
+            ReportEvent.kind -> ReportEvent(id, pubKey, createdAt, tags, content, sig)
+            RepostEvent.kind -> RepostEvent(id, pubKey, createdAt, tags, content, sig)
+            TextNoteEvent.kind -> TextNoteEvent(id, pubKey, createdAt, tags, content, sig)
+            else -> Event(id, pubKey, createdAt, kind, tags, content, sig)
+        }
+    }
+}

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

@@ -6,6 +6,8 @@ import java.math.BigDecimal
 
 @Immutable
 interface EventInterface {
+    fun countMemory(): Long
+
     fun id(): HexKey
 
     fun pubKey(): HexKey
@@ -34,7 +36,11 @@ interface EventInterface {
     fun isTaggedAddressableNotes(idHexes: Set<String>): Boolean
 
     fun isTaggedHash(hashtag: String): Boolean
+    fun isTaggedGeoHash(hashtag: String): Boolean
+
     fun isTaggedHashes(hashtags: Set<String>): Boolean
+    fun isTaggedGeoHashes(hashtags: Set<String>): Boolean
+
     fun firstIsTaggedHashes(hashtags: Set<String>): String?
     fun firstIsTaggedAddressableNote(addressableNotes: Set<String>): String?
 
@@ -42,9 +48,11 @@ interface EventInterface {
     fun getTagOfAddressableKind(kind: Int): ATag?
 
     fun hashtags(): List<String>
+    fun geohashes(): List<String>
 
     fun getReward(): BigDecimal?
     fun getPoWRank(): Int
+    fun getGeoHash(): String?
 
     fun zapAddress(): String?
     fun isSensitive(): Boolean

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

@@ -28,9 +28,9 @@ abstract class GeneralListEvent(
         if (content.isBlank()) return null
 
         return try {
-            val sharedSecret = CryptoUtils.getSharedSecret(privKey, pubKey.hexToByteArray())
+            val sharedSecret = CryptoUtils.getSharedSecretNIP04(privKey, pubKey.hexToByteArray())
 
-            return CryptoUtils.decrypt(content, sharedSecret)
+            return CryptoUtils.decryptNIP04(content, sharedSecret)
         } catch (e: Exception) {
             Log.w("GeneralList", "Error decrypting the message ${e.message} for ${dTag()}")
             null
@@ -61,6 +61,7 @@ abstract class GeneralListEvent(
     fun privateTaggedUsers(privKey: ByteArray) = privateTags(privKey)?.filter { it.size > 1 && it[0] == "p" }?.map { it[1] }
 
     fun privateHashtags(privKey: ByteArray) = privateTags(privKey)?.filter { it.size > 1 && it[0] == "t" }?.map { it[1] }
+    fun privateGeohashes(privKey: ByteArray) = privateTags(privKey)?.filter { it.size > 1 && it[0] == "g" }?.map { it[1] }
     fun privateTaggedEvents(privKey: ByteArray) = privateTags(privKey)?.filter { it.size > 1 && it[0] == "e" }?.map { it[1] }
     fun privateTaggedAddresses(privKey: ByteArray) = privateTags(privKey)?.filter { it.firstOrNull() == "a" }?.mapNotNull {
         val aTagValue = it.getOrNull(1)
@@ -90,7 +91,7 @@ abstract class GeneralListEvent(
             }
             val msg = gson.toJson(privTags)
 
-            return CryptoUtils.encrypt(
+            return CryptoUtils.encryptNIP04(
                 msg,
                 privateKey,
                 pubKey
@@ -101,7 +102,7 @@ abstract class GeneralListEvent(
             privateTags: List<List<String>>? = null,
             privateKey: ByteArray
         ): String {
-            return CryptoUtils.encrypt(
+            return CryptoUtils.encryptNIP04(
                 msg = gson.toJson(privateTags),
                 privateKey = privateKey,
                 pubKey = CryptoUtils.pubkeyCreate(privateKey)

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

@@ -0,0 +1,84 @@
+package com.vitorpamplona.amethyst.service.model
+
+import android.util.Log
+import androidx.compose.runtime.Immutable
+import com.vitorpamplona.amethyst.model.HexKey
+import com.vitorpamplona.amethyst.model.TimeUtils
+import com.vitorpamplona.amethyst.model.hexToByteArray
+import com.vitorpamplona.amethyst.model.toHexKey
+import com.vitorpamplona.amethyst.service.CryptoUtils
+import com.vitorpamplona.amethyst.service.EncryptedInfo
+import com.vitorpamplona.amethyst.service.relays.Client
+
+@Immutable
+class GiftWrapEvent(
+    id: HexKey,
+    pubKey: HexKey,
+    createdAt: Long,
+    tags: List<List<String>>,
+    content: String,
+    sig: HexKey
+) : Event(id, pubKey, createdAt, kind, tags, content, sig) {
+    private var cachedInnerEvent: Map<HexKey, Event?> = mapOf()
+
+    fun cachedGossip(privKey: ByteArray): Event? {
+        val hex = privKey.toHexKey()
+        if (cachedInnerEvent.contains(hex)) return cachedInnerEvent[hex]
+
+        val myInnerEvent = unwrap(privKey = privKey)
+        cachedInnerEvent = cachedInnerEvent + Pair(hex, myInnerEvent)
+        return myInnerEvent
+    }
+
+    fun unwrap(privKey: ByteArray) = try {
+        plainContent(privKey)?.let { fromJson(it, Client.lenient) }
+    } catch (e: Exception) {
+        // Log.e("UnwrapError", "Couldn't Decrypt the content", e)
+        null
+    }
+
+    private fun plainContent(privKey: ByteArray): String? {
+        if (content.isBlank()) return null
+
+        return try {
+            val sharedSecret = CryptoUtils.getSharedSecretNIP24(privKey, pubKey.hexToByteArray())
+
+            val toDecrypt = gson.fromJson<EncryptedInfo>(
+                content,
+                EncryptedInfo::class.java
+            )
+
+            return CryptoUtils.decryptNIP24(toDecrypt, sharedSecret)
+        } catch (e: Exception) {
+            Log.w("GeneralList", "Error decrypting the message ${e.message}")
+            null
+        }
+    }
+
+    fun recipientPubKey() = tags.firstOrNull { it.size > 1 && it[0] == "p" }?.get(1)
+
+    companion object {
+        const val kind = 1059
+
+        fun create(
+            event: Event,
+            recipientPubKey: HexKey,
+            createdAt: Long = TimeUtils.now()
+        ): GiftWrapEvent {
+            val privateKey = CryptoUtils.privkeyCreate() // GiftWrap is always a random key
+            val sharedSecret = CryptoUtils.getSharedSecretNIP24(privateKey, recipientPubKey.hexToByteArray())
+
+            val content = gson.toJson(
+                CryptoUtils.encryptNIP24(
+                    gson.toJson(event),
+                    sharedSecret
+                )
+            )
+            val pubKey = CryptoUtils.pubkeyCreate(privateKey).toHexKey()
+            val tags = listOf(listOf("p", recipientPubKey))
+            val id = generateId(pubKey, createdAt, kind, tags, content)
+            val sig = CryptoUtils.sign(id, privateKey)
+            return GiftWrapEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())
+        }
+    }
+}

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

@@ -51,7 +51,8 @@ class LiveActivitiesChatMessageEvent(
             privateKey: ByteArray,
             createdAt: Long = TimeUtils.now(),
             markAsSensitive: Boolean,
-            zapRaiserAmount: Long?
+            zapRaiserAmount: Long?,
+            geohash: String? = null
         ): LiveActivitiesChatMessageEvent {
             val content = message
             val pubKey = CryptoUtils.pubkeyCreate(privateKey).toHexKey()
@@ -73,6 +74,9 @@ class LiveActivitiesChatMessageEvent(
             zapRaiserAmount?.let {
                 tags.add(listOf("zapraiser", "$it"))
             }
+            geohash?.let {
+                tags.add(listOf("g", it))
+            }
 
             val id = generateId(pubKey, createdAt, kind, tags, content)
             val sig = CryptoUtils.sign(id, privateKey)

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

@@ -35,9 +35,9 @@ class LnZapPaymentRequestEvent(
         }
 
         return try {
-            val sharedSecret = CryptoUtils.getSharedSecret(privKey, pubkey)
+            val sharedSecret = CryptoUtils.getSharedSecretNIP04(privKey, pubkey)
 
-            val jsonText = CryptoUtils.decrypt(content, sharedSecret)
+            val jsonText = CryptoUtils.decryptNIP04(content, sharedSecret)
 
             val payInvoiceMethod = gson.fromJson(jsonText, Request::class.java)
 
@@ -62,7 +62,7 @@ class LnZapPaymentRequestEvent(
             val pubKey = CryptoUtils.pubkeyCreate(privateKey)
             val serializedRequest = gson.toJson(PayInvoiceMethod.create(lnInvoice))
 
-            val content = CryptoUtils.encrypt(
+            val content = CryptoUtils.encryptNIP04(
                 serializedRequest,
                 privateKey,
                 walletServicePubkey.hexToByteArray()

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

@@ -30,9 +30,9 @@ class LnZapPaymentResponseEvent(
 
     private fun decrypt(privKey: ByteArray, pubKey: ByteArray): String? {
         return try {
-            val sharedSecret = CryptoUtils.getSharedSecret(privKey, pubKey)
+            val sharedSecret = CryptoUtils.getSharedSecretNIP04(privKey, pubKey)
 
-            val retVal = CryptoUtils.decrypt(content, sharedSecret)
+            val retVal = CryptoUtils.decryptNIP04(content, sharedSecret)
 
             if (retVal.startsWith(PrivateDmEvent.nip18Advertisement)) {
                 retVal.substring(16)

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

@@ -136,7 +136,7 @@ class LnZapRequestEvent(
         }
 
         private fun encryptPrivateZapMessage(msg: String, privkey: ByteArray, pubkey: ByteArray): String {
-            var sharedSecret = CryptoUtils.getSharedSecret(privkey, pubkey)
+            var sharedSecret = CryptoUtils.getSharedSecretNIP04(privkey, pubkey)
             val iv = ByteArray(16)
             SecureRandom().nextBytes(iv)
 
@@ -155,7 +155,7 @@ class LnZapRequestEvent(
         }
 
         private fun decryptPrivateZapMessage(msg: String, privkey: ByteArray, pubkey: ByteArray): String {
-            var sharedSecret = CryptoUtils.getSharedSecret(privkey, pubkey)
+            var sharedSecret = CryptoUtils.getSharedSecretNIP04(privkey, pubkey)
             if (sharedSecret.size != 16 && sharedSecret.size != 32) {
                 throw IllegalArgumentException("Invalid shared secret size")
             }

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

@@ -23,9 +23,9 @@ class MuteListEvent(
 
     fun plainContent(privKey: ByteArray): String? {
         return try {
-            val sharedSecret = CryptoUtils.getSharedSecret(privKey, pubKey.hexToByteArray())
+            val sharedSecret = CryptoUtils.getSharedSecretNIP04(privKey, pubKey.hexToByteArray())
 
-            return CryptoUtils.decrypt(content, sharedSecret)
+            return CryptoUtils.decryptNIP04(content, sharedSecret)
         } catch (e: Exception) {
             Log.w("BookmarkList", "Error decrypting the message ${e.message}")
             null
@@ -87,7 +87,7 @@ class MuteListEvent(
             }
             val msg = gson.toJson(privTags)
 
-            val content = CryptoUtils.encrypt(
+            val content = CryptoUtils.encryptNIP04(
                 msg,
                 privateKey,
                 pubKey

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

@@ -0,0 +1,32 @@
+package com.vitorpamplona.amethyst.service.model
+
+import com.vitorpamplona.amethyst.model.HexKey
+import com.vitorpamplona.amethyst.model.toHexKey
+import com.vitorpamplona.amethyst.service.CryptoUtils
+
+class NIP24Factory {
+    fun createMsgNIP24(
+        msg: String,
+        to: List<HexKey>,
+        from: ByteArray
+    ): List<GiftWrapEvent> {
+        val senderPublicKey = CryptoUtils.pubkeyCreate(from).toHexKey()
+
+        val senderMessage = ChatMessageEvent.create(
+            msg = msg,
+            to = to,
+            privateKey = from
+        )
+
+        return to.plus(senderPublicKey).map {
+            GiftWrapEvent.create(
+                event = SealedGossipEvent.create(
+                    event = senderMessage,
+                    encryptTo = it,
+                    privateKey = from
+                ),
+                recipientPubKey = it
+            )
+        }
+    }
+}

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

@@ -53,7 +53,8 @@ class PollNoteEvent(
             closedAt: Int?,
             zapReceiver: String?,
             markAsSensitive: Boolean,
-            zapRaiserAmount: Long?
+            zapRaiserAmount: Long?,
+            geohash: String? = null
         ): PollNoteEvent {
             val pubKey = CryptoUtils.pubkeyCreate(privateKey).toHexKey()
             val tags = mutableListOf<List<String>>()
@@ -83,6 +84,9 @@ class PollNoteEvent(
             zapRaiserAmount?.let {
                 tags.add(listOf("zapraiser", "$it"))
             }
+            geohash?.let {
+                tags.add(listOf("g", it))
+            }
 
             val id = generateId(pubKey, createdAt, kind, tags, msg)
             val sig = CryptoUtils.sign(id, privateKey)

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

@@ -55,9 +55,9 @@ class PrivateDmEvent(
 
     fun plainContent(privKey: ByteArray, pubKey: ByteArray): String? {
         return try {
-            val sharedSecret = CryptoUtils.getSharedSecret(privKey, pubKey)
+            val sharedSecret = CryptoUtils.getSharedSecretNIP04(privKey, pubKey)
 
-            val retVal = CryptoUtils.decrypt(content, sharedSecret)
+            val retVal = CryptoUtils.decryptNIP04(content, sharedSecret)
 
             if (retVal.startsWith(nip18Advertisement)) {
                 retVal.substring(16)
@@ -86,9 +86,10 @@ class PrivateDmEvent(
             publishedRecipientPubKey: ByteArray? = null,
             advertiseNip18: Boolean = true,
             markAsSensitive: Boolean,
-            zapRaiserAmount: Long?
+            zapRaiserAmount: Long?,
+            geohash: String? = null
         ): PrivateDmEvent {
-            val content = CryptoUtils.encrypt(
+            val content = CryptoUtils.encryptNIP04(
                 if (advertiseNip18) { nip18Advertisement } else { "" } + msg,
                 privateKey,
                 recipientPubKey
@@ -113,6 +114,10 @@ class PrivateDmEvent(
             zapRaiserAmount?.let {
                 tags.add(listOf("zapraiser", "$it"))
             }
+            geohash?.let {
+                tags.add(listOf("g", it))
+            }
+
             val id = generateId(pubKey, createdAt, kind, tags, content)
             val sig = CryptoUtils.sign(id, privateKey)
             return PrivateDmEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())

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

@@ -0,0 +1,122 @@
+package com.vitorpamplona.amethyst.service.model
+
+import android.util.Log
+import androidx.compose.runtime.Immutable
+import com.google.gson.annotations.SerializedName
+import com.vitorpamplona.amethyst.model.HexKey
+import com.vitorpamplona.amethyst.model.TimeUtils
+import com.vitorpamplona.amethyst.model.hexToByteArray
+import com.vitorpamplona.amethyst.model.toHexKey
+import com.vitorpamplona.amethyst.service.CryptoUtils
+import com.vitorpamplona.amethyst.service.EncryptedInfo
+import com.vitorpamplona.amethyst.service.relays.Client
+
+@Immutable
+class SealedGossipEvent(
+    id: HexKey,
+    pubKey: HexKey,
+    createdAt: Long,
+    tags: List<List<String>>,
+    content: String,
+    sig: HexKey
+) : Event(id, pubKey, createdAt, kind, tags, content, sig) {
+    private var cachedInnerEvent: Map<HexKey, Event?> = mapOf()
+
+    fun cachedGossip(privKey: ByteArray): Event? {
+        val hex = privKey.toHexKey()
+        if (cachedInnerEvent.contains(hex)) return cachedInnerEvent[hex]
+
+        val gossip = unseal(privKey = privKey)
+        val event = gossip?.mergeWith(this)
+        cachedInnerEvent = cachedInnerEvent + Pair(hex, event)
+        return event
+    }
+
+    fun unseal(privKey: ByteArray): Gossip? = try {
+        plainContent(privKey)?.let { gson.fromJson(it, Gossip::class.java) }
+    } catch (e: Exception) {
+        null
+    }
+
+    private fun plainContent(privKey: ByteArray): String? {
+        if (content.isBlank()) return null
+
+        return try {
+            val sharedSecret = CryptoUtils.getSharedSecretNIP24(privKey, pubKey.hexToByteArray())
+
+            val toDecrypt = gson.fromJson<EncryptedInfo>(
+                content,
+                EncryptedInfo::class.java
+            )
+
+            return CryptoUtils.decryptNIP24(toDecrypt, sharedSecret)
+        } catch (e: Exception) {
+            Log.w("GeneralList", "Error decrypting the message ${e.message}")
+            null
+        }
+    }
+
+    companion object {
+        const val kind = 13
+
+        fun create(
+            event: Event,
+            encryptTo: HexKey,
+            privateKey: ByteArray,
+            createdAt: Long = TimeUtils.now()
+        ): SealedGossipEvent {
+            val gossip = Gossip.create(event)
+            return create(gossip, encryptTo, privateKey, createdAt)
+        }
+
+        fun create(
+            gossip: Gossip,
+            encryptTo: HexKey,
+            privateKey: ByteArray,
+            createdAt: Long = TimeUtils.now()
+        ): SealedGossipEvent {
+            val sharedSecret = CryptoUtils.getSharedSecretNIP24(privateKey, encryptTo.hexToByteArray())
+
+            val content = gson.toJson(
+                CryptoUtils.encryptNIP24(
+                    gson.toJson(gossip),
+                    sharedSecret
+                )
+            )
+            val pubKey = CryptoUtils.pubkeyCreate(privateKey).toHexKey()
+            val tags = listOf<List<String>>()
+            val id = generateId(pubKey, createdAt, kind, tags, content)
+            val sig = CryptoUtils.sign(id, privateKey)
+            return SealedGossipEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())
+        }
+    }
+}
+
+class Gossip(
+    val id: HexKey?,
+    @SerializedName("pubkey")
+    val pubKey: HexKey?,
+    @SerializedName("created_at")
+    val createdAt: Long?,
+    val kind: Int?,
+    val tags: List<List<String>>?,
+    val content: String?
+) {
+    fun mergeWith(event: SealedGossipEvent): Event {
+        val newPubKey = pubKey?.ifBlank { null } ?: event.pubKey
+        val newCreatedAt = if (createdAt != null && createdAt > 1000) createdAt else event.createdAt
+        val newKind = kind ?: 0
+        val newTags = (tags ?: emptyList()).plus(event.tags)
+        val newContent = content ?: ""
+        val newID = id?.ifBlank { null } ?: Event.generateId(newPubKey, newCreatedAt, newKind, newTags, newContent).toHexKey()
+        val sig = ""
+
+        return EventFactory.create(newID, newPubKey, newCreatedAt, newKind, newTags, newContent, sig, Client.lenient)
+    }
+
+    companion object {
+        fun create(event: Event): Gossip {
+            return Gossip(event.id, event.pubKey, event.createdAt, event.kind, event.tags, event.content)
+        }
+    }
+}

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

@@ -38,6 +38,7 @@ class TextNoteEvent(
             replyingTo: String?,
             root: String?,
             directMentions: Set<HexKey>,
+            geohash: String? = null,
 
             privateKey: ByteArray,
             createdAt: Long = TimeUtils.now()
@@ -93,6 +94,9 @@ class TextNoteEvent(
             zapRaiserAmount?.let {
                 tags.add(listOf("zapraiser", "$it"))
             }
+            geohash?.let {
+                tags.add(listOf("g", it))
+            }
 
             val id = generateId(pubKey, createdAt, kind, tags, msg)
             val sig = CryptoUtils.sign(id, privateKey)

app/src/main/java/com/vitorpamplona/amethyst/service/nip19/Nip19.kt

@@ -5,7 +5,6 @@ import androidx.compose.runtime.Immutable
 import com.vitorpamplona.amethyst.model.hexToByteArray
 import com.vitorpamplona.amethyst.model.toHexKey
 import com.vitorpamplona.amethyst.service.bechToBytes
-import com.vitorpamplona.amethyst.service.toByteArray
 import com.vitorpamplona.amethyst.service.toNEvent
 import java.util.regex.Pattern
 
@@ -170,3 +169,11 @@ object Nip19 {
         return fullArray.toNEvent()
     }
 }
+
+fun Int.toByteArray(): ByteArray {
+    val bytes = ByteArray(4)
+    (0..3).forEach {
+        bytes[3 - it] = ((this ushr (8 * it)) and 0xFFFF).toByte()
+    }
+    return bytes
+}

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

@@ -26,9 +26,12 @@ class EventNotificationConsumer(private val applicationContext: Context) {
                 // adds to database
                 LocalCache.verifyAndConsume(event, null)
 
-                when (event) {
-                    is PrivateDmEvent -> notify(event)
-                    is LnZapEvent -> notify(event)
+                val manager = notificationManager()
+                if (manager.areNotificationsEnabled()) {
+                    when (event) {
+                        is PrivateDmEvent -> notify(event)
+                        is LnZapEvent -> notify(event)
+                    }
                 }
             }
         }

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

@@ -18,6 +18,8 @@ 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 fun getOrCreateDMChannel(applicationContext: Context): NotificationChannel {
         if (dmChannel != null) return dmChannel!!
@@ -70,7 +72,7 @@ object NotificationUtils {
         val zapChannel = getOrCreateZapChannel(applicationContext)
         val channelId = applicationContext.getString(R.string.app_notification_zaps_channel_id)
 
-        sendNotification(id, messageBody, messageTitle, pictureUrl, uri, channelId, applicationContext)
+        sendNotification(id, messageBody, messageTitle, pictureUrl, uri, channelId, ZAP_GROUP_KEY, applicationContext)
     }
 
     fun NotificationManager.sendDMNotification(
@@ -84,7 +86,7 @@ object NotificationUtils {
         val dmChannel = getOrCreateDMChannel(applicationContext)
         val channelId = applicationContext.getString(R.string.app_notification_dms_channel_id)
 
-        sendNotification(id, messageBody, messageTitle, pictureUrl, uri, channelId, applicationContext)
+        sendNotification(id, messageBody, messageTitle, pictureUrl, uri, channelId, DM_GROUP_KEY, applicationContext)
     }
 
     fun NotificationManager.sendNotification(
@@ -94,6 +96,7 @@ object NotificationUtils {
         pictureUrl: String?,
         uri: String,
         channelId: String,
+        notificationGroupKey: String,
         applicationContext: Context
     ) {
         if (pictureUrl != null) {
@@ -110,6 +113,7 @@ object NotificationUtils {
                 picture = imageResult.drawable as? BitmapDrawable,
                 uri = uri,
                 channelId,
+                notificationGroupKey,
                 applicationContext = applicationContext
             )
         } else {
@@ -120,6 +124,7 @@ object NotificationUtils {
                 picture = null,
                 uri = uri,
                 channelId,
+                notificationGroupKey,
                 applicationContext = applicationContext
             )
         }
@@ -132,6 +137,7 @@ object NotificationUtils {
         picture: BitmapDrawable?,
         uri: String,
         channelId: String,
+        notificationGroupKey: String,
         applicationContext: Context
     ) {
         val notId = id.hashCode()
@@ -164,7 +170,8 @@ object NotificationUtils {
             .setContentTitle(messageTitle)
             .setContentText(applicationContext.getString(R.string.app_notification_private_message))
             .setLargeIcon(picture?.bitmap)
-            .setGroup(messageTitle)
+            // .setGroup(messageTitle)
+            // .setGroup(notificationGroupKey) //-> Might need a Group summary as well before we activate this
             .setContentIntent(contentPendingIntent)
             .setPriority(NotificationCompat.PRIORITY_HIGH)
             .setAutoCancel(true)
@@ -178,7 +185,8 @@ object NotificationUtils {
             .setContentTitle(messageTitle)
             .setContentText(messageBody)
             .setLargeIcon(picture?.bitmap)
-            .setGroup(messageTitle)
+            // .setGroup(messageTitle)
+            // .setGroup(notificationGroupKey)  //-> Might need a Group summary as well before we activate this
             .setContentIntent(contentPendingIntent)
             .setPublicVersion(builderPublic.build())
             .setPriority(NotificationCompat.PRIORITY_HIGH)

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

@@ -56,7 +56,9 @@ class RegisterAccounts(
 
             val client = HttpClient.getHttpClient()
 
-            client.newCall(request).execute()
+            val isSucess = client.newCall(request).execute().use {
+                it.isSuccessful
+            }
         } catch (e: java.lang.Exception) {
             Log.e("FirebaseMsgService", "Unable to register with push server", e)
         }

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

@@ -1,25 +1,21 @@
 package com.vitorpamplona.amethyst.service.previews
 
 import android.net.Uri
-import com.vitorpamplona.amethyst.service.checkNotInMainThread
 import kotlinx.coroutines.*
 import java.util.*
 
 class BahaUrlPreview(val url: String, var callback: IUrlPreviewCallback?) {
-    val scope = CoroutineScope(Job() + Dispatchers.IO)
     private val imageExtensionArray = arrayOf(".gif", ".png", ".jpg", ".jpeg", ".bmp", ".webp")
 
-    fun fetchUrlPreview(timeOut: Int = 30000) {
-        val exceptionHandler = CoroutineExceptionHandler { coroutineContext, throwable ->
-            callback?.onFailed(throwable)
-        }
-        scope.launch(exceptionHandler) {
+    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) {
-        checkNotInMainThread()
         lateinit var urlInfoItem: UrlInfoItem
         if (checkIsImageUrl()) {
             urlInfoItem = UrlInfoItem(url = url, image = url)
@@ -43,7 +39,6 @@ class BahaUrlPreview(val url: String, var callback: IUrlPreviewCallback?) {
     }
 
     fun cleanUp() {
-        scope.cancel()
         callback = null
     }
 }

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

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

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

@@ -63,7 +63,9 @@ private const val CONTENT = "content"
 suspend fun getDocument(url: String, timeOut: Int = 30000): Document =
     withContext(Dispatchers.IO) {
         val request: Request = Request.Builder().url(url).get().build()
-        val html = HttpClient.getHttpClient().newCall(request).execute().body.string()
+        val html = HttpClient.getHttpClient().newCall(request).execute().use {
+            it.body.string()
+        }
 
         Jsoup.parse(html)
     }

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

@@ -112,7 +112,7 @@ object Client : RelayPool.Listener {
         val relay = Relay(url, true, true, feedTypes ?: emptySet(), HttpClient.getProxy())
         RelayPool.addRelay(relay)
 
-        relay.requestAndWatch {
+        relay.connectAndRun {
             allSubscriptions().forEach {
                 relay.sendFilter(requestId = it)
             }

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

@@ -15,6 +15,7 @@ import okhttp3.WebSocket
 import okhttp3.WebSocketListener
 import java.net.Proxy
 import java.time.Duration
+import java.util.concurrent.atomic.AtomicBoolean
 
 enum class FeedType {
     FOLLOWS, PUBLIC_CHATS, PRIVATE_DMS, GLOBAL, SEARCH, WALLET_CONNECT
@@ -29,14 +30,16 @@ class Relay(
     var activeTypes: Set<FeedType> = FeedType.values().toSet(),
     proxy: Proxy?
 ) {
-    val seconds = if (proxy != null) 20L else 10L
-    val duration = Duration.ofSeconds(seconds)
+    companion object {
+        // waits 3 minutes to reconnect once things fail
+        const val RECONNECTING_IN_SECONDS = 60 * 3
+    }
 
     private val httpClient = OkHttpClient.Builder()
         .proxy(proxy)
-        .readTimeout(duration)
-        .connectTimeout(duration)
-        .writeTimeout(duration)
+        .readTimeout(Duration.ofSeconds(if (proxy != null) 20L else 10L))
+        .connectTimeout(Duration.ofSeconds(if (proxy != null) 20L else 10L))
+        .writeTimeout(Duration.ofSeconds(if (proxy != null) 20L else 10L))
         .followRedirects(true)
         .followSslRedirects(true)
         .build()
@@ -50,9 +53,9 @@ class Relay(
 
     var spamCounter = 0
     var errorCounter = 0
-    var ping: Long? = null
+    var pingInMs: Long? = null
 
-    var closingTime = 0L
+    var closingTimeInSeconds = 0L
 
     var afterEOSE = false
 
@@ -68,10 +71,8 @@ class Relay(
         return socket != null
     }
 
-    @Synchronized
-    fun requestAndWatch() {
-        checkNotInMainThread()
-        requestAndWatch {
+    fun connect() {
+        connectAndRun {
             checkNotInMainThread()
 
             // Sends everything.
@@ -81,9 +82,16 @@ class Relay(
         }
     }
 
-    @Synchronized
-    fun requestAndWatch(onConnected: (Relay) -> Unit) {
+    private var connectingBlock = AtomicBoolean()
+
+    fun connectAndRun(onConnected: (Relay) -> Unit) {
+        // If there is a connection, don't wait.
+        if (connectingBlock.getAndSet(true)) {
+            return
+        }
+
         checkNotInMainThread()
+
         if (socket != null) return
 
         try {
@@ -91,132 +99,143 @@ class Relay(
                 .header("User-Agent", "Amethyst/${BuildConfig.VERSION_NAME}")
                 .url(url.trim())
                 .build()
-            val listener = object : WebSocketListener() {
 
-                override fun onOpen(webSocket: WebSocket, response: Response) {
-                    checkNotInMainThread()
+            socket = httpClient.newWebSocket(request, RelayListener(onConnected))
+        } catch (e: Exception) {
+            errorCounter++
+            markConnectionAsClosed()
+            Log.e("Relay", "Relay Invalid $url")
+            e.printStackTrace()
+        } finally {
+            connectingBlock.set(false)
+        }
+    }
 
-                    afterEOSE = false
-                    isReady = true
-                    ping = response.receivedResponseAtMillis - response.sentRequestAtMillis
-                    // Log.w("Relay", "Relay OnOpen, Loading All subscriptions $url")
-                    onConnected(this@Relay)
+    inner class RelayListener(val onConnected: (Relay) -> Unit) : WebSocketListener() {
+        override fun onOpen(webSocket: WebSocket, response: Response) {
+            checkNotInMainThread()
 
-                    listeners.forEach { it.onRelayStateChange(this@Relay, Type.CONNECT, null) }
+            markConnectionAsReady(response.receivedResponseAtMillis - response.sentRequestAtMillis)
+
+            // Log.w("Relay", "Relay OnOpen, Loading All subscriptions $url")
+            onConnected(this@Relay)
+
+            listeners.forEach { it.onRelayStateChange(this@Relay, Type.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 onMessage(webSocket: WebSocket, text: String) {
-                    checkNotInMainThread()
+        override fun onClosing(webSocket: WebSocket, code: Int, reason: String) {
+            checkNotInMainThread()
 
-                    eventDownloadCounterInBytes += text.bytesUsedInMemory()
+            listeners.forEach {
+                it.onRelayStateChange(
+                    this@Relay,
+                    Type.DISCONNECTING,
+                    null
+                )
+            }
+        }
 
-                    try {
-                        val msg = Event.gson.fromJson(text, JsonElement::class.java).asJsonArray
-                        val type = msg[0].asString
-                        val channel = msg[1].asString
+        override fun onClosed(webSocket: WebSocket, code: Int, reason: String) {
+            checkNotInMainThread()
 
-                        when (type) {
-                            "EVENT" -> {
-                                val event = Event.fromJson(msg[2], Client.lenient)
+            markConnectionAsClosed()
 
-                                // Log.w("Relay", "Relay onEVENT $url, $channel")
-                                listeners.forEach {
-                                    it.onEvent(this@Relay, channel, event)
-                                    if (afterEOSE) {
-                                        it.onRelayStateChange(this@Relay, Type.EOSE, channel)
-                                    }
-                                }
-                            }
-                            "EOSE" -> listeners.forEach {
-                                afterEOSE = true
-                                // Log.w("Relay", "Relay onEOSE $url, $channel")
-                                it.onRelayStateChange(this@Relay, Type.EOSE, channel)
-                            }
-                            "NOTICE" -> listeners.forEach {
-                                Log.w("Relay", "Relay onNotice $url, $channel")
-                                it.onError(this@Relay, channel, Error("Relay sent notice: " + channel))
-                            }
-                            "OK" -> listeners.forEach {
-                                Log.w("Relay", "Relay on OK $url, ${msg[1].asString}, ${msg[2].asBoolean}, ${msg[3].asString}")
-                                it.onSendResponse(this@Relay, msg[1].asString, msg[2].asBoolean, msg[3].asString)
-                            }
-                            "AUTH" -> listeners.forEach {
-                                // Log.w("Relay", "Relay$url, ${msg[1].asString}")
-                                it.onAuth(this@Relay, msg[1].asString)
-                            }
-                            else -> listeners.forEach {
-                                // Log.w("Relay", "Relay something else $url, $channel")
-                                it.onError(
-                                    this@Relay,
-                                    channel,
-                                    Error("Unknown type $type on channel $channel. Msg was $text")
-                                )
-                            }
-                        }
-                    } catch (t: Throwable) {
-                        t.printStackTrace()
-                        text.chunked(2000) { chunked ->
-                            listeners.forEach { it.onError(this@Relay, "", Error("Problem with $chunked")) }
-                        }
-                    }
-                }
+            listeners.forEach { it.onRelayStateChange(this@Relay, Type.DISCONNECT, null) }
+        }
 
-                override fun onClosing(webSocket: WebSocket, code: Int, reason: String) {
-                    checkNotInMainThread()
+        override fun onFailure(webSocket: WebSocket, t: Throwable, response: Response?) {
+            checkNotInMainThread()
 
-                    listeners.forEach {
-                        it.onRelayStateChange(
-                            this@Relay,
-                            Type.DISCONNECTING,
-                            null
-                        )
-                    }
-                }
+            errorCounter++
 
-                override fun onClosed(webSocket: WebSocket, code: Int, reason: String) {
-                    checkNotInMainThread()
+            socket?.close(1000, "Normal close")
+            // Failures disconnect the relay.
+            markConnectionAsClosed()
 
-                    socket = null
-                    isReady = false
-                    afterEOSE = false
-                    closingTime = TimeUtils.now()
-                    listeners.forEach { it.onRelayStateChange(this@Relay, Type.DISCONNECT, null) }
-                }
+            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))
+            }
+        }
+    }
 
-                override fun onFailure(webSocket: WebSocket, t: Throwable, response: Response?) {
-                    checkNotInMainThread()
+    fun markConnectionAsReady(pingInMs: Long) {
+        this.afterEOSE = false
+        this.isReady = true
+        this.pingInMs = pingInMs
+    }
 
-                    errorCounter++
+    fun markConnectionAsClosed() {
+        this.socket = null
+        this.isReady = false
+        this.afterEOSE = false
+        this.closingTimeInSeconds = TimeUtils.now()
+    }
 
-                    socket?.close(1000, "Normal close")
-                    // Failures disconnect the relay.
-                    socket = null
-                    isReady = false
-                    afterEOSE = false
-                    closingTime = TimeUtils.now()
+    fun processNewRelayMessage(newMessage: String) {
+        val msgArray = Event.gson.fromJson(newMessage, JsonElement::class.java).asJsonArray
+        val type = msgArray[0].asString
+        val channel = msgArray[1].asString
 
-                    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))
+        when (type) {
+            "EVENT" -> {
+                val event = Event.fromJson(msgArray[2], Client.lenient)
+
+                // Log.w("Relay", "Relay onEVENT $url, $channel")
+                listeners.forEach {
+                    it.onEvent(this@Relay, channel, event)
+                    if (afterEOSE) {
+                        it.onRelayStateChange(this@Relay, Type.EOSE, channel)
                     }
                 }
             }
-
-            socket = httpClient.newWebSocket(request, listener)
-        } catch (e: Exception) {
-            errorCounter++
-            isReady = false
-            afterEOSE = false
-            closingTime = TimeUtils.now()
-            Log.e("Relay", "Relay Invalid $url")
-            e.printStackTrace()
+            "EOSE" -> listeners.forEach {
+                afterEOSE = true
+                // Log.w("Relay", "Relay onEOSE $url, $channel")
+                it.onRelayStateChange(this@Relay, Type.EOSE, channel)
+            }
+            "NOTICE" -> listeners.forEach {
+                Log.w("Relay", "Relay onNotice $url, $channel")
+                it.onError(this@Relay, channel, Error("Relay sent notice: " + channel))
+            }
+            "OK" -> listeners.forEach {
+                Log.w("Relay", "Relay on OK $url, ${msgArray[1].asString}, ${msgArray[2].asBoolean}, ${msgArray[3].asString}")
+                it.onSendResponse(this@Relay, msgArray[1].asString, msgArray[2].asBoolean, msgArray[3].asString)
+            }
+            "AUTH" -> listeners.forEach {
+                // Log.w("Relay", "Relay$url, ${msg[1].asString}")
+                it.onAuth(this@Relay, msgArray[1].asString)
+            }
+            else -> listeners.forEach {
+                // Log.w("Relay", "Relay something else $url, $channel")
+                it.onError(
+                    this@Relay,
+                    channel,
+                    Error("Unknown type $type on channel $channel. Msg was $newMessage")
+                )
+            }
         }
     }
 
     fun disconnect() {
         // httpClient.dispatcher.executorService.shutdown()
-        closingTime = TimeUtils.now()
+        closingTimeInSeconds = TimeUtils.now()
         socket?.close(1000, "Normal close")
         socket = null
         isReady = false
@@ -241,9 +260,9 @@ class Relay(
                 }
             } else {
                 // waits 60 seconds to reconnect after disconnected.
-                if (TimeUtils.now() > closingTime + 60) {
+                if (TimeUtils.now() > closingTimeInSeconds + RECONNECTING_IN_SECONDS) {
                     // sends all filters after connection is successful.
-                    requestAndWatch()
+                    connect()
                 }
             }
         }
@@ -254,9 +273,9 @@ class Relay(
 
         if (socket == null) {
             // waits 60 seconds to reconnect after disconnected.
-            if (TimeUtils.now() > closingTime + 60) {
+            if (TimeUtils.now() > closingTimeInSeconds + RECONNECTING_IN_SECONDS) {
                 // println("sendfilter Only if Disconnected ${url} ")
-                requestAndWatch()
+                connect()
             }
         }
     }

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

@@ -51,7 +51,7 @@ object RelayPool : Relay.Listener {
     fun requestAndWatch() {
         checkNotInMainThread()
 
-        relays.forEach { it.requestAndWatch() }
+        relays.forEach { it.connect() }
     }
 
     fun sendFilter(subscriptionId: String) {

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

@@ -22,8 +22,6 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.core.os.LocaleListCompat
 import androidx.lifecycle.viewmodel.compose.viewModel
-import androidx.navigation.NavHostController
-import androidx.navigation.compose.rememberNavController
 import com.vitorpamplona.amethyst.BuildConfig
 import com.vitorpamplona.amethyst.LocalPreferences
 import com.vitorpamplona.amethyst.ServiceManager
@@ -41,7 +39,6 @@ import com.vitorpamplona.amethyst.ui.components.DefaultMutedSetting
 import com.vitorpamplona.amethyst.ui.components.keepPlayingMutex
 import com.vitorpamplona.amethyst.ui.navigation.Route
 import com.vitorpamplona.amethyst.ui.navigation.debugState
-import com.vitorpamplona.amethyst.ui.navigation.getRouteWithArguments
 import com.vitorpamplona.amethyst.ui.note.Nip47
 import com.vitorpamplona.amethyst.ui.screen.AccountScreen
 import com.vitorpamplona.amethyst.ui.screen.AccountStateViewModel
@@ -55,8 +52,6 @@ import java.net.URLEncoder
 import java.nio.charset.StandardCharsets
 
 class MainActivity : AppCompatActivity() {
-    lateinit var navController: NavHostController
-
     @RequiresApi(Build.VERSION_CODES.R)
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -69,7 +64,6 @@ class MainActivity : AppCompatActivity() {
         }
 
         setContent {
-            navController = rememberNavController()
             val themeViewModel: ThemeViewModel = viewModel()
 
             themeViewModel.onChange(LocalPreferences.getTheme())
@@ -80,7 +74,7 @@ class MainActivity : AppCompatActivity() {
                         AccountStateViewModel(this@MainActivity)
                     }
 
-                    AccountScreen(accountStateViewModel, themeViewModel, navController)
+                    AccountScreen(accountStateViewModel, themeViewModel)
                 }
             }
         }
@@ -95,15 +89,6 @@ class MainActivity : AppCompatActivity() {
         connectivityManager.requestNetwork(networkRequest, networkCallback)
 
         Client.lenient = true
-
-        val uri = intent?.data?.toString()
-        val startingPage = uriToRoute(uri)
-        if (startingPage != null) {
-            navController.navigate(startingPage) {
-                popUpTo(Route.Home.route)
-                launchSingleTop = true
-            }
-        }
     }
 
     @OptIn(DelicateCoroutinesApi::class)
@@ -150,41 +135,6 @@ class MainActivity : AppCompatActivity() {
         }
     }
 
-    override fun onNewIntent(intent: Intent?) {
-        super.onNewIntent(intent)
-
-        if (this::navController.isInitialized) {
-            val uri = intent?.data?.toString()
-            val startingPage = uriToRoute(uri)
-
-            startingPage?.let { route ->
-                val currentRoute = getRouteWithArguments(navController)
-                if (!isSameRoute(currentRoute, route)) {
-                    navController.navigate(route) {
-                        popUpTo(Route.Home.route)
-                        launchSingleTop = true
-                    }
-                }
-            }
-        }
-    }
-
-    private fun isSameRoute(currentRoute: String?, newRoute: String): Boolean {
-        if (currentRoute == null) return false
-
-        if (currentRoute == newRoute) {
-            return true
-        }
-
-        if (newRoute.startsWith("Event/") && currentRoute.contains("/")) {
-            if (newRoute.split("/")[1] == currentRoute.split("/")[1]) {
-                return true
-            }
-        }
-
-        return false
-    }
-
     @OptIn(DelicateCoroutinesApi::class)
     private val networkCallback = object : ConnectivityManager.NetworkCallback() {
         // network is available for use

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

@@ -8,6 +8,7 @@ import androidx.core.net.toFile
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import com.vitorpamplona.amethyst.BuildConfig
 import com.vitorpamplona.amethyst.model.Account
+import com.vitorpamplona.amethyst.model.ServersAvailable
 import com.vitorpamplona.amethyst.service.HttpClient
 import okhttp3.*
 import okhttp3.MediaType.Companion.toMediaType
@@ -189,17 +190,20 @@ class ImgurServer : FileServer() {
 }
 
 class NostrBuildServer : FileServer() {
-    override fun postUrl(contentType: String?) = "https://nostr.build/api/upload/android.php"
+    override fun postUrl(contentType: String?) = "https://nostr.build/api/v2/upload/files"
     override fun parseUrlFromSuccess(body: String): String? {
-        val url = jacksonObjectMapper().readTree(body) // return url.toString()
+        val tree = jacksonObjectMapper().readTree(body)
+        val data = tree?.get("data")
+        val data0 = data?.get(0)
+        val url = data0?.get("url")
         return url.toString().replace("\"", "")
     }
 
     override fun inputParameterName(contentType: String?): String {
-        return "fileToUpload"
+        return "file"
     }
 
-    override fun clientID(info: String) = null
+    override fun clientID(info: String) = ImageUploader.NIP98Header("https://nostr.build/api/v2/upload/files", "POST", info)
 }
 
 class NostrFilesDevServer : FileServer() {
@@ -234,14 +238,14 @@ class NostrCheckMeServer : FileServer() {
             .build()
 
         while (!isCompleted) {
-            val response = client.newCall(request).execute()
-            val body = response.body?.string()
-            val tree = jacksonObjectMapper().readTree(body)
-            isCompleted = tree?.get("status")?.asText() == "completed"
-            try {
-                Thread.sleep(500)
-            } catch (e: InterruptedException) {
-                e.printStackTrace()
+            client.newCall(request).execute().use {
+                val tree = jacksonObjectMapper().readTree(it.body.string())
+                isCompleted = tree?.get("status")?.asText() == "completed"
+                try {
+                    Thread.sleep(500)
+                } catch (e: InterruptedException) {
+                    e.printStackTrace()
+                }
             }
         }
         return url

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

@@ -7,14 +7,15 @@ import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.LocalTextStyle
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.OutlinedTextField
 import androidx.compose.material.Surface
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
@@ -28,8 +29,6 @@ import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.model.PublicChatChannel
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.theme.placeholderText
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
 
 @Composable
 fun NewChannelView(onClose: () -> Unit, accountViewModel: AccountViewModel, channel: PublicChatChannel? = null) {
@@ -44,7 +43,7 @@ fun NewChannelView(onClose: () -> Unit, accountViewModel: AccountViewModel, chan
     ) {
         Surface() {
             Column(
-                modifier = Modifier.padding(10.dp)
+                modifier = Modifier.padding(10.dp).verticalScroll(rememberScrollState())
             ) {
                 Row(
                     modifier = Modifier
@@ -57,14 +56,10 @@ fun NewChannelView(onClose: () -> Unit, accountViewModel: AccountViewModel, chan
                         onClose()
                     })
 
-                    val scope = rememberCoroutineScope()
-
                     PostButton(
                         onPost = {
-                            scope.launch(Dispatchers.IO) {
-                                postViewModel.create()
-                                onClose()
-                            }
+                            postViewModel.create()
+                            onClose()
                         },
                         postViewModel.channelName.value.text.isNotBlank()
                     )

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

@@ -3,8 +3,11 @@ package com.vitorpamplona.amethyst.ui.actions
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.ui.text.input.TextFieldValue
 import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.PublicChatChannel
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
 
 class NewChannelViewModel : ViewModel() {
     private var account: Account? = null
@@ -25,24 +28,26 @@ class NewChannelViewModel : ViewModel() {
     }
 
     fun create() {
-        this.account?.let { account ->
-            if (originalChannel == null) {
-                account.sendCreateNewChannel(
-                    channelName.value.text,
-                    channelDescription.value.text,
-                    channelPicture.value.text
-                )
-            } else {
-                account.sendChangeChannel(
-                    channelName.value.text,
-                    channelDescription.value.text,
-                    channelPicture.value.text,
-                    originalChannel!!
-                )
+        viewModelScope.launch(Dispatchers.IO) {
+            account?.let { account ->
+                if (originalChannel == null) {
+                    account.sendCreateNewChannel(
+                        channelName.value.text,
+                        channelDescription.value.text,
+                        channelPicture.value.text
+                    )
+                } else {
+                    account.sendChangeChannel(
+                        channelName.value.text,
+                        channelDescription.value.text,
+                        channelPicture.value.text,
+                        originalChannel!!
+                    )
+                }
             }
-        }
 
-        clear()
+            clear()
+        }
     }
 
     fun clear() {

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

@@ -45,6 +45,7 @@ import androidx.compose.ui.window.Dialog
 import androidx.compose.ui.window.DialogProperties
 import coil.compose.AsyncImage
 import com.vitorpamplona.amethyst.R
+import com.vitorpamplona.amethyst.model.ServersAvailable
 import com.vitorpamplona.amethyst.ui.components.VideoView
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.TextSpinner

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

@@ -1,5 +1,6 @@
 package com.vitorpamplona.amethyst.ui.actions
 
+import android.Manifest
 import android.graphics.Bitmap
 import android.net.Uri
 import android.os.Build
@@ -22,6 +23,8 @@ import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.ArrowForwardIos
 import androidx.compose.material.icons.filled.Bolt
 import androidx.compose.material.icons.filled.CurrencyBitcoin
+import androidx.compose.material.icons.filled.LocationOff
+import androidx.compose.material.icons.filled.LocationOn
 import androidx.compose.material.icons.filled.ShowChart
 import androidx.compose.material.icons.filled.Visibility
 import androidx.compose.material.icons.filled.VisibilityOff
@@ -32,6 +35,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.Stable
+import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.livedata.observeAsState
 import androidx.compose.runtime.mutableStateOf
@@ -66,10 +70,16 @@ import androidx.compose.ui.window.Dialog
 import androidx.compose.ui.window.DialogProperties
 import androidx.lifecycle.viewmodel.compose.viewModel
 import coil.compose.AsyncImage
+import com.fonfon.kgeohash.toGeoHash
+import com.google.accompanist.permissions.ExperimentalPermissionsApi
+import com.google.accompanist.permissions.isGranted
+import com.google.accompanist.permissions.rememberPermissionState
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.model.ServersAvailable
 import com.vitorpamplona.amethyst.model.User
 import com.vitorpamplona.amethyst.service.NostrSearchEventOrUserDataSource
+import com.vitorpamplona.amethyst.service.ReverseGeoLocationUtil
 import com.vitorpamplona.amethyst.service.noProtocolUrlValidator
 import com.vitorpamplona.amethyst.ui.components.*
 import com.vitorpamplona.amethyst.ui.note.CancelIcon
@@ -82,8 +92,10 @@ import com.vitorpamplona.amethyst.ui.screen.loggedIn.TextSpinner
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.UserLine
 import com.vitorpamplona.amethyst.ui.theme.BitcoinOrange
 import com.vitorpamplona.amethyst.ui.theme.ButtonBorder
-import com.vitorpamplona.amethyst.ui.theme.Font14SP
 import com.vitorpamplona.amethyst.ui.theme.QuoteBorder
+import com.vitorpamplona.amethyst.ui.theme.Size10dp
+import com.vitorpamplona.amethyst.ui.theme.Size5dp
+import com.vitorpamplona.amethyst.ui.theme.StdHorzSpacer
 import com.vitorpamplona.amethyst.ui.theme.mediumImportanceLink
 import com.vitorpamplona.amethyst.ui.theme.placeholderText
 import com.vitorpamplona.amethyst.ui.theme.replyModifier
@@ -92,6 +104,7 @@ import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 
@@ -278,28 +291,72 @@ fun NewPostView(onClose: () -> Unit, baseReplyTo: Note? = null, quote: Note? = n
                             )
 
                             if (postViewModel.wantsPoll) {
-                                postViewModel.pollOptions.values.forEachIndexed { index, _ ->
-                                    NewPollOption(postViewModel, index)
-                                }
-
-                                Button(
-                                    onClick = { postViewModel.pollOptions[postViewModel.pollOptions.size] = "" },
-                                    border = BorderStroke(1.dp, MaterialTheme.colors.placeholderText),
-                                    colors = ButtonDefaults.outlinedButtonColors(
-                                        contentColor = MaterialTheme.colors.placeholderText
-                                    )
+                                Row(
+                                    verticalAlignment = Alignment.CenterVertically,
+                                    modifier = Modifier.padding(vertical = Size5dp, horizontal = Size10dp)
                                 ) {
-                                    Image(
-                                        painterResource(id = android.R.drawable.ic_input_add),
-                                        contentDescription = "Add poll option button",
-                                        modifier = Modifier.size(18.dp)
-                                    )
+                                    Column(
+                                        modifier = Modifier.fillMaxWidth()
+                                    ) {
+                                        postViewModel.pollOptions.values.forEachIndexed { index, _ ->
+                                            NewPollOption(postViewModel, index)
+                                        }
+
+                                        Button(
+                                            onClick = {
+                                                postViewModel.pollOptions[postViewModel.pollOptions.size] =
+                                                    ""
+                                            },
+                                            border = BorderStroke(
+                                                1.dp,
+                                                MaterialTheme.colors.placeholderText
+                                            ),
+                                            colors = ButtonDefaults.outlinedButtonColors(
+                                                contentColor = MaterialTheme.colors.placeholderText
+                                            )
+                                        ) {
+                                            Image(
+                                                painterResource(id = android.R.drawable.ic_input_add),
+                                                contentDescription = "Add poll option button",
+                                                modifier = Modifier.size(18.dp)
+                                            )
+                                        }
+                                    }
+                                }
+                            }
+
+                            if (postViewModel.wantsToMarkAsSensitive) {
+                                Row(
+                                    verticalAlignment = Alignment.CenterVertically,
+                                    modifier = Modifier
+                                        .padding(vertical = Size5dp, horizontal = Size10dp)
+                                ) {
+                                    ContentSensitivityExplainer(postViewModel)
+                                }
+                            }
+
+                            if (postViewModel.wantsToAddGeoHash) {
+                                Row(
+                                    verticalAlignment = Alignment.CenterVertically,
+                                    modifier = Modifier
+                                        .padding(vertical = Size5dp, horizontal = Size10dp)
+                                ) {
+                                    LocationAsHash(postViewModel)
+                                }
+                            }
+
+                            if (postViewModel.wantsForwardZapTo) {
+                                Row(
+                                    verticalAlignment = Alignment.CenterVertically,
+                                    modifier = Modifier.padding(vertical = Size5dp, horizontal = Size10dp)
+                                ) {
+                                    FowardZapTo(postViewModel)
                                 }
                             }
 
                             val url = postViewModel.contentToAddUrl
                             if (url != null) {
-                                Row(verticalAlignment = Alignment.CenterVertically) {
+                                Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.padding(vertical = Size5dp, horizontal = Size10dp)) {
                                     ImageVideoDescription(
                                         url,
                                         account.defaultFileServer,
@@ -324,26 +381,28 @@ fun NewPostView(onClose: () -> Unit, baseReplyTo: Note? = null, quote: Note? = n
                             val lud16 = user?.info?.lnAddress()
 
                             if (lud16 != null && postViewModel.wantsInvoice) {
-                                Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.padding(vertical = 5.dp)) {
-                                    InvoiceRequest(
-                                        lud16,
-                                        user.pubkeyHex,
-                                        account,
-                                        stringResource(id = R.string.lightning_invoice),
-                                        stringResource(id = R.string.lightning_create_and_add_invoice),
-                                        onSuccess = {
-                                            postViewModel.message = TextFieldValue(postViewModel.message.text + "\n\n" + it)
-                                            postViewModel.wantsInvoice = false
-                                        },
-                                        onClose = {
-                                            postViewModel.wantsInvoice = false
-                                        }
-                                    )
+                                Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.padding(vertical = Size5dp, horizontal = Size10dp)) {
+                                    Column(Modifier.fillMaxWidth()) {
+                                        InvoiceRequest(
+                                            lud16,
+                                            user.pubkeyHex,
+                                            account,
+                                            stringResource(id = R.string.lightning_invoice),
+                                            stringResource(id = R.string.lightning_create_and_add_invoice),
+                                            onSuccess = {
+                                                postViewModel.message = TextFieldValue(postViewModel.message.text + "\n\n" + it)
+                                                postViewModel.wantsInvoice = false
+                                            },
+                                            onClose = {
+                                                postViewModel.wantsInvoice = false
+                                            }
+                                        )
+                                    }
                                 }
                             }
 
                             if (lud16 != null && postViewModel.wantsZapraiser) {
-                                Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.padding(vertical = 5.dp)) {
+                                Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.padding(vertical = Size5dp, horizontal = Size10dp)) {
                                     ZapRaiserRequest(
                                         stringResource(id = R.string.zapraiser),
                                         postViewModel
@@ -353,7 +412,7 @@ fun NewPostView(onClose: () -> Unit, baseReplyTo: Note? = null, quote: Note? = n
 
                             val myUrlPreview = postViewModel.urlPreview
                             if (myUrlPreview != null) {
-                                Row(modifier = Modifier.padding(top = 5.dp)) {
+                                Row(modifier = Modifier.padding(vertical = Size5dp, horizontal = Size10dp)) {
                                     if (isValidURL(myUrlPreview)) {
                                         val removedParamsFromUrl =
                                             myUrlPreview.split("?")[0].lowercase()
@@ -456,6 +515,10 @@ fun NewPostView(onClose: () -> Unit, baseReplyTo: Note? = null, quote: Note? = n
                             postViewModel.wantsToMarkAsSensitive = !postViewModel.wantsToMarkAsSensitive
                         }
 
+                        AddGeoHash(postViewModel) {
+                            postViewModel.wantsToAddGeoHash = !postViewModel.wantsToAddGeoHash
+                        }
+
                         ForwardZapTo(postViewModel) {
                             postViewModel.wantsForwardZapTo = !postViewModel.wantsForwardZapTo
                         }
@@ -466,6 +529,243 @@ fun NewPostView(onClose: () -> Unit, baseReplyTo: Note? = null, quote: Note? = n
     }
 }
 
+@Composable
+fun ContentSensitivityExplainer(postViewModel: NewPostViewModel) {
+    Column(
+        modifier = Modifier.fillMaxWidth()
+    ) {
+        Row(
+            verticalAlignment = Alignment.CenterVertically,
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(bottom = 10.dp)
+        ) {
+            Box(
+                Modifier
+                    .height(20.dp)
+                    .width(25.dp)
+            ) {
+                Icon(
+                    imageVector = Icons.Default.VisibilityOff,
+                    contentDescription = stringResource(id = R.string.content_warning),
+                    modifier = Modifier
+                        .size(18.dp)
+                        .align(Alignment.BottomStart),
+                    tint = Color.Red
+                )
+                Icon(
+                    imageVector = Icons.Rounded.Warning,
+                    contentDescription = stringResource(id = R.string.content_warning),
+                    modifier = Modifier
+                        .size(10.dp)
+                        .align(Alignment.TopEnd),
+                    tint = Color.Yellow
+                )
+            }
+
+            Text(
+                text = stringResource(R.string.add_sensitive_content_label),
+                fontSize = 20.sp,
+                fontWeight = FontWeight.W500,
+                modifier = Modifier.padding(start = 10.dp)
+            )
+        }
+
+        Divider()
+
+        Text(
+            text = stringResource(R.string.add_sensitive_content_explainer),
+            color = MaterialTheme.colors.placeholderText,
+            modifier = Modifier.padding(vertical = 10.dp)
+        )
+    }
+}
+
+@Composable
+fun FowardZapTo(postViewModel: NewPostViewModel) {
+    Column(
+        modifier = Modifier.fillMaxWidth()
+    ) {
+        Row(
+            verticalAlignment = Alignment.CenterVertically,
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(bottom = 10.dp)
+        ) {
+            Box(
+                Modifier
+                    .height(20.dp)
+                    .width(25.dp)
+            ) {
+                Icon(
+                    imageVector = Icons.Outlined.Bolt,
+                    contentDescription = stringResource(id = R.string.zaps),
+                    modifier = Modifier
+                        .size(20.dp)
+                        .align(Alignment.CenterStart),
+                    tint = BitcoinOrange
+                )
+                Icon(
+                    imageVector = Icons.Outlined.ArrowForwardIos,
+                    contentDescription = stringResource(id = R.string.zaps),
+                    modifier = Modifier
+                        .size(13.dp)
+                        .align(Alignment.CenterEnd),
+                    tint = BitcoinOrange
+                )
+            }
+
+            Text(
+                text = stringResource(R.string.zap_forward_title),
+                fontSize = 20.sp,
+                fontWeight = FontWeight.W500,
+                modifier = Modifier.padding(start = 10.dp)
+            )
+        }
+
+        Divider()
+
+        Text(
+            text = stringResource(R.string.zap_forward_explainer),
+            color = MaterialTheme.colors.placeholderText,
+            modifier = Modifier.padding(vertical = 10.dp)
+        )
+
+        OutlinedTextField(
+            value = postViewModel.forwardZapToEditting,
+            onValueChange = {
+                postViewModel.updateZapForwardTo(it)
+            },
+
+            label = { Text(text = stringResource(R.string.zap_forward_lnAddress)) },
+            modifier = Modifier.fillMaxWidth(),
+            placeholder = {
+                Text(
+                    text = stringResource(R.string.zap_forward_lnAddress),
+                    color = MaterialTheme.colors.placeholderText
+                )
+            },
+            singleLine = true,
+            visualTransformation = UrlUserTagTransformation(
+                MaterialTheme.colors.primary
+            ),
+            textStyle = LocalTextStyle.current.copy(textDirection = TextDirection.Content)
+        )
+    }
+}
+
+@OptIn(ExperimentalPermissionsApi::class)
+@Composable
+fun LocationAsHash(postViewModel: NewPostViewModel) {
+    val context = LocalContext.current
+
+    val locationPermissionState = rememberPermissionState(
+        Manifest.permission.ACCESS_COARSE_LOCATION
+    )
+
+    if (locationPermissionState.status.isGranted) {
+        var locationDescriptionFlow by remember(postViewModel) {
+            mutableStateOf<Flow<String>?>(null)
+        }
+
+        DisposableEffect(key1 = Unit) {
+            postViewModel.startLocation(context = context)
+            locationDescriptionFlow = postViewModel.location
+
+            onDispose {
+                postViewModel.stopLocation()
+            }
+        }
+
+        Column(
+            modifier = Modifier.fillMaxWidth()
+        ) {
+            Row(
+                verticalAlignment = Alignment.CenterVertically,
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .padding(bottom = 10.dp)
+            ) {
+                Box(
+                    Modifier
+                        .height(20.dp)
+                        .width(20.dp)
+                ) {
+                    Icon(
+                        imageVector = Icons.Default.LocationOn,
+                        null,
+                        modifier = Modifier.size(20.dp),
+                        tint = MaterialTheme.colors.primary
+                    )
+                }
+
+                Text(
+                    text = stringResource(R.string.geohash_title),
+                    fontSize = 20.sp,
+                    fontWeight = FontWeight.W500,
+                    modifier = Modifier.padding(start = 10.dp)
+                )
+
+                locationDescriptionFlow?.let { geoLocation ->
+                    DisplayLocationObserver(geoLocation)
+                }
+            }
+
+            Divider()
+
+            Text(
+                text = stringResource(R.string.geohash_explainer),
+                color = MaterialTheme.colors.placeholderText,
+                modifier = Modifier.padding(vertical = 10.dp)
+            )
+        }
+    } else {
+        LaunchedEffect(locationPermissionState) {
+            locationPermissionState.launchPermissionRequest()
+        }
+    }
+}
+
+@Composable
+fun DisplayLocationObserver(geoLocation: Flow<String>) {
+    val location by geoLocation.collectAsState(initial = null)
+
+    location?.let {
+        DisplayLocationInTitle(geohash = it)
+    }
+}
+
+@Composable
+fun DisplayLocationInTitle(geohash: String) {
+    val context = LocalContext.current
+
+    var cityName by remember(geohash) {
+        mutableStateOf<String>(geohash)
+    }
+
+    LaunchedEffect(key1 = geohash) {
+        launch(Dispatchers.IO) {
+            val newCityName = ReverseGeoLocationUtil().execute(geohash.toGeoHash().toLocation(), context)?.ifBlank { null }
+
+            if (newCityName != null && newCityName != cityName) {
+                cityName = newCityName
+            }
+        }
+    }
+
+    if (geohash != "s0000") {
+        Text(
+            text = cityName,
+            fontSize = 20.sp,
+            fontWeight = FontWeight.W500,
+            modifier = Modifier.padding(start = Size5dp)
+        )
+    } else {
+        Spacer(modifier = StdHorzSpacer)
+        LoadingAnimation()
+    }
+}
+
 @OptIn(ExperimentalLayoutApi::class)
 @Composable
 fun Notifying(baseMentions: ImmutableList<User>?, onClick: (User) -> Unit) {
@@ -582,6 +882,31 @@ private fun AddZapraiserButton(
     }
 }
 
+@Composable
+fun AddGeoHash(postViewModel: NewPostViewModel, onClick: () -> Unit) {
+    IconButton(
+        onClick = {
+            onClick()
+        }
+    ) {
+        if (!postViewModel.wantsToAddGeoHash) {
+            Icon(
+                imageVector = Icons.Default.LocationOff,
+                null,
+                modifier = Modifier.size(20.dp),
+                tint = MaterialTheme.colors.onBackground
+            )
+        } else {
+            Icon(
+                imageVector = Icons.Default.LocationOn,
+                null,
+                modifier = Modifier.size(20.dp),
+                tint = MaterialTheme.colors.primary
+            )
+        }
+    }
+}
+
 @Composable
 private fun AddLnInvoiceButton(
     isLnInvoiceActive: Boolean,
@@ -662,33 +987,6 @@ private fun ForwardZapTo(
             }
         }
     }
-
-    if (postViewModel.wantsForwardZapTo) {
-        OutlinedTextField(
-            value = postViewModel.forwardZapToEditting,
-            onValueChange = {
-                postViewModel.updateZapForwardTo(it)
-            },
-            modifier = Modifier
-                .fillMaxWidth()
-                .windowInsetsPadding(WindowInsets(0.dp, 0.dp, 0.dp, 0.dp))
-                .padding(0.dp),
-            placeholder = {
-                Text(
-                    text = stringResource(R.string.zap_forward_lnAddress),
-                    color = MaterialTheme.colors.placeholderText,
-                    fontSize = Font14SP
-                )
-            },
-            colors = TextFieldDefaults
-                .outlinedTextFieldColors(
-                    unfocusedBorderColor = Color.Transparent,
-                    focusedBorderColor = Color.Transparent
-                ),
-            visualTransformation = UrlUserTagTransformation(MaterialTheme.colors.primary),
-            textStyle = LocalTextStyle.current.copy(textDirection = TextDirection.Content)
-        )
-    }
 }
 
 @Composable
@@ -819,21 +1117,6 @@ fun CreateButton(onPost: () -> Unit = {}, isActive: Boolean, modifier: Modifier
     }
 }
 
-enum class ServersAvailable {
-    // IMGUR,
-    NOSTR_BUILD,
-    NOSTRIMG,
-    NOSTRFILES_DEV,
-    NOSTRCHECK_ME,
-
-    // IMGUR_NIP_94,
-    NOSTRIMG_NIP_94,
-    NOSTR_BUILD_NIP_94,
-    NOSTRFILES_DEV_NIP_94,
-    NOSTRCHECK_ME_NIP_94,
-    NIP95
-}
-
 @Composable
 fun ImageVideoDescription(
     uri: Uri,
@@ -913,7 +1196,9 @@ fun ImageVideoDescription(
                 )
 
                 IconButton(
-                    modifier = Modifier.size(30.dp).padding(end = 5.dp),
+                    modifier = Modifier
+                        .size(30.dp)
+                        .padding(end = 5.dp),
                     onClick = onCancel
                 ) {
                     CancelIcon()

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

@@ -13,8 +13,10 @@ import androidx.compose.ui.text.TextRange
 import androidx.compose.ui.text.input.TextFieldValue
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
+import com.fonfon.kgeohash.toGeoHash
 import com.vitorpamplona.amethyst.model.*
 import com.vitorpamplona.amethyst.service.FileHeader
+import com.vitorpamplona.amethyst.service.LocationUtil
 import com.vitorpamplona.amethyst.service.NostrSearchEventOrUserDataSource
 import com.vitorpamplona.amethyst.service.model.AddressableEvent
 import com.vitorpamplona.amethyst.service.model.BaseTextNoteEvent
@@ -26,7 +28,9 @@ import com.vitorpamplona.amethyst.service.relays.Relay
 import com.vitorpamplona.amethyst.ui.components.MediaCompressor
 import com.vitorpamplona.amethyst.ui.components.isValidURL
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.mapLatest
 import kotlinx.coroutines.launch
 
 @Stable
@@ -77,6 +81,11 @@ open class NewPostViewModel() : ViewModel() {
     // NSFW, Sensitive
     var wantsToMarkAsSensitive by mutableStateOf(false)
 
+    // GeoHash
+    var wantsToAddGeoHash by mutableStateOf(false)
+    var locUtil: LocationUtil? = null
+    var location: Flow<String>? = null
+
     // ZapRaiser
     var canAddZapRaiser by mutableStateOf(false)
     var wantsZapraiser by mutableStateOf(false)
@@ -121,6 +130,7 @@ open class NewPostViewModel() : ViewModel() {
 
         wantsForwardZapTo = false
         wantsToMarkAsSensitive = false
+        wantsToAddGeoHash = false
         wantsZapraiser = false
         zapRaiserAmount = null
         forwardZapTo = null
@@ -143,6 +153,13 @@ open class NewPostViewModel() : ViewModel() {
             null
         }
 
+        val geoLocation = locUtil?.locationStateFlow?.value
+        val geoHash = if (wantsToAddGeoHash && geoLocation != null) {
+            geoLocation.toGeoHash(GeohashPrecision.KM_5_X_5.digits).toString()
+        } else {
+            null
+        }
+
         val localZapRaiserAmount = if (wantsZapraiser) zapRaiserAmount else null
 
         if (wantsPoll) {
@@ -158,16 +175,17 @@ open class NewPostViewModel() : ViewModel() {
                 zapReceiver,
                 wantsToMarkAsSensitive,
                 localZapRaiserAmount,
-                relayList
+                relayList,
+                geoHash
             )
         } else if (originalNote?.channelHex() != null) {
             if (originalNote is AddressableEvent && originalNote?.address() != null) {
-                account?.sendLiveMessage(tagger.message, originalNote?.address()!!, tagger.replyTos, tagger.mentions, zapReceiver, wantsToMarkAsSensitive, localZapRaiserAmount)
+                account?.sendLiveMessage(tagger.message, originalNote?.address()!!, tagger.replyTos, tagger.mentions, zapReceiver, wantsToMarkAsSensitive, localZapRaiserAmount, geoHash)
             } else {
-                account?.sendChannelMessage(tagger.message, tagger.channelHex!!, tagger.replyTos, tagger.mentions, zapReceiver, wantsToMarkAsSensitive, localZapRaiserAmount)
+                account?.sendChannelMessage(tagger.message, tagger.channelHex!!, tagger.replyTos, tagger.mentions, zapReceiver, wantsToMarkAsSensitive, localZapRaiserAmount, geoHash)
             }
         } else if (originalNote?.event is PrivateDmEvent) {
-            account?.sendPrivateMessage(tagger.message, originalNote!!.author!!, originalNote!!, tagger.mentions, zapReceiver, wantsToMarkAsSensitive, localZapRaiserAmount)
+            account?.sendPrivateMessage(tagger.message, originalNote!!.author!!, originalNote!!, tagger.mentions, zapReceiver, wantsToMarkAsSensitive, localZapRaiserAmount, geoHash)
         } else {
             // adds markers
             val rootId =
@@ -187,7 +205,8 @@ open class NewPostViewModel() : ViewModel() {
                 replyingTo = replyId,
                 root = rootId,
                 directMentions = tagger.directMentions,
-                relayList = relayList
+                relayList = relayList,
+                geohash = geoHash
             )
         }
 
@@ -267,6 +286,7 @@ open class NewPostViewModel() : ViewModel() {
 
         wantsForwardZapTo = false
         wantsToMarkAsSensitive = false
+        wantsToAddGeoHash = false
         forwardZapTo = null
         forwardZapToEditting = TextFieldValue("")
 
@@ -449,4 +469,50 @@ open class NewPostViewModel() : ViewModel() {
     fun selectImage(uri: Uri) {
         contentToAddUrl = uri
     }
+
+    fun startLocation(context: Context) {
+        locUtil = LocationUtil(context)
+        locUtil?.let {
+            location = it.locationStateFlow.mapLatest {
+                it.toGeoHash(GeohashPrecision.KM_5_X_5.digits).toString()
+            }
+        }
+        viewModelScope.launch(Dispatchers.IO) {
+            locUtil?.start()
+        }
+    }
+
+    fun stopLocation() {
+        viewModelScope.launch(Dispatchers.IO) {
+            locUtil?.stop()
+        }
+        location = null
+        locUtil = null
+    }
+
+    override fun onCleared() {
+        super.onCleared()
+        viewModelScope.launch(Dispatchers.IO) {
+            locUtil?.stop()
+        }
+        location = null
+        locUtil = null
+    }
+}
+
+enum class GeohashPrecision(val digits: Int) {
+    KM_5000_X_5000(1), // 5,000km	×	5,000km
+    KM_1250_X_625(2), // 1,250km	×	625km
+    KM_156_X_156(3), //   156km	×	156km
+    KM_39_X_19(4), //  39.1km	×	19.5km
+    KM_5_X_5(5), //  4.89km	×	4.89km
+
+    M_1000_X_600(6), //  1.22km	×	0.61km
+    M_153_X_153(7), //    153m	×	153m
+    M_38_X_19(8), //   38.2m	×	19.1m
+    M_5_X_5(9), //   4.77m	×	4.77m
+
+    MM_1000_X_1000(10), //   1.19m	×	0.596m
+    MM_149_X_149(11), //   149mm	×	149mm
+    MM_37_X_18(12) //  37.2mm	×	18.6mm
 }

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

@@ -7,11 +7,12 @@ import androidx.compose.foundation.clickable
 import androidx.compose.foundation.combinedClickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.ExperimentalLayoutApi
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.imePadding
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.lazy.LazyColumn
@@ -64,11 +65,13 @@ import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.theme.ButtonBorder
 import com.vitorpamplona.amethyst.ui.theme.Font14SP
 import com.vitorpamplona.amethyst.ui.theme.Size35dp
+import com.vitorpamplona.amethyst.ui.theme.StdVertSpacer
 import com.vitorpamplona.amethyst.ui.theme.placeholderText
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 import java.lang.Math.round
 
+@OptIn(ExperimentalLayoutApi::class)
 @Composable
 fun NewRelayListView(onClose: () -> Unit, accountViewModel: AccountViewModel, relayToAdd: String = "", nav: (String) -> Unit) {
     val postViewModel: NewRelayListViewModel = viewModel()
@@ -88,11 +91,12 @@ fun NewRelayListView(onClose: () -> Unit, accountViewModel: AccountViewModel, re
     Dialog(
         onDismissRequest = { onClose() },
         properties = DialogProperties(
+            decorFitsSystemWindows = false,
             usePlatformDefaultWidth = false,
             dismissOnClickOutside = false
         )
     ) {
-        Surface() {
+        Surface(modifier = Modifier.imePadding()) {
             Column(
                 modifier = Modifier.padding(10.dp)
             ) {
@@ -131,7 +135,7 @@ fun NewRelayListView(onClose: () -> Unit, accountViewModel: AccountViewModel, re
                     )
                 }
 
-                Spacer(modifier = Modifier.height(10.dp))
+                Spacer(modifier = StdVertSpacer)
 
                 Row(modifier = Modifier.weight(1f), verticalAlignment = Alignment.CenterVertically) {
                     LazyColumn(
@@ -166,7 +170,7 @@ fun NewRelayListView(onClose: () -> Unit, accountViewModel: AccountViewModel, re
                     }
                 }
 
-                Spacer(modifier = Modifier.height(10.dp))
+                Spacer(modifier = StdVertSpacer)
 
                 EditableServerConfig(relayToAdd) {
                     postViewModel.addRelay(it)

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

@@ -323,7 +323,7 @@ fun loadRelayInfo(
                                         Toast
                                             .makeText(
                                                 context,
-                                                context.getString(R.string.an_error_ocurred_trying_to_get_relay_information, dirtyUrl),
+                                                context.getString(R.string.an_error_occurred_trying_to_get_relay_information, dirtyUrl),
                                                 Toast.LENGTH_SHORT
                                             ).show()
                                     }
@@ -334,7 +334,7 @@ fun loadRelayInfo(
                                     Toast
                                         .makeText(
                                             context,
-                                            context.getString(R.string.an_error_ocurred_trying_to_get_relay_information, dirtyUrl),
+                                            context.getString(R.string.an_error_occurred_trying_to_get_relay_information, dirtyUrl),
                                             Toast.LENGTH_SHORT
                                         ).show()
                                 }
@@ -348,7 +348,7 @@ fun loadRelayInfo(
                             Toast
                                 .makeText(
                                     context,
-                                    context.getString(R.string.an_error_ocurred_trying_to_get_relay_information, dirtyUrl),
+                                    context.getString(R.string.an_error_occurred_trying_to_get_relay_information, dirtyUrl),
                                     Toast.LENGTH_SHORT
                                 ).show()
                         }
@@ -361,7 +361,7 @@ fun loadRelayInfo(
             Toast
                 .makeText(
                     context,
-                    context.getString(R.string.an_error_ocurred_trying_to_get_relay_information, dirtyUrl),
+                    context.getString(R.string.an_error_occurred_trying_to_get_relay_information, dirtyUrl),
                     Toast.LENGTH_SHORT
                 ).show()
         }

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

@@ -120,7 +120,7 @@ fun RelaySelectionDialog(
                             val selectedRelays = relays.filter { it.isSelected }
                             if (selectedRelays.isEmpty()) {
                                 scope.launch {
-                                    Toast.makeText(context, "Select a relay to continue", Toast.LENGTH_SHORT).show()
+                                    Toast.makeText(context, context.getString(R.string.select_a_relay_to_continue), Toast.LENGTH_SHORT).show()
                                 }
                                 return@PostButton
                             }

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

@@ -149,7 +149,7 @@ fun CashuPreview(token: CashuToken, accountViewModel: AccountViewModel) {
                             scope.launch {
                                 Toast.makeText(
                                     context,
-                                    "No Lightning Address set",
+                                    context.getString(R.string.no_lightning_address_set),
                                     Toast.LENGTH_SHORT
                                 ).show()
                             }
@@ -180,7 +180,7 @@ fun CashuPreview(token: CashuToken, accountViewModel: AccountViewModel) {
                             var orignaltoken = token.token
                             clipboardManager.setText(AnnotatedString("$orignaltoken"))
                             scope.launch {
-                                Toast.makeText(context, "Copied token to clipboard", Toast.LENGTH_SHORT).show()
+                                Toast.makeText(context, context.getString(R.string.copied_token_to_clipboard), Toast.LENGTH_SHORT).show()
                             }
                         }
                     },

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

@@ -42,7 +42,7 @@ import com.vitorpamplona.amethyst.ui.theme.subtleBorder
 import kotlinx.coroutines.launch
 
 @Composable
-fun InvoiceRequest(
+fun InvoiceRequestCard(
     lud16: String,
     toUserPubKeyHex: String,
     account: Account,
@@ -51,9 +51,6 @@ fun InvoiceRequest(
     onSuccess: (String) -> Unit,
     onClose: () -> Unit
 ) {
-    val context = LocalContext.current
-    val scope = rememberCoroutineScope()
-
     Column(
         modifier = Modifier
             .fillMaxWidth()
@@ -66,102 +63,118 @@ fun InvoiceRequest(
                 .fillMaxWidth()
                 .padding(30.dp)
         ) {
-            Row(
-                verticalAlignment = Alignment.CenterVertically,
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .padding(bottom = 10.dp)
-            ) {
-                Icon(
-                    painter = painterResource(R.drawable.lightning),
-                    null,
-                    modifier = Modifier.size(20.dp),
-                    tint = Color.Unspecified
-                )
-
-                Text(
-                    text = titleText ?: stringResource(R.string.lightning_tips),
-                    fontSize = 20.sp,
-                    fontWeight = FontWeight.W500,
-                    modifier = Modifier.padding(start = 10.dp)
-                )
-            }
-
-            Divider()
-
-            var message by remember { mutableStateOf("") }
-            var amount by remember { mutableStateOf(1000L) }
-
-            OutlinedTextField(
-                label = { Text(text = stringResource(R.string.note_to_receiver)) },
-                modifier = Modifier.fillMaxWidth(),
-                value = message,
-                onValueChange = { message = it },
-                placeholder = {
-                    Text(
-                        text = stringResource(R.string.thank_you_so_much),
-                        color = MaterialTheme.colors.placeholderText
-                    )
-                },
-                keyboardOptions = KeyboardOptions.Default.copy(
-                    capitalization = KeyboardCapitalization.Sentences
-                ),
-                singleLine = true
-            )
-
-            OutlinedTextField(
-                label = { Text(text = stringResource(R.string.amount_in_sats)) },
-                modifier = Modifier.fillMaxWidth(),
-                value = amount.toString(),
-                onValueChange = {
-                    runCatching {
-                        if (it.isEmpty()) {
-                            amount = 0
-                        } else {
-                            amount = it.toLong()
-                        }
-                    }
-                },
-                placeholder = {
-                    Text(
-                        text = "1000",
-                        color = MaterialTheme.colors.placeholderText
-                    )
-                },
-                keyboardOptions = KeyboardOptions.Default.copy(
-                    keyboardType = KeyboardType.Number
-                ),
-                singleLine = true
-            )
-
-            Button(
-                modifier = Modifier.fillMaxWidth().padding(vertical = 10.dp),
-                onClick = {
-                    val zapRequest = account.createZapRequestFor(toUserPubKeyHex, message, account.defaultZapType)
-
-                    LightningAddressResolver().lnAddressInvoice(
-                        lud16,
-                        amount * 1000,
-                        message,
-                        zapRequest?.toJson(),
-                        onSuccess = onSuccess,
-                        onError = {
-                            scope.launch {
-                                Toast.makeText(context, it, Toast.LENGTH_SHORT).show()
-                                onClose()
-                            }
-                        },
-                        onProgress = {
-                        }
-                    )
-                },
-                shape = QuoteBorder,
-                colors = ButtonDefaults.buttonColors(
-                    backgroundColor = MaterialTheme.colors.primary
-                )
-            ) {
-                Text(text = buttonText ?: stringResource(R.string.send_sats), color = Color.White, fontSize = 20.sp)
-            }
+            InvoiceRequest(lud16, toUserPubKeyHex, account, titleText, buttonText, onSuccess, onClose)
         }
     }
 }
+
+@Composable
+fun InvoiceRequest(
+    lud16: String,
+    toUserPubKeyHex: String,
+    account: Account,
+    titleText: String? = null,
+    buttonText: String? = null,
+    onSuccess: (String) -> Unit,
+    onClose: () -> Unit
+) {
+    val context = LocalContext.current
+    val scope = rememberCoroutineScope()
+
+    Row(
+        verticalAlignment = Alignment.CenterVertically,
+        modifier = Modifier
+            .fillMaxWidth()
+            .padding(bottom = 10.dp)
+    ) {
+        Icon(
+            painter = painterResource(R.drawable.lightning),
+            null,
+            modifier = Modifier.size(20.dp),
+            tint = Color.Unspecified
+        )
+
+        Text(
+            text = titleText ?: stringResource(R.string.lightning_tips),
+            fontSize = 20.sp,
+            fontWeight = FontWeight.W500,
+            modifier = Modifier.padding(start = 10.dp)
+        )
+    }
+
+    Divider()
+
+    var message by remember { mutableStateOf("") }
+    var amount by remember { mutableStateOf(1000L) }
+
+    OutlinedTextField(
+        label = { Text(text = stringResource(R.string.note_to_receiver)) },
+        modifier = Modifier.fillMaxWidth(),
+        value = message,
+        onValueChange = { message = it },
+        placeholder = {
+            Text(
+                text = stringResource(R.string.thank_you_so_much),
+                color = MaterialTheme.colors.placeholderText
+            )
+        },
+        keyboardOptions = KeyboardOptions.Default.copy(
+            capitalization = KeyboardCapitalization.Sentences
+        ),
+        singleLine = true
+    )
+
+    OutlinedTextField(
+        label = { Text(text = stringResource(R.string.amount_in_sats)) },
+        modifier = Modifier.fillMaxWidth(),
+        value = amount.toString(),
+        onValueChange = {
+            runCatching {
+                if (it.isEmpty()) {
+                    amount = 0
+                } else {
+                    amount = it.toLong()
+                }
+            }
+        },
+        placeholder = {
+            Text(
+                text = "1000",
+                color = MaterialTheme.colors.placeholderText
+            )
+        },
+        keyboardOptions = KeyboardOptions.Default.copy(
+            keyboardType = KeyboardType.Number
+        ),
+        singleLine = true
+    )
+
+    Button(
+        modifier = Modifier.fillMaxWidth().padding(vertical = 10.dp),
+        onClick = {
+            val zapRequest = account.createZapRequestFor(toUserPubKeyHex, message, account.defaultZapType)
+
+            LightningAddressResolver().lnAddressInvoice(
+                lud16,
+                amount * 1000,
+                message,
+                zapRequest?.toJson(),
+                onSuccess = onSuccess,
+                onError = {
+                    scope.launch {
+                        Toast.makeText(context, it, Toast.LENGTH_SHORT).show()
+                        onClose()
+                    }
+                },
+                onProgress = {
+                }
+            )
+        },
+        shape = QuoteBorder,
+        colors = ButtonDefaults.buttonColors(
+            backgroundColor = MaterialTheme.colors.primary
+        )
+    ) {
+        Text(text = buttonText ?: stringResource(R.string.send_sats), color = Color.White, fontSize = 20.sp)
+    }
+}

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

@@ -13,6 +13,7 @@ import coil.fetch.Fetcher
 import coil.fetch.SourceResult
 import coil.request.ImageRequest
 import coil.request.Options
+import com.vitorpamplona.amethyst.model.toHexKey
 import com.vitorpamplona.amethyst.service.CryptoUtils
 import com.vitorpamplona.amethyst.service.checkNotInMainThread
 import okio.Buffer
@@ -36,7 +37,7 @@ private fun svgString(msg: String): String {
     checkNotInMainThread()
 
     val hash = CryptoUtils.sha256(msg.toByteArray())
-    val hashHex = hash.joinToString(separator = "") { b -> "%02x".format(b) }
+    val hashHex = hash.toHexKey()
     val bgColor = bytesToRGB(hash[0], hash[1], hash[2])
     val fgColor = bytesToRGB(hash[3], hash[4], hash[5])
     val bodyIndex = byteMod10(hash[6])
@@ -94,6 +95,7 @@ object Robohash {
             .Builder(context)
             .data("robohash:$message")
             .fetcherFactory(HashImageFetcher.Factory)
+            .addHeader("Cache-Control", "max-age=31536000")
             .build()
     }
 }

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

@@ -1,5 +1,6 @@
 package com.vitorpamplona.amethyst.ui.components
 
+import androidx.compose.foundation.Image
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
@@ -64,19 +65,30 @@ fun RobohashFallbackAsyncImage(
         model = Robohash.imageRequest(context, robot)
     )
 
-    AsyncImage(
-        model = model,
-        contentDescription = contentDescription,
-        modifier = modifier,
-        placeholder = painter,
-        fallback = painter,
-        error = painter,
-        alignment = alignment,
-        contentScale = contentScale,
-        alpha = alpha,
-        colorFilter = colorFilter,
-        filterQuality = filterQuality
-    )
+    if (model != null) {
+        AsyncImage(
+            model = model,
+            contentDescription = contentDescription,
+            modifier = modifier,
+            placeholder = painter,
+            fallback = painter,
+            error = painter,
+            alignment = alignment,
+            contentScale = contentScale,
+            alpha = alpha,
+            colorFilter = colorFilter,
+            filterQuality = filterQuality
+        )
+    } else {
+        Image(
+            painter = painter,
+            contentDescription = contentDescription,
+            modifier = modifier,
+            alignment = alignment,
+            contentScale = contentScale,
+            colorFilter = colorFilter
+        )
+    }
 }
 
 @Composable

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

@@ -30,7 +30,7 @@ fun UrlPreview(url: String, urlText: String, accountViewModel: AccountViewModel)
     } else {
         var urlPreviewState by remember(url) {
             mutableStateOf(
-                UrlCachedPreviewer.cache.get(url)?.let { it } ?: UrlPreviewState.Loading
+                UrlCachedPreviewer.cache.get(url) ?: UrlPreviewState.Loading
             )
         }
 
@@ -39,9 +39,7 @@ fun UrlPreview(url: String, urlText: String, accountViewModel: AccountViewModel)
             LaunchedEffect(url) {
                 launch(Dispatchers.IO) {
                     UrlCachedPreviewer.previewInfo(url) {
-                        launch(Dispatchers.Main) {
-                            urlPreviewState = it
-                        }
+                        urlPreviewState = it
                     }
                 }
             }

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

@@ -189,7 +189,7 @@ fun VideoViewInner(
     if (!automaticallyStartPlayback.value) {
         ImageUrlWithDownloadButton(url = videoUri, showImage = automaticallyStartPlayback)
     } else {
-        VideoPlayerMutex(videoUri) { activeOnScreen ->
+        VideoPlayerActiveMutex(videoUri) { activeOnScreen ->
             val mediaItem = remember(videoUri) {
                 MediaItem.Builder()
                     .setMediaId(videoUri)
@@ -324,10 +324,6 @@ fun GetVideoController(
         }
     }
 
-    controller.value?.let {
-        inner(it, keepPlaying)
-    }
-
     // User pauses and resumes the app. What to do with videos?
     val scope = rememberCoroutineScope()
     val lifeCycleOwner = LocalLifecycleOwner.current
@@ -392,6 +388,10 @@ fun GetVideoController(
             }
         }
     }
+
+    controller.value?.let {
+        inner(it, keepPlaying)
+    }
 }
 
 // background playing mutex.
@@ -410,7 +410,7 @@ class VisibilityData() {
  * the screen wins the mutex.
  */
 @Composable
-fun VideoPlayerMutex(videoUri: String, inner: @Composable (MutableState<Boolean>) -> Unit) {
+fun VideoPlayerActiveMutex(videoUri: String, inner: @Composable (MutableState<Boolean>) -> Unit) {
     val myCache = remember(videoUri) {
         VisibilityData()
     }
@@ -607,38 +607,6 @@ fun ControlWhenPlayerIsActive(
     }
 }
 
-fun Modifier.onVisibilityChanges(onVisibilityChanges: (Boolean) -> Unit): Modifier = composed {
-    val view = LocalView.current
-    var isVisible: Boolean? by remember { mutableStateOf(null) }
-
-    onGloballyPositioned { coordinates ->
-        val newIsVisible = coordinates.isCompletelyVisible(view)
-        if (isVisible != newIsVisible) {
-            isVisible = newIsVisible
-            onVisibilityChanges(isVisible == true)
-        }
-    }
-}
-
-fun LayoutCoordinates.isCompletelyVisible(view: View): Boolean {
-    if (!isAttached) return false
-    // Window relative bounds of our compose root view that are visible on the screen
-    val globalRootRect = Rect()
-    if (!view.getGlobalVisibleRect(globalRootRect)) {
-        // we aren't visible at all.
-        return false
-    }
-    val bounds = boundsInWindow()
-
-    if (bounds.isEmpty) return false
-
-    // Make sure we are completely in bounds.
-    return bounds.top >= globalRootRect.top &&
-        bounds.left >= globalRootRect.left &&
-        bounds.right <= globalRootRect.right &&
-        bounds.bottom <= globalRootRect.bottom
-}
-
 fun Modifier.onVisiblePositionChanges(onVisiblePosition: (Float?) -> Unit): Modifier = composed {
     val view = LocalView.current
 

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

@@ -35,66 +35,62 @@ fun ZapRaiserRequest(
     Column(
         modifier = Modifier.fillMaxWidth()
     ) {
-        Column(
-            modifier = Modifier.fillMaxWidth()
+        Row(
+            verticalAlignment = Alignment.CenterVertically,
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(bottom = 10.dp)
         ) {
-            Row(
-                verticalAlignment = Alignment.CenterVertically,
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .padding(bottom = 10.dp)
-            ) {
-                Icon(
-                    painter = painterResource(R.drawable.lightning),
-                    null,
-                    modifier = Size20Modifier,
-                    tint = Color.Unspecified
-                )
-
-                Text(
-                    text = titleText ?: stringResource(R.string.zapraiser),
-                    fontSize = 20.sp,
-                    fontWeight = FontWeight.W500,
-                    modifier = Modifier.padding(start = 10.dp)
-                )
-            }
-
-            Divider()
+            Icon(
+                painter = painterResource(R.drawable.lightning),
+                null,
+                modifier = Size20Modifier,
+                tint = Color.Unspecified
+            )
 
             Text(
-                text = stringResource(R.string.zapraiser_explainer),
-                color = MaterialTheme.colors.placeholderText,
-                modifier = Modifier.padding(vertical = 10.dp)
-            )
-
-            OutlinedTextField(
-                label = { Text(text = stringResource(R.string.zapraiser_target_amount_in_sats)) },
-                modifier = Modifier.fillMaxWidth(),
-                value = if (newPostViewModel.zapRaiserAmount != null) {
-                    newPostViewModel.zapRaiserAmount.toString()
-                } else {
-                    ""
-                },
-                onValueChange = {
-                    runCatching {
-                        if (it.isEmpty()) {
-                            newPostViewModel.zapRaiserAmount = null
-                        } else {
-                            newPostViewModel.zapRaiserAmount = it.toLongOrNull()
-                        }
-                    }
-                },
-                placeholder = {
-                    Text(
-                        text = "1000",
-                        color = MaterialTheme.colors.placeholderText
-                    )
-                },
-                keyboardOptions = KeyboardOptions.Default.copy(
-                    keyboardType = KeyboardType.Number
-                ),
-                singleLine = true
+                text = titleText ?: stringResource(R.string.zapraiser),
+                fontSize = 20.sp,
+                fontWeight = FontWeight.W500,
+                modifier = Modifier.padding(start = 10.dp)
             )
         }
+
+        Divider()
+
+        Text(
+            text = stringResource(R.string.zapraiser_explainer),
+            color = MaterialTheme.colors.placeholderText,
+            modifier = Modifier.padding(vertical = 10.dp)
+        )
+
+        OutlinedTextField(
+            label = { Text(text = stringResource(R.string.zapraiser_target_amount_in_sats)) },
+            modifier = Modifier.fillMaxWidth(),
+            value = if (newPostViewModel.zapRaiserAmount != null) {
+                newPostViewModel.zapRaiserAmount.toString()
+            } else {
+                ""
+            },
+            onValueChange = {
+                runCatching {
+                    if (it.isEmpty()) {
+                        newPostViewModel.zapRaiserAmount = null
+                    } else {
+                        newPostViewModel.zapRaiserAmount = it.toLongOrNull()
+                    }
+                }
+            },
+            placeholder = {
+                Text(
+                    text = "1000",
+                    color = MaterialTheme.colors.placeholderText
+                )
+            },
+            keyboardOptions = KeyboardOptions.Default.copy(
+                keyboardType = KeyboardType.Number
+            ),
+            singleLine = true
+        )
     }
 }

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

@@ -21,6 +21,7 @@ class CommunityFeedFilter(val note: AddressableNote, val account: Account) : Add
 
     private fun innerApplyFilter(collection: Collection<Note>): Set<Note> {
         val myUnapprovedPosts = collection.asSequence()
+            .filter { it.event is CommunityPostApprovalEvent } // Only Approvals
             .filter { it.author?.pubkeyHex == account.userProfile().pubkeyHex } // made by the logged in user
             .filter { it.event?.isTaggedAddressableNote(note.idHex) == true } // for this community
             .filter { it.isNewThread() } // check if it is a new thread

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

@@ -36,6 +36,7 @@ open class DiscoverChatFeedFilter(val account: Account) : AdditiveFeedFilter<Not
 
         val followingKeySet = account.selectedUsersFollowList(account.defaultDiscoveryFollowList) ?: emptySet()
         val followingTagSet = account.selectedTagsFollowList(account.defaultDiscoveryFollowList) ?: emptySet()
+        val followingGeohashSet = account.selectedGeohashesFollowList(account.defaultDiscoveryFollowList) ?: emptySet()
 
         val createEvents = collection.filter { it.event is ChannelCreateEvent }
         val anyOtherChannelEvent = collection
@@ -48,7 +49,7 @@ open class DiscoverChatFeedFilter(val account: Account) : AdditiveFeedFilter<Not
         val activities = (createEvents + anyOtherChannelEvent)
             .asSequence()
             // .filter { it.event is ChannelCreateEvent } // Event heads might not be loaded yet.
-            .filter { isGlobal || it.author?.pubkeyHex in followingKeySet || it.event?.isTaggedHashes(followingTagSet) == true }
+            .filter { isGlobal || it.author?.pubkeyHex in followingKeySet || it.event?.isTaggedHashes(followingTagSet) == true || it.event?.isTaggedGeoHashes(followingGeohashSet) == true }
             .filter { isHiddenList || it.author?.let { !account.isHidden(it.pubkeyHex) } ?: true }
             .filter { (it.createdAt() ?: 0) <= now }
             .toSet()

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

@@ -36,6 +36,7 @@ open class DiscoverCommunityFeedFilter(val account: Account) : AdditiveFeedFilte
 
         val followingKeySet = account.selectedUsersFollowList(account.defaultDiscoveryFollowList) ?: emptySet()
         val followingTagSet = account.selectedTagsFollowList(account.defaultDiscoveryFollowList) ?: emptySet()
+        val followingGeohashSet = account.selectedGeohashesFollowList(account.defaultDiscoveryFollowList) ?: emptySet()
 
         val createEvents = collection.filter { it.event is CommunityDefinitionEvent }
         val anyOtherCommunityEvent = collection
@@ -48,7 +49,7 @@ open class DiscoverCommunityFeedFilter(val account: Account) : AdditiveFeedFilte
         val activities = (createEvents + anyOtherCommunityEvent)
             .asSequence()
             .filter { it.event is CommunityDefinitionEvent }
-            .filter { isGlobal || it.author?.pubkeyHex in followingKeySet || it.event?.isTaggedHashes(followingTagSet) == true }
+            .filter { isGlobal || it.author?.pubkeyHex in followingKeySet || it.event?.isTaggedHashes(followingTagSet) == true || it.event?.isTaggedGeoHashes(followingGeohashSet) == true }
             .filter { isHiddenList || it.author?.let { !account.isHidden(it.pubkeyHex) } ?: true }
             .filter { (it.createdAt() ?: 0) <= now }
             .toSet()

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

@@ -39,10 +39,9 @@ open class DiscoverLiveFeedFilter(val account: Account) : AdditiveFeedFilter<Not
         val isGlobal = account.defaultDiscoveryFollowList == GLOBAL_FOLLOWS
         val isHiddenList = showHiddenKey()
 
-        val followingKeySet =
-            account.selectedUsersFollowList(account.defaultDiscoveryFollowList) ?: emptySet()
-        val followingTagSet =
-            account.selectedTagsFollowList(account.defaultDiscoveryFollowList) ?: emptySet()
+        val followingKeySet = account.selectedUsersFollowList(account.defaultDiscoveryFollowList) ?: emptySet()
+        val followingTagSet = account.selectedTagsFollowList(account.defaultDiscoveryFollowList) ?: emptySet()
+        val followingGeohashSet = account.selectedGeohashesFollowList(account.defaultDiscoveryFollowList) ?: emptySet()
 
         val activities = collection
             .asSequence()
@@ -50,6 +49,8 @@ open class DiscoverLiveFeedFilter(val account: Account) : AdditiveFeedFilter<Not
             .filter {
                 isGlobal || it.author?.pubkeyHex in followingKeySet || it.event?.isTaggedHashes(
                     followingTagSet
+                ) == true || it.event?.isTaggedGeoHashes(
+                    followingGeohashSet
                 ) == true
             }
             .filter { isHiddenList || it.author?.let { !account.isHidden(it.pubkeyHex) } ?: true }

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

@@ -0,0 +1,46 @@
+package com.vitorpamplona.amethyst.ui.dal
+
+import com.vitorpamplona.amethyst.model.Account
+import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
+import com.vitorpamplona.amethyst.service.model.LongTextNoteEvent
+import com.vitorpamplona.amethyst.service.model.PrivateDmEvent
+import com.vitorpamplona.amethyst.service.model.TextNoteEvent
+
+class GeoHashFeedFilter(val tag: String, val account: Account) : AdditiveFeedFilter<Note>() {
+
+    override fun feedKey(): String {
+        return account.userProfile().pubkeyHex + "-" + tag
+    }
+
+    override fun feed(): List<Note> {
+        return sort(innerApplyFilter(LocalCache.notes.values))
+    }
+
+    override fun applyFilter(collection: Set<Note>): Set<Note> {
+        return innerApplyFilter(collection)
+    }
+
+    private fun innerApplyFilter(collection: Collection<Note>): Set<Note> {
+        val myTag = tag ?: return emptySet()
+
+        return collection
+            .asSequence()
+            .filter {
+                (
+                    it.event is TextNoteEvent ||
+                        it.event is LongTextNoteEvent ||
+                        it.event is ChannelMessageEvent ||
+                        it.event is PrivateDmEvent
+                    ) &&
+                    it.event?.isTaggedGeoHash(myTag) == true
+            }
+            .filter { account.isAcceptable(it) }
+            .toSet()
+    }
+
+    override fun sort(collection: Set<Note>): List<Note> {
+        return collection.sortedWith(compareBy({ it.createdAt() }, { it.idHex })).reversed()
+    }
+}

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

@@ -35,6 +35,7 @@ class HomeConversationsFeedFilter(val account: Account) : AdditiveFeedFilter<Not
 
         val followingKeySet = account.selectedUsersFollowList(account.defaultHomeFollowList) ?: emptySet()
         val followingTagSet = account.selectedTagsFollowList(account.defaultHomeFollowList) ?: emptySet()
+        val followingGeoHashSet = account.selectedGeohashesFollowList(account.defaultHomeFollowList) ?: emptySet()
 
         val now = TimeUtils.now()
 
@@ -42,7 +43,7 @@ class HomeConversationsFeedFilter(val account: Account) : AdditiveFeedFilter<Not
             .asSequence()
             .filter {
                 (it.event is TextNoteEvent || it.event is PollNoteEvent || it.event is ChannelMessageEvent || it.event is LiveActivitiesChatMessageEvent) &&
-                    (isGlobal || it.author?.pubkeyHex in followingKeySet || it.event?.isTaggedHashes(followingTagSet) ?: false) &&
+                    (isGlobal || it.author?.pubkeyHex in followingKeySet || it.event?.isTaggedHashes(followingTagSet) ?: false || it.event?.isTaggedGeoHashes(followingGeoHashSet) ?: false) &&
                     // && account.isAcceptable(it)  // This filter follows only. No need to check if acceptable
                     (isHiddenList || it.author?.let { !account.isHidden(it) } ?: true) &&
                     ((it.event?.createdAt() ?: 0) < now) &&

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

@@ -25,22 +25,23 @@ class HomeNewThreadFeedFilter(val account: Account) : AdditiveFeedFilter<Note>()
     }
 
     override fun feed(): List<Note> {
-        val notes = innerApplyFilter(LocalCache.notes.values)
-        val longFormNotes = innerApplyFilter(LocalCache.addressables.values)
+        val notes = innerApplyFilter(LocalCache.notes.values, true)
+        val longFormNotes = innerApplyFilter(LocalCache.addressables.values, false)
 
         return sort(notes + longFormNotes)
     }
 
     override fun applyFilter(collection: Set<Note>): Set<Note> {
-        return innerApplyFilter(collection)
+        return innerApplyFilter(collection, false)
     }
 
-    private fun innerApplyFilter(collection: Collection<Note>): Set<Note> {
+    private fun innerApplyFilter(collection: Collection<Note>, ignoreAddressables: Boolean): Set<Note> {
         val isGlobal = account.defaultHomeFollowList == GLOBAL_FOLLOWS
         val isHiddenList = showHiddenKey()
 
         val followingKeySet = account.selectedUsersFollowList(account.defaultHomeFollowList) ?: emptySet()
         val followingTagSet = account.selectedTagsFollowList(account.defaultHomeFollowList) ?: emptySet()
+        val followingGeoSet = account.selectedGeohashesFollowList(account.defaultHomeFollowList) ?: emptySet()
         val followingCommunities = account.selectedCommunitiesFollowList(account.defaultHomeFollowList) ?: emptySet()
 
         val oneMinuteInTheFuture = TimeUtils.now() + (1 * 60) // one minute in the future.
@@ -51,7 +52,8 @@ class HomeNewThreadFeedFilter(val account: Account) : AdditiveFeedFilter<Note>()
             .filter { it ->
                 val noteEvent = it.event
                 (noteEvent is TextNoteEvent || noteEvent is ClassifiedsEvent || noteEvent is RepostEvent || noteEvent is GenericRepostEvent || noteEvent is LongTextNoteEvent || noteEvent is PollNoteEvent || noteEvent is HighlightEvent || noteEvent is AudioTrackEvent) &&
-                    (isGlobal || it.author?.pubkeyHex in followingKeySet || noteEvent.isTaggedHashes(followingTagSet) || noteEvent.isTaggedAddressableNotes(followingCommunities)) &&
+                    (!ignoreAddressables || noteEvent.kind() < 10000) &&
+                    (isGlobal || it.author?.pubkeyHex in followingKeySet || noteEvent.isTaggedHashes(followingTagSet) || noteEvent.isTaggedGeoHashes(followingGeoSet) || noteEvent.isTaggedAddressableNotes(followingCommunities)) &&
                     // && account.isAcceptable(it)  // This filter follows only. No need to check if acceptable
                     (isHiddenList || it.author?.let { !account.isHidden(it.pubkeyHex) } ?: true) &&
                     ((it.event?.createdAt() ?: 0) < oneMinuteInTheFuture) &&

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

@@ -33,11 +33,12 @@ class VideoFeedFilter(val account: Account) : AdditiveFeedFilter<Note>() {
 
         val followingKeySet = account.selectedUsersFollowList(account.defaultStoriesFollowList) ?: emptySet()
         val followingTagSet = account.selectedTagsFollowList(account.defaultStoriesFollowList) ?: emptySet()
+        val followingGeohashSet = account.selectedGeohashesFollowList(account.defaultStoriesFollowList) ?: emptySet()
 
         return collection
             .asSequence()
             .filter { it.event is FileHeaderEvent || it.event is FileStorageHeaderEvent }
-            .filter { isGlobal || it.author?.pubkeyHex in followingKeySet || (it.event?.isTaggedHashes(followingTagSet) ?: false) }
+            .filter { isGlobal || it.author?.pubkeyHex in followingKeySet || (it.event?.isTaggedHashes(followingTagSet) ?: false) || (it.event?.isTaggedGeoHashes(followingGeohashSet) ?: false) }
             .filter { isHiddenList || account.isAcceptable(it) }
             .filter { it.createdAt()!! <= now }
             .toSet()

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

@@ -1,12 +1,22 @@
 package com.vitorpamplona.amethyst.ui.navigation
 
+import android.content.Context
+import android.content.ContextWrapper
+import android.content.Intent
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.platform.LocalContext
+import androidx.core.util.Consumer
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
+import com.vitorpamplona.amethyst.ui.MainActivity
 import com.vitorpamplona.amethyst.ui.note.UserReactionsViewModel
 import com.vitorpamplona.amethyst.ui.screen.NostrChatroomListKnownFeedViewModel
 import com.vitorpamplona.amethyst.ui.screen.NostrChatroomListNewFeedViewModel
@@ -25,6 +35,7 @@ import com.vitorpamplona.amethyst.ui.screen.loggedIn.ChatroomListScreen
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.ChatroomScreen
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.CommunityScreen
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.DiscoverScreen
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.GeoHashScreen
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.HashtagScreen
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.HiddenUsersScreen
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.HomeScreen
@@ -35,6 +46,7 @@ import com.vitorpamplona.amethyst.ui.screen.loggedIn.SearchScreen
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.SettingsScreen
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.ThreadScreen
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.VideoScreen
+import com.vitorpamplona.amethyst.ui.uriToRoute
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 
@@ -178,6 +190,16 @@ fun AppNavigation(
             })
         }
 
+        Route.Geohash.let { route ->
+            composable(route.route, route.arguments, content = {
+                GeoHashScreen(
+                    tag = it.arguments?.getString("id"),
+                    accountViewModel = accountViewModel,
+                    nav = nav
+                )
+            })
+        }
+
         Route.Community.let { route ->
             composable(route.route, route.arguments, content = {
                 CommunityScreen(
@@ -226,4 +248,60 @@ fun AppNavigation(
             })
         }
     }
+
+    val activity = LocalContext.current.getActivity()
+    var actionableNextPage by remember {
+        mutableStateOf(uriToRoute(activity.intent?.data?.toString()?.ifBlank { null }))
+    }
+    actionableNextPage?.let {
+        LaunchedEffect(it) {
+            navController.navigate(it) {
+                popUpTo(Route.Home.route)
+                launchSingleTop = true
+            }
+        }
+        actionableNextPage = null
+    }
+
+    DisposableEffect(navController) {
+        val consumer = Consumer<Intent> { intent ->
+            val uri = intent?.data?.toString()
+            val newPage = uriToRoute(uri)
+
+            newPage?.let { route ->
+                val currentRoute = getRouteWithArguments(navController)
+                if (!isSameRoute(currentRoute, route)) {
+                    navController.navigate(route) {
+                        popUpTo(Route.Home.route)
+                        launchSingleTop = true
+                    }
+                }
+            }
+        }
+        activity.addOnNewIntentListener(consumer)
+        onDispose {
+            activity.removeOnNewIntentListener(consumer)
+        }
+    }
+}
+
+fun Context.getActivity(): MainActivity {
+    if (this is MainActivity) return this
+    return if (this is ContextWrapper) baseContext.getActivity() else getActivity()
+}
+
+private fun isSameRoute(currentRoute: String?, newRoute: String): Boolean {
+    if (currentRoute == null) return false
+
+    if (currentRoute == newRoute) {
+        return true
+    }
+
+    if (newRoute.startsWith("Event/") && currentRoute.contains("/")) {
+        if (newRoute.split("/")[1] == currentRoute.split("/")[1]) {
+            return true
+        }
+    }
+
+    return false
 }

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

@@ -11,11 +11,8 @@ import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.width
-import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material.Divider
 import androidx.compose.material.Icon
 import androidx.compose.material.IconButton
@@ -39,8 +36,8 @@ import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
@@ -63,6 +60,7 @@ import com.vitorpamplona.amethyst.service.NostrChatroomDataSource
 import com.vitorpamplona.amethyst.service.NostrChatroomListDataSource
 import com.vitorpamplona.amethyst.service.NostrCommunityDataSource
 import com.vitorpamplona.amethyst.service.NostrDiscoveryDataSource
+import com.vitorpamplona.amethyst.service.NostrGeohashDataSource
 import com.vitorpamplona.amethyst.service.NostrHashtagDataSource
 import com.vitorpamplona.amethyst.service.NostrHomeDataSource
 import com.vitorpamplona.amethyst.service.NostrSearchEventOrUserDataSource
@@ -77,11 +75,20 @@ import com.vitorpamplona.amethyst.service.model.PeopleListEvent
 import com.vitorpamplona.amethyst.service.relays.Client
 import com.vitorpamplona.amethyst.service.relays.RelayPool
 import com.vitorpamplona.amethyst.ui.components.RobohashAsyncImageProxy
+import com.vitorpamplona.amethyst.ui.note.CommunityHeader
+import com.vitorpamplona.amethyst.ui.note.LoadAddressableNote
+import com.vitorpamplona.amethyst.ui.note.LoadChannel
+import com.vitorpamplona.amethyst.ui.note.LoadUser
 import com.vitorpamplona.amethyst.ui.note.SearchIcon
 import com.vitorpamplona.amethyst.ui.screen.equalImmutableLists
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.ChannelHeader
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.ChatroomHeader
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.GeoHashHeader
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.HashtagHeader
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.SpinnerSelectionDialog
 import com.vitorpamplona.amethyst.ui.theme.BottomTopHeight
+import com.vitorpamplona.amethyst.ui.theme.HeaderPictureModifier
 import com.vitorpamplona.amethyst.ui.theme.Size22Modifier
 import com.vitorpamplona.amethyst.ui.theme.placeholderText
 import kotlinx.collections.immutable.ImmutableList
@@ -108,28 +115,77 @@ fun AppTopBar(
         }
     }
 
-    RenderTopRouteBar(currentRoute, followLists, scaffoldState, accountViewModel, nav)
+    val id by remember(navEntryState.value) {
+        derivedStateOf {
+            navEntryState.value?.arguments?.getString("id")
+        }
+    }
+
+    RenderTopRouteBar(currentRoute, id, followLists, scaffoldState, accountViewModel, nav)
 }
 
 @Composable
 private fun RenderTopRouteBar(
     currentRoute: String?,
+    id: String?,
     followLists: FollowListViewModel,
     scaffoldState: ScaffoldState,
     accountViewModel: AccountViewModel,
     nav: (String) -> Unit
 ) {
     when (currentRoute) {
-        Route.Channel.base -> NoTopBar()
-        Route.Room.base -> NoTopBar()
-        Route.Community.base -> NoTopBar()
-        Route.Hashtag.base -> NoTopBar()
         // Route.Profile.route -> TopBarWithBackButton(nav)
         Route.Home.base -> HomeTopBar(followLists, scaffoldState, accountViewModel, nav)
         Route.Video.base -> StoriesTopBar(followLists, scaffoldState, accountViewModel, nav)
         Route.Discover.base -> DiscoveryTopBar(followLists, scaffoldState, accountViewModel, nav)
         Route.Notification.base -> NotificationTopBar(followLists, scaffoldState, accountViewModel, nav)
-        else -> MainTopBar(scaffoldState, accountViewModel, nav)
+        else -> {
+            if (id != null) {
+                when (currentRoute) {
+                    Route.Channel.base -> LoadChannel(baseChannelHex = id) {
+                        ChannelHeader(
+                            baseChannel = it,
+                            showVideo = true,
+                            showBottomDiviser = true,
+                            modifier = Modifier.padding(vertical = 8.dp, horizontal = 11.dp),
+                            accountViewModel = accountViewModel,
+                            nav = nav
+                        )
+                    }
+                    Route.Room.base -> LoadUser(baseUserHex = id) {
+                        if (it != null) {
+                            ChatroomHeader(
+                                baseUser = it,
+                                modifier = Modifier.padding(vertical = 4.dp, horizontal = 11.dp),
+                                accountViewModel = accountViewModel,
+                                nav = nav
+                            )
+                        } else {
+                            Spacer(BottomTopHeight)
+                        }
+                    }
+                    Route.Community.base -> LoadAddressableNote(aTagHex = id) {
+                        if (it != null) {
+                            CommunityHeader(
+                                baseNote = it,
+                                showBottomDiviser = true,
+                                sendToCommunity = false,
+                                modifier = Modifier.padding(vertical = 8.dp, horizontal = 10.dp),
+                                accountViewModel = accountViewModel,
+                                nav = nav
+                            )
+                        } else {
+                            Spacer(BottomTopHeight)
+                        }
+                    }
+                    Route.Hashtag.base -> HashtagHeader(id, Modifier.padding(vertical = 0.dp, horizontal = 10.dp), accountViewModel)
+                    Route.Geohash.base -> GeoHashHeader(id, Modifier.padding(vertical = 0.dp, horizontal = 10.dp), accountViewModel)
+                    else -> MainTopBar(scaffoldState, accountViewModel, nav)
+                }
+            } else {
+                MainTopBar(scaffoldState, accountViewModel, nav)
+            }
+        }
     }
 }
 
@@ -277,17 +333,14 @@ private fun LoggedInUserPictureDrawer(
     val profilePicture = remember(accountUserState) { accountUserState?.user?.profilePicture() }
 
     IconButton(
-        onClick = onClick,
-        modifier = Modifier
+        onClick = onClick
     ) {
         RobohashAsyncImageProxy(
             robot = pubkeyHex,
             model = profilePicture,
             contentDescription = stringResource(id = R.string.profile_image),
-            modifier = Modifier
-                .width(34.dp)
-                .height(34.dp)
-                .clip(shape = CircleShape)
+            modifier = HeaderPictureModifier,
+            contentScale = ContentScale.Crop
         )
     }
 }
@@ -492,6 +545,7 @@ fun debugState(context: Context) {
     NostrCommunityDataSource.printCounter()
     NostrDiscoveryDataSource.printCounter()
     NostrHashtagDataSource.printCounter()
+    NostrGeohashDataSource.printCounter()
     NostrHomeDataSource.printCounter()
     NostrSearchEventOrUserDataSource.printCounter()
     NostrSingleChannelDataSource.printCounter()
@@ -508,7 +562,15 @@ fun debugState(context: Context) {
     Log.d("STATE DUMP", "Image Memory Cache ${(imageLoader.memoryCache?.size ?: 0) / (1024 * 1024)}/${(imageLoader.memoryCache?.maxSize ?: 0) / (1024 * 1024)} MB")
 
     Log.d("STATE DUMP", "Notes: " + LocalCache.notes.filter { it.value.event != null }.size + "/" + LocalCache.notes.size)
+    Log.d("STATE DUMP", "Addressables: " + LocalCache.addressables.filter { it.value.event != null }.size + "/" + LocalCache.addressables.size)
     Log.d("STATE DUMP", "Users: " + LocalCache.users.filter { it.value.info?.latestMetadata != null }.size + "/" + LocalCache.users.size)
 
-    Log.d("STATE DUMP", "Notes: " + LocalCache.notes.filter { it.value.event != null }.size + "/" + LocalCache.notes.size)
+    Log.d("STATE DUMP", "Memory used by Events: " + LocalCache.notes.values.sumOf { it.event?.countMemory() ?: 0 } / (1024 * 1024) + " MB")
+
+    LocalCache.notes.values.groupBy { it.event?.kind() }.forEach {
+        Log.d("STATE DUMP", "Kind ${it.key}: \t${it.value.size} elements ")
+    }
+    LocalCache.addressables.values.groupBy { it.event?.kind() }.forEach {
+        Log.d("STATE DUMP", "Kind ${it.key}: \t${it.value.size} elements ")
+    }
 }

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

@@ -107,6 +107,12 @@ sealed class Route(
         arguments = listOf(navArgument("id") { type = NavType.StringType }).toImmutableList()
     )
 
+    object Geohash : Route(
+        route = "Geohash/{id}",
+        icon = R.drawable.ic_moments,
+        arguments = listOf(navArgument("id") { type = NavType.StringType }).toImmutableList()
+    )
+
     object Community : Route(
         route = "Community/{id}",
         icon = R.drawable.ic_moments,

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

@@ -33,12 +33,10 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.Shape
 import androidx.compose.ui.graphics.compositeOver
 import androidx.compose.ui.layout.onSizeChanged
-import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
 import androidx.lifecycle.map
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.model.Note
@@ -58,6 +56,7 @@ import com.vitorpamplona.amethyst.ui.theme.ChatBubbleMaxSizeModifier
 import com.vitorpamplona.amethyst.ui.theme.ChatBubbleShapeMe
 import com.vitorpamplona.amethyst.ui.theme.ChatBubbleShapeThem
 import com.vitorpamplona.amethyst.ui.theme.DoubleHorzSpacer
+import com.vitorpamplona.amethyst.ui.theme.Font12SP
 import com.vitorpamplona.amethyst.ui.theme.ReactionRowHeightChat
 import com.vitorpamplona.amethyst.ui.theme.Size15dp
 import com.vitorpamplona.amethyst.ui.theme.Size25dp
@@ -68,6 +67,8 @@ import com.vitorpamplona.amethyst.ui.theme.placeholderText
 import com.vitorpamplona.amethyst.ui.theme.subtleBorder
 import kotlinx.collections.immutable.persistentSetOf
 import kotlinx.collections.immutable.toImmutableSet
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
 
 @OptIn(ExperimentalFoundationApi::class)
 @Composable
@@ -254,9 +255,11 @@ fun NormalChatNote(
 
     if (routeForLastRead != null) {
         LaunchedEffect(key1 = routeForLastRead) {
-            val createdAt = note.createdAt()
-            if (createdAt != null) {
-                accountViewModel.account.markAsRead(routeForLastRead, createdAt)
+            launch(Dispatchers.IO) {
+                val createdAt = note.createdAt()
+                if (createdAt != null) {
+                    accountViewModel.account.markAsRead(routeForLastRead, createdAt)
+                }
             }
         }
     }
@@ -573,18 +576,18 @@ private fun StatusRow(
 
 @Composable
 fun ChatTimeAgo(baseNote: Note) {
-    val context = LocalContext.current
+    val nowStr = stringResource(id = R.string.now)
 
-    val timeStr by remember(baseNote) {
+    val time by remember(baseNote) {
         derivedStateOf {
-            timeAgoShort(baseNote.createdAt() ?: 0, context = context)
+            timeAgoShort(baseNote.createdAt() ?: 0, nowStr)
         }
     }
 
     Text(
-        text = timeStr,
+        text = time,
         color = MaterialTheme.colors.placeholderText,
-        fontSize = 12.sp,
+        fontSize = Font12SP,
         maxLines = 1
     )
 }

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

@@ -50,7 +50,7 @@ fun MessageSetCompose(messageSetCard: MessageSetCard, routeForLastRead: String,
     val newItemColor = MaterialTheme.colors.newItemBackgroundColor
 
     LaunchedEffect(key1 = messageSetCard) {
-        scope.launch(Dispatchers.IO) {
+        launch(Dispatchers.IO) {
             val isNew = messageSetCard.createdAt() > accountViewModel.account.loadLastRead(routeForLastRead)
 
             accountViewModel.account.markAsRead(routeForLastRead, messageSetCard.createdAt())

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

@@ -162,7 +162,6 @@ fun MultiSetCompose(multiSetCard: MultiSetCard, routeForLastRead: String, showHi
     }
 }
 
-@OptIn(ExperimentalTime::class)
 @Composable
 private fun Galeries(
     multiSetCard: MultiSetCard,
@@ -259,7 +258,9 @@ fun RenderZapGallery(
         ) {
             ZappedIcon(
                 modifier = remember {
-                    Modifier.size(Size25dp).align(Alignment.TopEnd)
+                    Modifier
+                        .size(Size25dp)
+                        .align(Alignment.TopEnd)
                 }
             )
         }
@@ -281,7 +282,11 @@ fun RenderBoostGallery(
             modifier = NotificationIconModifierSmaller
         ) {
             RepostedIcon(
-                modifier = remember { Modifier.size(Size19dp).align(Alignment.TopEnd) }
+                modifier = remember {
+                    Modifier
+                        .size(Size19dp)
+                        .align(Alignment.TopEnd)
+                }
             )
         }
 
@@ -344,20 +349,9 @@ private fun ParseAuthorCommentAndAmount(
 
     LaunchedEffect(key1 = zapRequest.idHex, key2 = zapEvent?.idHex) {
         launch(Dispatchers.IO) {
-            (zapRequest.event as? LnZapRequestEvent)?.let {
-                val decryptedContent = accountViewModel.decryptZap(zapRequest)
-                val amount = (zapEvent?.event as? LnZapEvent)?.amount
-                if (decryptedContent != null) {
-                    val newAuthor = LocalCache.getOrCreateUser(decryptedContent.pubKey)
-                    val newState = ZapAmountCommentNotification(newAuthor, decryptedContent.content.ifBlank { null }, showAmountAxis(amount))
-
-                    launch(Dispatchers.Main) { content.value = newState }
-                } else {
-                    if (!zapRequest.event?.content().isNullOrBlank() || amount != null) {
-                        val newState = ZapAmountCommentNotification(zapRequest.author, zapRequest.event?.content()?.ifBlank { null }, showAmountAxis(amount))
-                        launch(Dispatchers.Main) { content.value = newState }
-                    }
-                }
+            val newState = loadAmountState(zapRequest, zapEvent, accountViewModel)
+            if (newState != null) {
+                content.value = newState
             }
         }
     }
@@ -365,6 +359,34 @@ private fun ParseAuthorCommentAndAmount(
     onReady(content)
 }
 
+private suspend fun loadAmountState(
+    zapRequest: Note,
+    zapEvent: Note?,
+    accountViewModel: AccountViewModel
+): ZapAmountCommentNotification? {
+    (zapRequest.event as? LnZapRequestEvent)?.let {
+        val decryptedContent = accountViewModel.decryptZap(zapRequest)
+        val amount = (zapEvent?.event as? LnZapEvent)?.amount
+        if (decryptedContent != null) {
+            val newAuthor = LocalCache.getOrCreateUser(decryptedContent.pubKey)
+            return ZapAmountCommentNotification(
+                newAuthor,
+                decryptedContent.content.ifBlank { null },
+                showAmountAxis(amount)
+            )
+        } else {
+            if (!zapRequest.event?.content().isNullOrBlank() || amount != null) {
+                return ZapAmountCommentNotification(
+                    zapRequest.author,
+                    zapRequest.event?.content()?.ifBlank { null },
+                    showAmountAxis(amount)
+                )
+            }
+        }
+    }
+    return null
+}
+
 @Composable
 private fun RenderState(
     content: MutableState<ZapAmountCommentNotification>,