0.22.3

temporary solution for mirroring arabic text

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,32 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: "[BUG]"
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Video and Screenshots**
+If applicable, add a video and/or screenshots to help explain your problem.
+
+**Device (please complete the following information):**
+ - Phone Brand/Model [e.g. Pixel 7 Pro]: 
+ - Android Version [e.g. 33]: 
+ - App Version [e.g. v0.20.3]: 
+
+**Bounty (in Bitcoin sats) offered for a solution**
+Incentivize developers to work on your issue. Describe clear milestones to claim payment.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: "[FEATURE]"
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Bounty (in Bitcoin sats) offered for the implementation**
+Incentivize developers to work on your feature. Describe clear milestones to claim payment. 
+
+**Additional context**
+Add any other context, video, or screenshots about the feature request here.

.idea/.name

@@ -0,0 +1 @@
+Amethyst

.idea/inspectionProfiles/Project_Default.xml

@@ -5,6 +5,9 @@
       <option name="composableFile" value="true" />
       <option name="previewFile" value="true" />
     </inspection_tool>
+    <inspection_tool class="PreviewApiLevelMustBeValid" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
     <inspection_tool class="PreviewDimensionRespectsLimit" enabled="true" level="WARNING" enabled_by_default="true">
       <option name="composableFile" value="true" />
       <option name="previewFile" value="true" />

.idea/kotlinc.xml

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

.idea/misc.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="Android Studio default JDK" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

README.md

@@ -6,29 +6,49 @@ Amethyst brings the best social network to your Android phone. Just insert your
 
 # Current Features
 
-- [x] Account Management
+- [x] Event Builders / WebSocket Subscriptions (NIP-01, NIP-15)
 - [x] Home Feed
 - [x] Notifications Feed
 - [x] Global Feed
-- [x] Reactions (like, boost, reply)
-- [x] Image Preview (gifs, svgs)
-- [x] Url Preview
+- [x] Reactions (likes NIP-25, boost, reply)
+- [x] Image/Video/Url/LnInvoice Previews
 - [x] View Threads
 - [x] Private Messages (NIP-04)
-- [x] User Profiles (follow/unfollow)
+- [x] User Profiles (edit/follow/unfollow - NIP-02)
 - [x] Public Chats (NIP-28)
-- [x] Notification Bubbles
-- [x] Reporting and Hide User capability
-- [x] Profile Edit
-- [x] Relay Edit (separate relay sets for home, dms, public chats, global)
-- [x] Dropdown to Link Users when writing
+- [x] Bech Encoding support (NIP-19)
+- [x] Notification Dots
+- [x] Reporting and Hide User capability (NIP-56)
+- [x] Automatic Translations
+- [x] Relay Sets (home, dms, public chats, global)
+- [x] User/Note Tagging (NIP-08, NIP-10)
 - [x] Lightning Tips
-- [x] Zaps 
-- [ ] Infinity Scroll 
-- [ ] Identity Verification (NIP-05)
-- [ ] Event Deletion (NIP-09)
-- [ ] Account Creation / Backup Guidance
-- [ ] Message Sent feedback
+- [x] Zaps (NIP-57)
+- [x] URI Support (NIP-21)
+- [x] Event Deletion (NIP-09: like, boost, text notes and reports)
+- [x] Identity Verification (NIP-05)
+- [x] Long-form Content (NIP-23)
+- [x] Parameterized Replaceable Events (NIP-33)
+- [ ] Local Database 
+- [ ] View Individual Reactions (Like, Boost, Zaps, Reports) per Post
+- [ ] Bookmarks, Pinned Posts, Muted Events (NIP-51)
+- [ ] Sensitive Content (NIP-36) 
+- [ ] Relay Pages (NIP-11)
+- [ ] Relay Authentication (NIP-42)
+- [ ] Generic Tags (NIP-12)
+- [ ] Proof of Work in the Phone (NIP-13, NIP-20)
+- [ ] Events with a Subject (NIP-14)
+- [ ] Online Relay Search (NIP-50)
+- [ ] Workspaces
+- [ ] Expiration Support (NIP-40)
+- [ ] Internationalization
+- [ ] Infinity Scroll
+- [ ] Badges (NIP-58)
+- [ ] Relay List Metadata (NIP-65)
+- [ ] Signing Requests (NIP-46)
+- [ ] Delegated Event Signing (NIP-26)
+- [ ] Account Creation / Backup Guidance (NIP-06)
+- [ ] Message Sent feedback (NIP-20)
 
 # Development Overview
 

app/build.gradle

@@ -11,8 +11,8 @@ android {
         applicationId "com.vitorpamplona.amethyst"
         minSdk 26
         targetSdk 33
-        versionCode 72
-        versionName "0.19.0"
+        versionCode 86
+        versionName "0.22.3"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {
@@ -130,6 +130,11 @@ dependencies {
     implementation 'androidx.camera:camera-lifecycle:1.2.1'
     implementation 'androidx.camera:camera-view:1.2.1'
 
+    // Markdown
+    implementation "com.halilibo.compose-richtext:richtext-ui:0.16.0"
+    implementation "com.halilibo.compose-richtext:richtext-ui-material:0.16.0"
+    implementation "com.halilibo.compose-richtext:richtext-commonmark:0.16.0"
+
     // For QR Scanning
     implementation 'com.google.mlkit:vision-common:17.3.0'
 

app/proguard-rules.pro

@@ -25,7 +25,7 @@
 -keep class fr.acinq.secp256k1.jni.** { *; }
 # For the NostrPostr library
 -keep class nostr.postr.** { *; }
--keep class nostr.postr.events.** { *; }
+-keep class com.vitorpamplona.amethyst.service.model.** { *; }
 # Json parsing
 -keep class com.google.gson.reflect.** { *; }
 -keep class * extends com.google.gson.reflect.TypeToken

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

@@ -4,13 +4,13 @@ import android.content.Context
 import com.google.gson.GsonBuilder
 import com.google.gson.reflect.TypeToken
 import com.vitorpamplona.amethyst.model.Account
-import com.vitorpamplona.amethyst.model.toByteArray
 import com.vitorpamplona.amethyst.model.RelaySetupInfo
+import com.vitorpamplona.amethyst.model.toByteArray
 import java.util.Locale
 import nostr.postr.Persona
-import nostr.postr.events.ContactListEvent
-import nostr.postr.events.Event
-import nostr.postr.events.Event.Companion.getRefinedEvent
+import com.vitorpamplona.amethyst.service.model.ContactListEvent
+import com.vitorpamplona.amethyst.service.model.Event
+import com.vitorpamplona.amethyst.service.model.Event.Companion.getRefinedEvent
 import nostr.postr.toHex
 
 class LocalPreferences(context: Context) {

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

@@ -2,7 +2,6 @@ package com.vitorpamplona.amethyst
 
 import android.content.Context
 import androidx.lifecycle.LiveData
-import com.vitorpamplona.amethyst.model.Note
 import java.util.concurrent.atomic.AtomicBoolean
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -45,12 +44,10 @@ class NotificationLiveData(val cache: NotificationCache): LiveData<NotificationS
   // Refreshes observers in batches.
   var handlerWaiting = AtomicBoolean()
 
-  @Synchronized
   fun invalidateData() {
     if (!hasActiveObservers()) return
     if (handlerWaiting.getAndSet(true)) return
 
-    handlerWaiting.set(true)
     val scope = CoroutineScope(Job() + Dispatchers.Main)
     scope.launch {
       try {

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

@@ -2,23 +2,28 @@ package com.vitorpamplona.amethyst
 
 import android.content.Context
 import android.graphics.Bitmap
+import android.graphics.Canvas
+import android.graphics.Paint
 import android.util.LruCache
 import androidx.compose.ui.graphics.ImageBitmap
 import androidx.compose.ui.graphics.asImageBitmap
 import java.util.UUID
-import name.neuhalfen.projects.android.robohash.RoboHash
+import name.neuhalfen.projects.android.robohash.buckets.VariableSizeHashing
+import name.neuhalfen.projects.android.robohash.handle.Handle
+import name.neuhalfen.projects.android.robohash.handle.HandleFactory
+import name.neuhalfen.projects.android.robohash.paths.Configuration
+import name.neuhalfen.projects.android.robohash.repository.ImageRepository
 
 object RoboHashCache {
 
-  lateinit var robots: RoboHash
+  lateinit var robots: MyRoboHash
 
   lateinit var defaultAvatar: ImageBitmap
 
   @Synchronized
   fun get(context: Context, hash: String): ImageBitmap {
     if (!this::robots.isInitialized) {
-      robots = RoboHash(context)
-      //robots.useCache(LruCache(100));
+      robots = MyRoboHash(context)
 
       defaultAvatar = robots.imageForHandle(robots.calculateHandleFromUUID(UUID.nameUUIDFromBytes("aaaa".toByteArray()))).asImageBitmap()
     }
@@ -26,4 +31,139 @@ object RoboHashCache {
     return defaultAvatar
   }
 
-}
+}
+
+
+/**
+ * Recreates RoboHash to use a custom configuration
+ */
+class MyRoboHash(context: Context) {
+  private val configuration: Configuration = ModifiedSet1Configuration()
+  private val repository: ImageRepository
+  private val hashing = VariableSizeHashing(configuration.bucketSizes)
+
+  // Optional
+  private var memoryCache: LruCache<String, Bitmap>? = null
+
+  init {
+    repository = ImageRepository(context.assets)
+  }
+
+  fun useCache(memoryCache: LruCache<String, Bitmap>?) {
+    this.memoryCache = memoryCache
+  }
+
+  fun calculateHandleFromUUID(uuid: UUID?): Handle {
+    val data = hashing.createBuckets(uuid)
+    return handleFactory.calculateHandle(data)
+  }
+
+  fun imageForHandle(handle: Handle): Bitmap {
+    if (null != memoryCache) {
+      val cached = memoryCache!![handle.toString()]
+      if (null != cached) return cached
+    }
+    val bucketValues = handle.bucketValues()
+    val paths = configuration.convertToFacetParts(bucketValues)
+    val sampleSize = 1
+    val buffer = repository.createBuffer(configuration.width(), configuration.height())
+    val target = buffer.copy(Bitmap.Config.ARGB_8888, true)
+    val merged = Canvas(target)
+    val paint = Paint(0)
+
+    // The first image is not added as copy form the buffer
+    for (i in paths.indices) {
+      merged.drawBitmap(repository.getInto(buffer, paths[i], sampleSize), 0f, 0f, paint)
+    }
+    repository.returnBuffer(buffer)
+    if (null != memoryCache) {
+      memoryCache!!.put(handle.toString(), target)
+    }
+    return target
+  }
+
+  companion object {
+    private val handleFactory = HandleFactory()
+  }
+}
+
+/**
+ * Custom configuration to avoid the use of String.format in the GeneratePath
+ * This uses the default location and ends up encoding number in the local language
+ */
+class ModifiedSet1Configuration : Configuration {
+  override fun convertToFacetParts(bucketValues: ByteArray): Array<String> {
+    require(bucketValues.size == BUCKET_COUNT)
+    val color = INT_TO_COLOR[bucketValues[BUCKET_COLOR].toInt()]
+    val paths = mutableListOf<String>()
+
+    // e.g.
+    //   blue face  #2
+    //   blue nose  #7
+    //   blue
+    val firstFacetBucket = BUCKET_COLOR + 1
+    for (facet in 0 until FACET_COUNT) {
+      val bucketValue = bucketValues[firstFacetBucket + facet].toInt()
+      paths.add(generatePath(FACET_PATH_TEMPLATES[facet], color, bucketValue))
+    }
+    return paths.toTypedArray()
+  }
+
+  private fun generatePath(facetPathTemplate: String, color: String, bucketValue: Int): String {
+    // TODO: Make more efficient
+    return facetPathTemplate.replace("#ROOT#", ROOT).replace("#COLOR#".toRegex(), color)
+      .replace("#ITEM#".toRegex(), (bucketValue + 1).toString().padStart(2, '0'))
+  }
+
+  override fun getBucketSizes(): ByteArray {
+    return BUCKET_SIZES
+  }
+
+  override fun width(): Int {
+    return 300
+  }
+
+  override fun height(): Int {
+    return 300
+  }
+
+  companion object {
+    private const val ROOT = "sets/set1"
+    private const val BUCKET_COLOR = 0
+    private const val COLOR_COUNT = 10
+    private const val BODY_COUNT = 10
+    private const val FACE_COUNT = 10
+    private const val MOUTH_COUNT = 10
+    private const val EYES_COUNT = 10
+    private const val ACCESSORY_COUNT = 10
+    private const val BUCKET_COUNT = 6
+    private const val FACET_COUNT = 5
+    private val BUCKET_SIZES = byteArrayOf(
+      COLOR_COUNT.toByte(),
+      BODY_COUNT.toByte(),
+      FACE_COUNT.toByte(),
+      MOUTH_COUNT.toByte(),
+      EYES_COUNT.toByte(),
+      ACCESSORY_COUNT.toByte()
+    )
+    private val INT_TO_COLOR = arrayOf(
+      "blue",
+      "brown",
+      "green",
+      "grey",
+      "orange",
+      "pink",
+      "purple",
+      "red",
+      "white",
+      "yellow"
+    )
+    private val FACET_PATH_TEMPLATES = arrayOf(
+      "#ROOT#/#COLOR#/01Body/#COLOR#_body-#ITEM#.png",
+      "#ROOT#/#COLOR#/02Face/#COLOR#_face-#ITEM#.png",
+      "#ROOT#/#COLOR#/Mouth/#COLOR#_mouth-#ITEM#.png",
+      "#ROOT#/#COLOR#/Eyes/#COLOR#_eyes-#ITEM#.png",
+      "#ROOT#/#COLOR#/Accessory/#COLOR#_accessory-#ITEM#.png"
+    )
+  }
+}

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

@@ -2,7 +2,6 @@ package com.vitorpamplona.amethyst
 
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.LocalCache
-import com.vitorpamplona.amethyst.service.relays.Constants
 import com.vitorpamplona.amethyst.service.NostrAccountDataSource
 import com.vitorpamplona.amethyst.service.NostrChannelDataSource
 import com.vitorpamplona.amethyst.service.NostrChatroomListDataSource
@@ -14,6 +13,7 @@ import com.vitorpamplona.amethyst.service.NostrSingleUserDataSource
 import com.vitorpamplona.amethyst.service.NostrThreadDataSource
 import com.vitorpamplona.amethyst.service.NostrUserProfileDataSource
 import com.vitorpamplona.amethyst.service.relays.Client
+import com.vitorpamplona.amethyst.service.relays.Constants
 
 object ServiceManager {
   private var account: Account? = null
@@ -33,7 +33,6 @@ object ServiceManager {
       NostrAccountDataSource.account = myAccount
       NostrHomeDataSource.account = myAccount
       NostrChatroomListDataSource.account = myAccount
-      NostrGlobalDataSource.account = myAccount
 
       // Notification Elements
       NostrAccountDataSource.start()

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

@@ -3,15 +3,16 @@ package com.vitorpamplona.amethyst.model
 import android.content.res.Resources
 import androidx.core.os.ConfigurationCompat
 import androidx.lifecycle.LiveData
-import com.vitorpamplona.amethyst.service.relays.Constants
 import com.vitorpamplona.amethyst.service.model.ChannelCreateEvent
 import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
 import com.vitorpamplona.amethyst.service.model.ChannelMetadataEvent
+import com.vitorpamplona.amethyst.service.model.Contact
 import com.vitorpamplona.amethyst.service.model.LnZapRequestEvent
 import com.vitorpamplona.amethyst.service.model.ReactionEvent
 import com.vitorpamplona.amethyst.service.model.ReportEvent
 import com.vitorpamplona.amethyst.service.model.RepostEvent
 import com.vitorpamplona.amethyst.service.relays.Client
+import com.vitorpamplona.amethyst.service.relays.Constants
 import com.vitorpamplona.amethyst.service.relays.FeedType
 import com.vitorpamplona.amethyst.service.relays.Relay
 import com.vitorpamplona.amethyst.service.relays.RelayPool
@@ -26,16 +27,12 @@ import kotlinx.coroutines.NonCancellable
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
-import nostr.postr.Contact
 import nostr.postr.Persona
-import nostr.postr.Utils
-import nostr.postr.events.ContactListEvent
-import nostr.postr.events.DeletionEvent
-import nostr.postr.events.Event
-import nostr.postr.events.MetadataEvent
-import nostr.postr.events.PrivateDmEvent
-import nostr.postr.events.TextNoteEvent
-import nostr.postr.toHex
+import com.vitorpamplona.amethyst.service.model.ContactListEvent
+import com.vitorpamplona.amethyst.service.model.DeletionEvent
+import com.vitorpamplona.amethyst.service.model.MetadataEvent
+import com.vitorpamplona.amethyst.service.model.PrivateDmEvent
+import com.vitorpamplona.amethyst.service.model.TextNoteEvent
 
 val DefaultChannels = setOf(
   "25e5c82273a271cb1a840d0060391a0bf4965cafeb029d5ab55350b418953fbb", // -> Anigma's Nostr
@@ -89,10 +86,11 @@ class Account(
     if (!isWriteable()) return
 
     val contactList = userProfile().latestContactList
+    val follows = contactList?.follows() ?: emptyList()
 
-    if (contactList != null && contactList.follows.size > 0) {
+    if (contactList != null && follows.isNotEmpty()) {
       val event = ContactListEvent.create(
-        contactList.follows,
+        follows,
         relays,
         loggedIn.privKey!!)
 
@@ -111,14 +109,7 @@ class Account(
     if (!isWriteable()) return
 
     loggedIn.privKey?.let {
-      val createdAt = Date().time / 1000
-      val content = toString
-      val pubKey = Utils.pubkeyCreate(it)
-      val tags = listOf<List<String>>()
-      val id = Event.generateId(pubKey, createdAt, MetadataEvent.kind, tags, content)
-      val sig = Utils.sign(id, it)
-      val event = MetadataEvent(id, pubKey, createdAt, tags, content, sig)
-
+      val event = MetadataEvent.create(toString, loggedIn.privKey!!)
       Client.send(event)
       LocalCache.consume(event)
     }
@@ -250,10 +241,11 @@ class Account(
     if (!isWriteable()) return
 
     val contactList = userProfile().latestContactList
+    val follows = contactList?.follows() ?: emptyList()
 
-    val event = if (contactList != null && contactList.follows.size > 0) {
+    val event = if (contactList != null && follows.isNotEmpty()) {
       ContactListEvent.create(
-        contactList.follows.plus(Contact(user.pubkeyHex, null)),
+        follows.plus(Contact(user.pubkeyHex, null)),
         userProfile().relays,
         loggedIn.privKey!!)
     } else {
@@ -273,10 +265,11 @@ class Account(
     if (!isWriteable()) return
 
     val contactList = userProfile().latestContactList
+    val follows = contactList?.follows() ?: emptyList()
 
-    if (contactList != null && contactList.follows.size > 0) {
+    if (contactList != null && follows.isNotEmpty()) {
       val event = ContactListEvent.create(
-        contactList.follows.filter { it.pubKeyHex != user.pubkeyHex },
+        follows.filter { it.pubKeyHex != user.pubkeyHex },
         userProfile().relays,
         loggedIn.privKey!!)
 
@@ -290,18 +283,20 @@ class Account(
 
     val repliesToHex = replyTo?.map { it.idHex }
     val mentionsHex = mentions?.map { it.pubkeyHex }
+    val addresses = replyTo?.mapNotNull { it.address() }
 
     val signedEvent = TextNoteEvent.create(
       msg = message,
       replyTos = repliesToHex,
       mentions = mentionsHex,
+      addresses = addresses,
       privateKey = loggedIn.privKey!!
     )
     Client.send(signedEvent)
     LocalCache.consume(signedEvent)
   }
 
-  fun sendChannelMeesage(message: String, toChannel: String, replyingTo: Note? = null, mentions: List<User>?) {
+  fun sendChannelMessage(message: String, toChannel: String, replyingTo: Note? = null, mentions: List<User>?) {
     if (!isWriteable()) return
 
     val repliesToHex = listOfNotNull(replyingTo?.idHex).ifEmpty { null }
@@ -318,37 +313,6 @@ class Account(
     LocalCache.consume(signedEvent, null)
   }
 
-  fun createPrivateMessageWithReply(
-    recipientPubKey: ByteArray,
-    msg: String,
-    replyTos: List<String>? = null, mentions: List<String>? = null,
-    privateKey: ByteArray,
-    createdAt: Long = Date().time / 1000,
-    publishedRecipientPubKey: ByteArray? = null,
-    advertiseNip18: Boolean = true
-  ): PrivateDmEvent {
-    val content = Utils.encrypt(
-      if (advertiseNip18) {
-        PrivateDmEvent.nip18Advertisement
-      } else { "" } + msg,
-      privateKey,
-      recipientPubKey)
-    val pubKey = Utils.pubkeyCreate(privateKey)
-    val tags = mutableListOf<List<String>>()
-    publishedRecipientPubKey?.let {
-      tags.add(listOf("p", publishedRecipientPubKey.toHex()))
-    }
-    replyTos?.forEach {
-      tags.add(listOf("e", it))
-    }
-    mentions?.forEach {
-      tags.add(listOf("p", it))
-    }
-    val id = Event.generateId(pubKey, createdAt, PrivateDmEvent.kind, tags, content)
-    val sig = Utils.sign(id, privateKey)
-    return PrivateDmEvent(id, pubKey, createdAt, tags, content, sig)
-  }
-
   fun sendPrivateMeesage(message: String, toUser: String, replyingTo: Note? = null) {
     if (!isWriteable()) return
     val user = LocalCache.users[toUser] ?: return
@@ -356,7 +320,7 @@ class Account(
     val repliesToHex = listOfNotNull(replyingTo?.idHex).ifEmpty { null }
     val mentionsHex = emptyList<String>()
 
-    val signedEvent = createPrivateMessageWithReply(
+    val signedEvent = PrivateDmEvent.create(
       recipientPubKey = user.pubkey(),
       publishedRecipientPubKey = user.pubkey(),
       msg = message,
@@ -384,7 +348,7 @@ class Account(
     Client.send(event)
     LocalCache.consume(event)
 
-    joinChannel(event.id.toHex())
+    joinChannel(event.id)
   }
 
   fun joinChannel(idHex: String) {
@@ -436,7 +400,7 @@ class Account(
     Client.send(event)
     LocalCache.consume(event)
 
-    joinChannel(event.id.toHex())
+    joinChannel(event.id)
   }
 
   fun decryptContent(note: Note): String? {
@@ -444,26 +408,12 @@ class Account(
     return if (event is PrivateDmEvent && loggedIn.privKey != null) {
       var pubkeyToUse = event.pubKey
 
-      val recepientPK = event.recipientPubKey
+      val recepientPK = event.recipientPubKey()
 
       if (note.author == userProfile() && recepientPK != null)
         pubkeyToUse = recepientPK
 
-      return try {
-        val sharedSecret = Utils.getSharedSecret(loggedIn.privKey!!, pubkeyToUse)
-
-        val retVal = Utils.decrypt(event.content, sharedSecret)
-
-        if (retVal.startsWith(PrivateDmEvent.nip18Advertisement)) {
-          retVal.substring(16)
-        } else {
-          retVal
-        }
-
-      } catch (e: Exception) {
-        e.printStackTrace()
-        null
-      }
+      event.plainContent(loggedIn.privKey!!, pubkeyToUse.toByteArray())
     } else {
       event?.content
     }
@@ -493,10 +443,10 @@ class Account(
   }
 
   private fun updateContactListTo(newContactList: ContactListEvent?) {
-    if (newContactList?.follows.isNullOrEmpty()) return
+    if (newContactList?.follows().isNullOrEmpty()) return
 
     // Events might be different objects, we have to compare their ids.
-    if (backupContactList?.id?.toHex() != newContactList?.id?.toHex()) {
+    if (backupContactList?.id != newContactList?.id) {
       backupContactList = newContactList
       saveable.invalidateData()
     }
@@ -605,11 +555,9 @@ class Account(
 class AccountLiveData(private val account: Account): LiveData<AccountState>(AccountState(account)) {
   var handlerWaiting = AtomicBoolean()
 
-  @Synchronized
   fun invalidateData() {
     if (handlerWaiting.getAndSet(true)) return
 
-    handlerWaiting.set(true)
     val scope = CoroutineScope(Job() + Dispatchers.Default)
     scope.launch {
       try {

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

@@ -11,7 +11,7 @@ import kotlinx.coroutines.NonCancellable
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
-import nostr.postr.events.Event
+import com.vitorpamplona.amethyst.service.model.Event
 import nostr.postr.toHex
 
 data class Spammer(val pubkeyHex: HexKey, var duplicatedMessages: Set<HexKey>)
@@ -22,7 +22,7 @@ class AntiSpamFilter {
 
   @Synchronized
   fun isSpam(event: Event): Boolean {
-    val idHex = event.id.toHexKey()
+    val idHex = event.id
 
     // if already processed, ok
     if (LocalCache.notes[idHex] != null) return false
@@ -37,15 +37,15 @@ class AntiSpamFilter {
     val hash = (event.content + event.tags.flatten().joinToString(",")).hashCode()
 
     if ((recentMessages[hash] != null && recentMessages[hash] != idHex) || spamMessages[hash] != null) {
-      Log.w("Potential SPAM Message", "${event.id.toHex()} ${recentMessages[hash]} ${spamMessages[hash] != null} ${event.content.replace("\n", " | ")}")
+      Log.w("Potential SPAM Message", "${event.id} ${recentMessages[hash]} ${spamMessages[hash] != null} ${event.content.replace("\n", " | ")}")
 
       // Log down offenders
       if (spamMessages.get(hash) == null) {
-        spamMessages.put(hash, Spammer(event.pubKey.toHexKey(), setOf(recentMessages[hash], event.id.toHex())))
+        spamMessages.put(hash, Spammer(event.pubKey, setOf(recentMessages[hash], event.id)))
         liveSpam.invalidateData()
       } else {
         val spammer = spamMessages.get(hash)
-        spammer.duplicatedMessages = spammer.duplicatedMessages + event.id.toHex()
+        spammer.duplicatedMessages = spammer.duplicatedMessages + event.id
 
         liveSpam.invalidateData()
       }
@@ -67,12 +67,10 @@ class AntiSpamLiveData(val cache: AntiSpamFilter): LiveData<AntiSpamState>(AntiS
   // Refreshes observers in batches.
   var handlerWaiting = AtomicBoolean()
 
-  @Synchronized
   fun invalidateData() {
     if (!hasActiveObservers()) return
     if (handlerWaiting.getAndSet(true)) return
 
-    handlerWaiting.set(true)
     val scope = CoroutineScope(Job() + Dispatchers.Main)
     scope.launch {
       try {

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

@@ -2,9 +2,7 @@ package com.vitorpamplona.amethyst.model
 
 import androidx.lifecycle.LiveData
 import com.vitorpamplona.amethyst.service.NostrSingleChannelDataSource
-import com.vitorpamplona.amethyst.service.NostrSingleEventDataSource
 import com.vitorpamplona.amethyst.service.model.ChannelCreateEvent
-import com.vitorpamplona.amethyst.ui.dal.ChannelFeedFilter
 import com.vitorpamplona.amethyst.ui.note.toShortenHex
 import fr.acinq.secp256k1.Hex
 import java.util.concurrent.ConcurrentHashMap
@@ -25,7 +23,6 @@ class Channel(val idHex: String) {
         return info.name ?: idDisplayNote()
     }
 
-    @Synchronized
     fun addNote(note: Note) {
         notes[note.idHex] = note
     }
@@ -54,7 +51,7 @@ class Channel(val idHex: String) {
     fun pruneOldAndHiddenMessages(account: Account): Set<Note> {
         val important = notes.values
             .filter { it.author?.let { it1 -> account.isHidden(it1) } == false }
-            .sortedBy { it.event?.createdAt }
+            .sortedBy { it.createdAt() }
             .reversed()
             .take(1000)
             .toSet()

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

@@ -2,7 +2,6 @@ package com.vitorpamplona.amethyst.model
 
 import com.vitorpamplona.amethyst.ui.note.toShortenHex
 import fr.acinq.secp256k1.Hex
-import java.util.regex.Pattern
 import nostr.postr.Bech32
 import nostr.postr.Persona
 import nostr.postr.bechToBytes
@@ -75,6 +74,7 @@ fun parseDirtyWordForKey(mightBeAKey: String): DirtyKeyInfo? {
       return DirtyKeyInfo("note", keyB32.bechToBytes().toHexKey(), restOfWord)
     }
 
+
   } catch (e: Exception) {
     e.printStackTrace()
   }

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

@@ -5,6 +5,7 @@ import androidx.lifecycle.LiveData
 import com.fasterxml.jackson.databind.DeserializationFeature
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import com.google.gson.reflect.TypeToken
+import com.vitorpamplona.amethyst.service.model.ATag
 import com.vitorpamplona.amethyst.service.model.ChannelCreateEvent
 import com.vitorpamplona.amethyst.service.model.ChannelHideMessageEvent
 import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
@@ -12,9 +13,17 @@ import com.vitorpamplona.amethyst.service.model.ChannelMetadataEvent
 import com.vitorpamplona.amethyst.service.model.ChannelMuteUserEvent
 import com.vitorpamplona.amethyst.service.model.LnZapEvent
 import com.vitorpamplona.amethyst.service.model.LnZapRequestEvent
+import com.vitorpamplona.amethyst.service.model.LongTextNoteEvent
 import com.vitorpamplona.amethyst.service.model.ReactionEvent
 import com.vitorpamplona.amethyst.service.model.ReportEvent
 import com.vitorpamplona.amethyst.service.model.RepostEvent
+import com.vitorpamplona.amethyst.service.model.ContactListEvent
+import com.vitorpamplona.amethyst.service.model.DeletionEvent
+import com.vitorpamplona.amethyst.service.model.Event
+import com.vitorpamplona.amethyst.service.model.MetadataEvent
+import com.vitorpamplona.amethyst.service.model.PrivateDmEvent
+import com.vitorpamplona.amethyst.service.model.RecommendRelayEvent
+import com.vitorpamplona.amethyst.service.model.TextNoteEvent
 import com.vitorpamplona.amethyst.service.relays.Relay
 import fr.acinq.secp256k1.Hex
 import java.io.ByteArrayInputStream
@@ -30,13 +39,6 @@ import kotlinx.coroutines.NonCancellable
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
-import nostr.postr.events.ContactListEvent
-import nostr.postr.events.DeletionEvent
-import nostr.postr.events.Event
-import nostr.postr.events.MetadataEvent
-import nostr.postr.events.PrivateDmEvent
-import nostr.postr.events.RecommendRelayEvent
-import nostr.postr.events.TextNoteEvent
 import nostr.postr.toHex
 import nostr.postr.toNpub
 
@@ -51,6 +53,7 @@ object LocalCache {
   val users = ConcurrentHashMap<HexKey, User>()
   val notes = ConcurrentHashMap<HexKey, Note>()
   val channels = ConcurrentHashMap<HexKey, Channel>()
+  val addressables = ConcurrentHashMap<String, AddressableNote>()
 
   fun checkGetOrCreateUser(key: String): User? {
     return try {
@@ -110,10 +113,33 @@ object LocalCache {
     }
   }
 
+  fun checkGetOrCreateAddressableNote(key: String): AddressableNote? {
+    return try {
+      val addr = ATag.parse(key)
+      if (addr != null)
+        getOrCreateAddressableNote(addr)
+      else
+        null
+    } catch (e: IllegalArgumentException) {
+      Log.e("LocalCache", "Invalid Key to create channel: $key", e)
+      null
+    }
+  }
+
+  @Synchronized
+  fun getOrCreateAddressableNote(key: ATag): AddressableNote {
+    return addressables[key.toNAddr()] ?: run {
+      val answer = AddressableNote(key)
+      answer.author = checkGetOrCreateUser(key.pubKeyHex)
+      addressables.put(key.toNAddr(), answer)
+      answer
+    }
+  }
+
 
   fun consume(event: MetadataEvent) {
     // new event
-    val oldUser = getOrCreateUser(event.pubKey.toHexKey())
+    val oldUser = getOrCreateUser(event.pubKey)
     if (oldUser.info == null || event.createdAt > oldUser.info!!.updatedMetadataAt) {
       val newUser = try {
         metadataParser.readValue(
@@ -147,8 +173,8 @@ object LocalCache {
       return
     }
 
-    val note = getOrCreateNote(event.id.toHex())
-    val author = getOrCreateUser(event.pubKey.toHexKey())
+    val note = getOrCreateNote(event.id)
+    val author = getOrCreateUser(event.pubKey)
 
     if (relay != null) {
       author.addRelayBeingUsed(relay, event.createdAt)
@@ -158,8 +184,9 @@ object LocalCache {
     // Already processed this event.
     if (note.event != null) return
 
-    val mentions = event.mentions.mapNotNull { checkGetOrCreateUser(it) }
-    val replyTo = replyToWithoutCitations(event).mapNotNull { checkGetOrCreateNote(it) }
+    val mentions = event.mentions().mapNotNull { checkGetOrCreateUser(it) }
+    val replyTo = replyToWithoutCitations(event).mapNotNull { checkGetOrCreateNote(it) } +
+                  event.taggedAddresses().mapNotNull { getOrCreateAddressableNote(it) }
 
     note.loadEvent(event, author, mentions, replyTo)
 
@@ -184,7 +211,46 @@ object LocalCache {
     refreshObservers()
   }
 
-  private fun replyToWithoutCitations(event: TextNoteEvent): List<String> {
+  fun consume(event: LongTextNoteEvent, relay: Relay?) {
+    if (antiSpam.isSpam(event)) {
+      relay?.let {
+        it.spamCounter++
+      }
+      return
+    }
+
+    val note = getOrCreateAddressableNote(event.address())
+    val author = getOrCreateUser(event.pubKey)
+
+    if (relay != null) {
+      author.addRelayBeingUsed(relay, event.createdAt)
+      note.addRelay(relay)
+    }
+
+    // Already processed this event.
+    if (note.event?.id == event.id) return
+
+    val mentions = event.mentions().mapNotNull { checkGetOrCreateUser(it) }
+    val replyTo = replyToWithoutCitations(event).mapNotNull { checkGetOrCreateNote(it) }
+
+    if (event.createdAt > (note.createdAt() ?: 0)) {
+      note.loadEvent(event, author, mentions, replyTo)
+
+      author.addNote(note)
+
+      // Adds notifications to users.
+      mentions.forEach {
+        it.addTaggedPost(note)
+      }
+      replyTo.forEach {
+        it.author?.addTaggedPost(note)
+      }
+
+      refreshObservers()
+    }
+  }
+
+  private fun findCitations(event: Event): Set<String> {
     var citations = mutableSetOf<String>()
     // Removes citations from replies:
     val matcher = tagSearch.matcher(event.content)
@@ -198,8 +264,19 @@ object LocalCache {
 
       }
     }
+    return citations
+  }
 
-    return event.replyTos.filter { it !in citations }
+  private fun replyToWithoutCitations(event: TextNoteEvent): List<String> {
+    val citations = findCitations(event)
+
+    return event.replyTos().filter { it !in citations }
+  }
+
+  private fun replyToWithoutCitations(event: LongTextNoteEvent): List<String> {
+    val citations = findCitations(event)
+
+    return event.replyTos().filter { it !in citations }
   }
 
   fun consume(event: RecommendRelayEvent) {
@@ -207,21 +284,21 @@ object LocalCache {
   }
 
   fun consume(event: ContactListEvent) {
-    val user = getOrCreateUser(event.pubKey.toHexKey())
+    val user = getOrCreateUser(event.pubKey)
+    val follows = event.follows()
 
-    if (event.createdAt > user.updatedFollowsAt && event.follows.isNotEmpty()) {
+    if (event.createdAt > user.updatedFollowsAt && !follows.isNullOrEmpty()) {
       // Saves relay list only if it's a user that is currently been seen
       user.latestContactList = event
 
       user.updateFollows(
-        event.follows.map {
+        follows.map {
           try {
             val pubKey = decodePublicKey(it.pubKeyHex)
             getOrCreateUser(pubKey.toHexKey())
           } catch (e: Exception) {
-            println("Could not parse Hex key: ${it.pubKeyHex}")
-            println("UpdateFollows: " + event.toJson())
-            e.printStackTrace()
+            Log.w("ContactList Parser", "Ignoring: Could not parse Hex key: ${it.pubKeyHex} in ${event.toJson()}")
+            //e.printStackTrace()
             null
           }
         }.filterNotNull().toSet(),
@@ -240,20 +317,17 @@ object LocalCache {
           user.updateRelays(relays)
         }
       } catch (e: Exception) {
-        println("relay import issue")
+        Log.w("Relay List Parser","Relay import issue ${e.message}", e)
         e.printStackTrace()
       }
 
-      Log.d(
-        "CL",
-        "AAA ${user.toBestDisplayName()} ${event.follows.size}"
-      )
+      Log.d("CL", "AAA ${user.toBestDisplayName()} ${follows.size}")
     }
   }
 
   fun consume(event: PrivateDmEvent, relay: Relay?) {
-    val note = getOrCreateNote(event.id.toHex())
-    val author = getOrCreateUser(event.pubKey.toHexKey())
+    val note = getOrCreateNote(event.id)
+    val author = getOrCreateUser(event.pubKey)
 
     if (relay != null) {
       author.addRelayBeingUsed(relay, event.createdAt)
@@ -263,7 +337,7 @@ object LocalCache {
     // Already processed this event.
     if (note.event != null) return
 
-    val recipient = event.recipientPubKey?.let { getOrCreateUser(it.toHexKey()) }
+    val recipient = event.recipientPubKey()?.let { getOrCreateUser(it) }
 
     //Log.d("PM", "${author.toBestDisplayName()} to ${recipient?.toBestDisplayName()}")
 
@@ -283,9 +357,9 @@ object LocalCache {
   fun consume(event: DeletionEvent) {
     var deletedAtLeastOne = false
 
-    event.deleteEvents.mapNotNull { notes[it] }.forEach { deleteNote ->
+    event.deleteEvents().mapNotNull { notes[it] }.forEach { deleteNote ->
       // must be the same author
-      if (deleteNote.author?.pubkeyHex == event.pubKey.toHexKey()) {
+      if (deleteNote.author?.pubkeyHex == event.pubKey) {
         deleteNote.author?.removeNote(deleteNote)
 
         // reverts the add
@@ -319,16 +393,17 @@ object LocalCache {
   }
 
   fun consume(event: RepostEvent) {
-    val note = getOrCreateNote(event.id.toHex())
+    val note = getOrCreateNote(event.id)
 
     // Already processed this event.
     if (note.event != null) return
 
     //Log.d("TN", "New Boost (${notes.size},${users.size}) ${note.author?.toBestDisplayName()} ${formattedDateTime(event.createdAt)}")
 
-    val author = getOrCreateUser(event.pubKey.toHexKey())
-    val mentions = event.originalAuthor.mapNotNull { checkGetOrCreateUser(it) }
-    val repliesTo = event.boostedPost.mapNotNull { checkGetOrCreateNote(it) }
+    val author = getOrCreateUser(event.pubKey)
+    val mentions = event.originalAuthor().mapNotNull { checkGetOrCreateUser(it) }
+    val repliesTo = event.boostedPost().mapNotNull { checkGetOrCreateNote(it) } +
+                    event.taggedAddresses().mapNotNull { getOrCreateAddressableNote(it) }
 
     note.loadEvent(event, author, mentions, repliesTo)
 
@@ -352,14 +427,15 @@ object LocalCache {
   }
 
   fun consume(event: ReactionEvent) {
-    val note = getOrCreateNote(event.id.toHexKey())
+    val note = getOrCreateNote(event.id)
 
     // Already processed this event.
     if (note.event != null) return
 
-    val author = getOrCreateUser(event.pubKey.toHexKey())
-    val mentions = event.originalAuthor.mapNotNull { checkGetOrCreateUser(it) }
-    val repliesTo = event.originalPost.mapNotNull { checkGetOrCreateNote(it) }
+    val author = getOrCreateUser(event.pubKey)
+    val mentions = event.originalAuthor().mapNotNull { checkGetOrCreateUser(it) }
+    val repliesTo = event.originalPost().mapNotNull { checkGetOrCreateNote(it) } +
+                    event.taggedAddresses().mapNotNull { getOrCreateAddressableNote(it) }
 
     note.loadEvent(event, author, mentions, repliesTo)
 
@@ -397,8 +473,8 @@ object LocalCache {
   }
 
   fun consume(event: ReportEvent, relay: Relay?) {
-    val note = getOrCreateNote(event.id.toHex())
-    val author = getOrCreateUser(event.pubKey.toHexKey())
+    val note = getOrCreateNote(event.id)
+    val author = getOrCreateUser(event.pubKey)
 
     if (relay != null) {
       author.addRelayBeingUsed(relay, event.createdAt)
@@ -408,8 +484,9 @@ object LocalCache {
     // Already processed this event.
     if (note.event != null) return
 
-    val mentions = event.reportedAuthor.mapNotNull { checkGetOrCreateUser(it) }
-    val repliesTo = event.reportedPost.mapNotNull { checkGetOrCreateNote(it) }
+    val mentions = event.reportedAuthor().mapNotNull { checkGetOrCreateUser(it.key) }
+    val repliesTo = event.reportedPost().mapNotNull { checkGetOrCreateNote(it.key) } +
+                    event.taggedAddresses().mapNotNull { getOrCreateAddressableNote(it) }
 
     note.loadEvent(event, author, mentions, repliesTo)
 
@@ -428,15 +505,14 @@ object LocalCache {
   fun consume(event: ChannelCreateEvent) {
     //Log.d("MT", "New Event ${event.content} ${event.id.toHex()}")
     // new event
-    val oldChannel = getOrCreateChannel(event.id.toHex())
-    val author = getOrCreateUser(event.pubKey.toHexKey())
+    val oldChannel = getOrCreateChannel(event.id)
+    val author = getOrCreateUser(event.pubKey)
     if (event.createdAt > oldChannel.updatedMetadataAt) {
       if (oldChannel.creator == null || oldChannel.creator == author) {
-        oldChannel.updateChannelInfo(author, event.channelInfo, event.createdAt)
+        oldChannel.updateChannelInfo(author, event.channelInfo(), event.createdAt)
 
-        val note = getOrCreateNote(event.id.toHex())
+        val note = getOrCreateNote(event.id)
         oldChannel.addNote(note)
-        note.channel = oldChannel
         note.loadEvent(event, author, emptyList(), emptyList())
 
         refreshObservers()
@@ -446,19 +522,19 @@ object LocalCache {
     }
   }
   fun consume(event: ChannelMetadataEvent) {
+    val channelId = event.channel()
     //Log.d("MT", "New User ${users.size} ${event.contactMetaData.name}")
-    if (event.channel.isNullOrBlank()) return
+    if (channelId.isNullOrBlank()) return
 
     // new event
-    val oldChannel = checkGetOrCreateChannel(event.channel) ?: return
-    val author = getOrCreateUser(event.pubKey.toHexKey())
+    val oldChannel = checkGetOrCreateChannel(channelId) ?: return
+    val author = getOrCreateUser(event.pubKey)
     if (event.createdAt > oldChannel.updatedMetadataAt) {
       if (oldChannel.creator == null || oldChannel.creator == author) {
-        oldChannel.updateChannelInfo(author, event.channelInfo, event.createdAt)
+        oldChannel.updateChannelInfo(author, event.channelInfo(), event.createdAt)
 
-        val note = getOrCreateNote(event.id.toHex())
+        val note = getOrCreateNote(event.id)
         oldChannel.addNote(note)
-        note.channel = oldChannel
         note.loadEvent(event, author, emptyList(), emptyList())
 
         refreshObservers()
@@ -469,7 +545,9 @@ object LocalCache {
   }
 
   fun consume(event: ChannelMessageEvent, relay: Relay?) {
-    if (event.channel.isNullOrBlank()) return
+    val channelId = event.channel()
+
+    if (channelId.isNullOrBlank()) return
     if (antiSpam.isSpam(event)) {
       relay?.let {
         it.spamCounter++
@@ -477,12 +555,12 @@ object LocalCache {
       return
     }
 
-    val channel = checkGetOrCreateChannel(event.channel) ?: return
+    val channel = checkGetOrCreateChannel(channelId) ?: return
 
-    val note = getOrCreateNote(event.id.toHex())
+    val note = getOrCreateNote(event.id)
     channel.addNote(note)
 
-    val author = getOrCreateUser(event.pubKey.toHexKey())
+    val author = getOrCreateUser(event.pubKey)
 
     if (relay != null) {
       author.addRelayBeingUsed(relay, event.createdAt)
@@ -492,12 +570,11 @@ object LocalCache {
     // Already processed this event.
     if (note.event != null) return
 
-    val mentions = event.mentions.mapNotNull { checkGetOrCreateUser(it) }
-    val replyTo = event.replyTos
+    val mentions = event.mentions().mapNotNull { checkGetOrCreateUser(it) }
+    val replyTo = event.replyTos()
       .mapNotNull { checkGetOrCreateNote(it) }
       .filter { it.event !is ChannelCreateEvent }
 
-    note.channel = channel
     note.loadEvent(event, author, mentions, replyTo)
 
     //Log.d("CM", "New Note (${notes.size},${users.size}) ${note.author?.toBestDisplayName()} ${note.event?.content} ${formattedDateTime(event.createdAt)}")
@@ -527,18 +604,21 @@ object LocalCache {
   }
 
   fun consume(event: LnZapEvent) {
-    val note = getOrCreateNote(event.id.toHexKey())
+    val note = getOrCreateNote(event.id)
 
     // Already processed this event.
     if (note.event != null) return
 
-    val author = getOrCreateUser(event.pubKey.toHexKey())
-    val mentions = event.zappedAuthor.mapNotNull { checkGetOrCreateUser(it) }
-    val repliesTo = event.zappedPost.mapNotNull { checkGetOrCreateNote(it) }
+    val zapRequest = event.containedPost()?.id?.let { getOrCreateNote(it) }
+
+    val author = getOrCreateUser(event.pubKey)
+    val mentions = event.zappedAuthor().mapNotNull { checkGetOrCreateUser(it) }
+    val repliesTo = event.zappedPost().mapNotNull { checkGetOrCreateNote(it) } +
+                    event.taggedAddresses().map { getOrCreateAddressableNote(it) } +
+                    ((zapRequest?.event as? LnZapRequestEvent)?.taggedAddresses()?.map { getOrCreateAddressableNote(it) } ?: emptySet<Note>())
 
     note.loadEvent(event, author, mentions, repliesTo)
 
-    val zapRequest = event.containedPost?.id?.toHexKey()?.let { getOrCreateNote(it) }
     if (zapRequest == null) {
       Log.e("ZP","Zap Request not found. Unable to process Zap {${event.toJson()}}")
       return
@@ -563,14 +643,15 @@ object LocalCache {
   }
 
   fun consume(event: LnZapRequestEvent) {
-    val note = getOrCreateNote(event.id.toHexKey())
+    val note = getOrCreateNote(event.id)
 
     // Already processed this event.
     if (note.event != null) return
 
-    val author = getOrCreateUser(event.pubKey.toHexKey())
-    val mentions = event.zappedAuthor.mapNotNull { checkGetOrCreateUser(it) }
-    val repliesTo = event.zappedPost.mapNotNull { checkGetOrCreateNote(it) }
+    val author = getOrCreateUser(event.pubKey)
+    val mentions = event.zappedAuthor().mapNotNull { checkGetOrCreateUser(it) }
+    val repliesTo = event.zappedPost().mapNotNull { checkGetOrCreateNote(it) } +
+                    event.taggedAddresses().map { getOrCreateAddressableNote(it) }
 
     note.loadEvent(event, author, mentions, repliesTo)
 
@@ -602,10 +683,15 @@ object LocalCache {
 
   fun findNotesStartingWith(text: String): List<Note> {
     return notes.values.filter {
-      (it.event is TextNoteEvent && it.event?.content?.contains(text, true) ?: false)
+           (it.event is TextNoteEvent && it.event?.content?.contains(text, true) ?: false)
         || (it.event is ChannelMessageEvent && it.event?.content?.contains(text, true) ?: 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 as? LongTextNoteEvent)?.title()?.contains(text, true) ?: false
+        || (it.event as? LongTextNoteEvent)?.summary()?.contains(text, true) ?: false
+        || it.idHex.startsWith(text, true)
     }
   }
 
@@ -689,7 +775,7 @@ object LocalCache {
 
   fun pruneHiddenMessages(account: Account) {
     val toBeRemoved = account.hiddenUsers.map {
-      users[it]?.notes ?: emptySet()
+        (users[it]?.notes ?: emptySet())
     }.flatten()
 
     account.hiddenUsers.forEach {
@@ -735,16 +821,14 @@ class LocalCacheLiveData(val cache: LocalCache): LiveData<LocalCacheState>(Local
   // Refreshes observers in batches.
   var handlerWaiting = AtomicBoolean()
 
-  @Synchronized
   fun invalidateData() {
     if (!hasActiveObservers()) return
     if (handlerWaiting.getAndSet(true)) return
 
-    handlerWaiting.set(true)
     val scope = CoroutineScope(Job() + Dispatchers.Main)
     scope.launch {
       try {
-        delay(100)
+        delay(50)
         refresh()
       } finally {
         withContext(NonCancellable) {

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

@@ -2,29 +2,44 @@ package com.vitorpamplona.amethyst.model
 
 import androidx.lifecycle.LiveData
 import com.vitorpamplona.amethyst.service.NostrSingleEventDataSource
+import com.vitorpamplona.amethyst.service.model.ATag
+import com.vitorpamplona.amethyst.service.model.ChannelCreateEvent
+import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
+import com.vitorpamplona.amethyst.service.model.ChannelMetadataEvent
 import com.vitorpamplona.amethyst.service.model.LnZapEvent
+import com.vitorpamplona.amethyst.service.model.LongTextNoteEvent
 import com.vitorpamplona.amethyst.service.model.ReactionEvent
 import com.vitorpamplona.amethyst.service.model.RepostEvent
+import com.vitorpamplona.amethyst.service.relays.Relay
 import com.vitorpamplona.amethyst.ui.note.toShortenHex
 import fr.acinq.secp256k1.Hex
+import java.math.BigDecimal
 import java.time.Instant
 import java.time.ZoneId
 import java.time.format.DateTimeFormatter
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.launch
-import com.vitorpamplona.amethyst.service.relays.Relay
-import java.math.BigDecimal
 import java.util.Date
 import java.util.concurrent.atomic.AtomicBoolean
 import java.util.regex.Pattern
-import nostr.postr.events.Event
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.NonCancellable
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import com.vitorpamplona.amethyst.service.model.Event
 
 val tagSearch = Pattern.compile("(?:\\s|\\A)\\#\\[([0-9]+)\\]")
 
-class Note(val idHex: String) {
+
+class AddressableNote(val address: ATag): Note(address.toNAddr()) {
+    override fun idNote() = address.toNAddr()
+    override fun idDisplayNote() = idNote().toShortenHex()
+    override fun address() = address
+    override fun createdAt() = (event as? LongTextNoteEvent)?.publishedAt() ?: event?.createdAt
+}
+
+open class Note(val idHex: String) {
     // These fields are only available after the Text Note event is received.
     // They are immutable after that.
     var event: Event? = null
@@ -47,13 +62,24 @@ class Note(val idHex: String) {
     var relays = setOf<String>()
         private set
 
-    var channel: Channel? = null
-
     var lastReactionsDownloadTime: Long? = null
 
     fun id() = Hex.decode(idHex)
-    fun idNote() = id().toNote()
-    fun idDisplayNote() = idNote().toShortenHex()
+    open fun idNote() = id().toNote()
+    open fun idDisplayNote() = idNote().toShortenHex()
+
+    fun channel(): Channel? {
+        val channelHex =
+            (event as? ChannelMessageEvent)?.channel() ?:
+            (event as? ChannelMetadataEvent)?.channel() ?:
+            (event as? ChannelCreateEvent)?.let { it.id }
+
+        return channelHex?.let { LocalCache.checkGetOrCreateChannel(it) }
+    }
+
+    open fun address() = (event as? LongTextNoteEvent)?.address()
+
+    open fun createdAt() = event?.createdAt
 
     fun loadEvent(event: Event, author: User, mentions: List<User>, replyTo: List<Note>) {
         this.event = event
@@ -75,14 +101,14 @@ class Note(val idHex: String) {
     fun replyLevelSignature(cachedSignatures: MutableMap<Note, String> = mutableMapOf()): String {
         val replyTo = replyTo
         if (replyTo == null || replyTo.isEmpty()) {
-            return "/" + formattedDateTime(event?.createdAt ?: 0) + ";"
+            return "/" + formattedDateTime(createdAt() ?: 0) + ";"
         }
 
         return replyTo
             .map {
                 cachedSignatures[it] ?: it.replyLevelSignature(cachedSignatures).apply { cachedSignatures.put(it, this) }
             }
-            .maxBy { it.length }.removeSuffix(";") + "/" + formattedDateTime(event?.createdAt ?: 0) + ";"
+            .maxBy { it.length }.removeSuffix(";") + "/" + formattedDateTime(createdAt() ?: 0) + ";"
     }
 
     fun replyLevel(cachedLevels: MutableMap<Note, Int> = mutableMapOf()): Int {
@@ -221,10 +247,26 @@ class Note(val idHex: String) {
         val dayAgo = Date().time / 1000 - 24*60*60
         return reports.isNotEmpty() ||
           (author?.reports?.values?.filter {
-              it.firstOrNull { ( it.event?.createdAt ?: 0 ) > dayAgo } != null
+              it.firstOrNull { ( it.createdAt() ?: 0 ) > dayAgo } != null
           }?.isNotEmpty() ?: false)
     }
 
+    fun directlyCiteUsersHex(): Set<HexKey> {
+        val matcher = tagSearch.matcher(event?.content ?: "")
+        val returningList = mutableSetOf<String>()
+        while (matcher.find()) {
+            try {
+                val tag = matcher.group(1)?.let { event?.tags?.get(it.toInt()) }
+                if (tag != null && tag[0] == "p") {
+                    returningList.add(tag[1])
+                }
+            } catch (e: Exception) {
+
+            }
+        }
+        return returningList
+    }
+
     fun directlyCiteUsers(): Set<User> {
         val matcher = tagSearch.matcher(event?.content ?: "")
         val returningList = mutableSetOf<User>()
@@ -268,7 +310,7 @@ class Note(val idHex: String) {
 
     fun hasBoostedInTheLast5Minutes(loggedIn: User): Boolean {
         val currentTime = Date().time / 1000
-        return boosts.firstOrNull { it.author == loggedIn && (it.event?.createdAt ?: 0) > currentTime - (60 * 5)} != null // 5 minute protection
+        return boosts.firstOrNull { it.author == loggedIn && (it.createdAt() ?: 0) > currentTime - (60 * 5)} != null // 5 minute protection
     }
 
     fun boostedBy(loggedIn: User): List<Note> {
@@ -318,17 +360,20 @@ class NoteLiveData(val note: Note): LiveData<NoteState>(NoteState(note)) {
     // Refreshes observers in batches.
     var handlerWaiting = AtomicBoolean()
 
-    @Synchronized
     fun invalidateData() {
         if (!hasActiveObservers()) return
         if (handlerWaiting.getAndSet(true)) return
 
-        handlerWaiting.set(true)
         val scope = CoroutineScope(Job() + Dispatchers.Main)
         scope.launch {
-            delay(100)
-            refresh()
-            handlerWaiting.set(false)
+            try {
+                delay(100)
+                refresh()
+            } finally {
+                withContext(NonCancellable) {
+                    handlerWaiting.set(false)
+                }
+            }
         }
     }
 
@@ -338,12 +383,21 @@ class NoteLiveData(val note: Note): LiveData<NoteState>(NoteState(note)) {
 
     override fun onActive() {
         super.onActive()
-        NostrSingleEventDataSource.add(note.idHex)
+        if (note is AddressableNote) {
+            NostrSingleEventDataSource.addAddress(note)
+        } else {
+            NostrSingleEventDataSource.add(note)
+        }
+
     }
 
     override fun onInactive() {
         super.onInactive()
-        NostrSingleEventDataSource.remove(note.idHex)
+        if (note is AddressableNote) {
+            NostrSingleEventDataSource.removeAddress(note)
+        } else {
+            NostrSingleEventDataSource.remove(note)
+        }
     }
 }
 

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

@@ -1,5 +1,6 @@
 package com.vitorpamplona.amethyst.model
 
+import com.vitorpamplona.amethyst.service.model.ATag
 import kotlin.time.ExperimentalTime
 import kotlin.time.measureTimedValue
 
@@ -34,7 +35,16 @@ class ThreadAssembler {
   @OptIn(ExperimentalTime::class)
   fun findThreadFor(noteId: String): Set<Note> {
     val (result, elapsed) = measureTimedValue {
-      val note = LocalCache.getOrCreateNote(noteId)
+      val note = if (noteId.startsWith("naddr")) {
+        val aTag = ATag.parse(noteId)
+        if (aTag != null)
+          LocalCache.getOrCreateAddressableNote(aTag)
+        else
+          return emptySet()
+      } else {
+        LocalCache.getOrCreateNote(noteId)
+      }
+
 
       if (note.event != null) {
         val thread = mutableSetOf<Note>()

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

@@ -7,7 +7,6 @@ import com.vitorpamplona.amethyst.ui.components.imageExtension
 import com.vitorpamplona.amethyst.ui.components.isValidURL
 import com.vitorpamplona.amethyst.ui.components.noProtocolUrlValidator
 import com.vitorpamplona.amethyst.ui.components.videoExtension
-import java.util.concurrent.ConcurrentHashMap
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job

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

@@ -18,8 +18,8 @@ import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import nostr.postr.Bech32
-import nostr.postr.events.ContactListEvent
-import nostr.postr.events.MetadataEvent
+import com.vitorpamplona.amethyst.service.model.ContactListEvent
+import com.vitorpamplona.amethyst.service.model.MetadataEvent
 import nostr.postr.toNpub
 
 val lnurlpPattern = Pattern.compile("(?i:http|https):\\/\\/((.+)\\/)*\\.well-known\\/lnurlp\\/(.*)")
@@ -37,6 +37,7 @@ class User(val pubkeyHex: String) {
 
     var notes = setOf<Note>()
         private set
+
     var taggedPosts = setOf<Note>()
         private set
 
@@ -72,6 +73,10 @@ class User(val pubkeyHex: String) {
         return info?.displayName?.ifBlank { null } ?: info?.display_name?.ifBlank { null }
     }
 
+    fun nip05(): String? {
+        return info?.nip05?.ifBlank { null }
+    }
+
     fun profilePicture(): String? {
         if (info?.picture.isNullOrBlank()) info?.picture = null
         return info?.picture
@@ -153,7 +158,7 @@ class User(val pubkeyHex: String) {
             liveSet?.reports?.invalidateData()
         }
 
-        val reportTime = note.event?.createdAt ?: 0
+        val reportTime = note.createdAt() ?: 0
         if (reportTime > latestReportTime) {
             latestReportTime = reportTime
         }
@@ -285,7 +290,7 @@ class User(val pubkeyHex: String) {
 
     fun hasReport(loggedIn: User, type: ReportEvent.ReportType): Boolean {
         return reports[loggedIn]?.firstOrNull() {
-              it.event is ReportEvent && (it.event as ReportEvent).reportType.contains(type)
+              it.event is ReportEvent && (it.event as ReportEvent).reportedAuthor().any { it.reportType == type }
         } != null
     }
 
@@ -338,6 +343,7 @@ data class RelayInfo (
 
 data class Chatroom(var roomMessages: Set<Note>)
 
+
 class UserMetadata {
     var name: String? = null
     var username: String? = null
@@ -347,7 +353,11 @@ class UserMetadata {
     var banner: String? = null
     var website: String? = null
     var about: String? = null
+
     var nip05: String? = null
+    var nip05Verified: Boolean = false
+    var nip05LastVerificationTime: Long? = 0
+
     var domain: String? = null
     var lud06: String? = null
     var lud16: String? = null
@@ -362,7 +372,7 @@ class UserMetadata {
 
     fun anyNameStartsWith(prefix: String): Boolean {
         return listOfNotNull(name, username, display_name, displayName, nip05, lud06, lud16)
-              .filter { it.startsWith(prefix, true) }.isNotEmpty()
+              .any { it.startsWith(prefix, true) }
     }
 }
 
@@ -371,11 +381,9 @@ class UserLiveData(val user: User): LiveData<UserState>(UserState(user)) {
     // Refreshes observers in batches.
     var handlerWaiting = AtomicBoolean()
 
-    @Synchronized
     fun invalidateData() {
         if (handlerWaiting.getAndSet(true)) return
 
-        handlerWaiting.set(true)
         val scope = CoroutineScope(Job() + Dispatchers.Main)
         scope.launch {
             try {

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

@@ -0,0 +1,93 @@
+package com.vitorpamplona.amethyst.service
+
+import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import okhttp3.Call
+import okhttp3.Callback
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import okhttp3.Response
+
+class Nip05Verifier {
+  val client = OkHttpClient.Builder().build()
+
+  fun assembleUrl(nip05address: String): String? {
+    val parts = nip05address.trim().split("@")
+
+    if (parts.size == 2) {
+      return "https://${parts[1]}/.well-known/nostr.json?name=${parts[0]}"
+    }
+
+    return null
+  }
+
+  fun fetchNip05Json(lnaddress: String, onSuccess: (String) -> Unit, onError: (String) -> Unit) {
+    val scope = CoroutineScope(Job() + Dispatchers.IO)
+    scope.launch {
+      fetchNip05JsonSuspend(lnaddress, onSuccess, onError)
+    }
+  }
+
+  private suspend fun fetchNip05JsonSuspend(nip05: String, onSuccess: (String) -> Unit, onError: (String) -> Unit) {
+    val url = assembleUrl(nip05)
+
+    if (url == null) {
+      onError("Could not assemble url from Nip05: \"${nip05}\". Check the user's setup")
+      return
+    }
+
+    withContext(Dispatchers.IO) {
+      try {
+        val request: Request = Request.Builder().url(url).build()
+
+        client.newCall(request).enqueue(object : Callback {
+          override fun onResponse(call: Call, response: Response) {
+            response.use {
+              if (it.isSuccessful)
+                onSuccess(it.body.string())
+              else
+                onError("Could not resolve ${nip05}. Error: ${it.code}. Check if the server up and if the address ${nip05} is correct")
+            }
+          }
+
+          override fun onFailure(call: Call, e: java.io.IOException) {
+            onError("Could not resolve ${url}. Check if the server up and if the address ${nip05} is correct")
+            e.printStackTrace()
+          }
+        })
+      } catch (e: java.lang.Exception) {
+        onError("Could not resolve '${url}': ${e.message}")
+      }
+    }
+  }
+
+  fun verifyNip05(nip05: String, onSuccess: (String) -> Unit, onError: (String) -> Unit) {
+    val mapper = jacksonObjectMapper()
+
+    fetchNip05Json(nip05,
+      onSuccess = {
+        val nip05url = try {
+          mapper.readTree(it)
+        } catch (t: Throwable) {
+          onError("Error Parsing JSON from Lightning Address. Check the user's lightning setup")
+          null
+        }
+
+        val user = nip05.split("@")[0]
+
+        val hexKey = nip05url?.get("names")?.get(user)?.asText()
+
+        if (hexKey == null) {
+          onError("Username not found in the NIP05 JSON")
+        } else {
+          onSuccess(hexKey)
+        }
+      },
+      onError = onError
+    )
+  }
+}

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

@@ -2,62 +2,127 @@ package com.vitorpamplona.amethyst.service
 
 import com.vitorpamplona.amethyst.model.toHexKey
 import nostr.postr.bechToBytes
+import java.nio.ByteBuffer
+import java.nio.ByteOrder
 
 class Nip19 {
 
   enum class Type {
-    USER, NOTE
+    USER, NOTE, RELAY, ADDRESS
   }
+
   data class Return(val type: Type, val hex: String)
 
   fun uriToRoute(uri: String?): Return? {
     try {
-      val key = uri?.removePrefix("nostr:")
+      val key = uri?.removePrefix("nostr:") ?: return null
 
-      if (key != null) {
-        val bytes = key.bechToBytes()
-        if (key.startsWith("npub")) {
-          return Return(Type.USER, bytes.toHexKey())
-        }
-        if (key.startsWith("note")) {
-          return Return(Type.NOTE, bytes.toHexKey())
-        }
-        if (key.startsWith("nprofile")) {
-          val tlv = parseTLV(bytes)
-          val hex = tlv.get(0)?.get(0)?.toHexKey()
-          if (hex != null)
-            return Return(Type.USER, hex)
-        }
-        if (key.startsWith("nevent")) {
-          val tlv = parseTLV(bytes)
-          val hex = tlv.get(0)?.get(0)?.toHexKey()
-          if (hex != null)
-            return Return(Type.USER, hex)
-        }
+      val bytes = key.bechToBytes()
+      if (key.startsWith("npub")) {
+        return npub(bytes)
+      } else if (key.startsWith("note")) {
+        return note(bytes)
+      } else if (key.startsWith("nprofile")) {
+        return nprofile(bytes)
+      } else if (key.startsWith("nevent")) {
+        return nevent(bytes)
+      } else if (key.startsWith("nrelay")) {
+        return nrelay(bytes)
+      } else if (key.startsWith("naddr")) {
+        return naddr(bytes)
       }
     } catch (e: Throwable) {
-      println("Trying to Decode NIP19: ${uri}")
-      e.printStackTrace()
+      println("Issue trying to Decode NIP19 ${uri}: ${e.message}")
     }
 
     return null
   }
 
-  fun parseTLV(data: ByteArray): Map<Byte, List<ByteArray>> {
-    var result = mutableMapOf<Byte, MutableList<ByteArray>>()
-    var rest = data
-    while (rest.isNotEmpty()) {
-      val t = rest[0]
-      val l = rest[1]
-      val v = rest.sliceArray(IntRange(2, (2 + l) - 1))
-      rest = rest.sliceArray(IntRange(2 + l, rest.size-1))
-      if (v.size < l) continue
-
-      if (!result.containsKey(t)) {
-        result.put(t, mutableListOf())
-      }
-      result.get(t)?.add(v)
-    }
-    return result
+  private fun npub(bytes: ByteArray): Return {
+    return Return(Type.USER, bytes.toHexKey())
   }
-}
+
+  private fun note(bytes: ByteArray): Return {
+    return Return(Type.NOTE, bytes.toHexKey());
+  }
+
+  private fun nprofile(bytes: ByteArray): Return? {
+    val hex = parseTLV(bytes)
+      .get(NIP19TLVTypes.SPECIAL.id)
+      ?.get(0)
+      ?.toHexKey() ?: return null
+
+    return Return(Type.USER, hex)
+  }
+
+  private fun nevent(bytes: ByteArray): Return? {
+    val hex = parseTLV(bytes)
+      .get(NIP19TLVTypes.SPECIAL.id)
+      ?.get(0)
+      ?.toHexKey() ?: return null
+
+    return Return(Type.USER, hex)
+  }
+
+  private fun nrelay(bytes: ByteArray): Return? {
+    val relayUrl = parseTLV(bytes)
+      .get(NIP19TLVTypes.SPECIAL.id)
+      ?.get(0)
+      ?.toString(Charsets.UTF_8) ?: return null
+
+    return Return(Type.RELAY, relayUrl)
+  }
+
+  private fun naddr(bytes: ByteArray): Return? {
+    val tlv = parseTLV(bytes)
+
+    val d = tlv.get(NIP19TLVTypes.SPECIAL.id)
+      ?.get(0)
+      ?.toString(Charsets.UTF_8) ?: return null
+
+    val relay = tlv.get(NIP19TLVTypes.RELAY.id)
+      ?.get(0)
+      ?.toString(Charsets.UTF_8)
+
+    val author = tlv.get(NIP19TLVTypes.AUTHOR.id)
+      ?.get(0)
+      ?.toHexKey()
+
+    val kind = tlv.get(NIP19TLVTypes.KIND.id)
+      ?.get(0)
+      ?.let { toInt32(it) }
+
+    return Return(Type.ADDRESS, "$kind:$author:$d")
+  }
+}
+
+// Classes should start with an uppercase letter in kotlin
+enum class NIP19TLVTypes(val id: Byte) {
+  SPECIAL(0),
+  RELAY(1),
+  AUTHOR(2),
+  KIND(3);
+}
+
+fun toInt32(bytes: ByteArray): Int {
+  require(bytes.size == 4) { "length must be 4, got: ${bytes.size}" }
+  return ByteBuffer.wrap(bytes, 0, 4).order(ByteOrder.BIG_ENDIAN).int
+}
+
+fun parseTLV(data: ByteArray): Map<Byte, List<ByteArray>> {
+  val result = mutableMapOf<Byte, MutableList<ByteArray>>()
+  var rest = data
+  while (rest.isNotEmpty()) {
+    val t = rest[0]
+    val l = rest[1]
+    val v = rest.sliceArray(IntRange(2, (2 + l) - 1))
+    rest = rest.sliceArray(IntRange(2 + l, rest.size - 1))
+    if (v.size < l) continue
+
+    if (!result.containsKey(t)) {
+      result[t] = mutableListOf()
+    }
+    result[t]?.add(v)
+  }
+  return result
+}

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

@@ -1,8 +1,6 @@
 package com.vitorpamplona.amethyst.service
 
 import com.vitorpamplona.amethyst.model.Account
-import com.vitorpamplona.amethyst.model.LocalCache
-import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
 import com.vitorpamplona.amethyst.service.model.LnZapEvent
 import com.vitorpamplona.amethyst.service.model.ReactionEvent
@@ -11,9 +9,9 @@ import com.vitorpamplona.amethyst.service.model.RepostEvent
 import com.vitorpamplona.amethyst.service.relays.FeedType
 import com.vitorpamplona.amethyst.service.relays.TypedFilter
 import nostr.postr.JsonFilter
-import nostr.postr.events.ContactListEvent
-import nostr.postr.events.MetadataEvent
-import nostr.postr.events.TextNoteEvent
+import com.vitorpamplona.amethyst.service.model.ContactListEvent
+import com.vitorpamplona.amethyst.service.model.MetadataEvent
+import com.vitorpamplona.amethyst.service.model.TextNoteEvent
 
 object NostrAccountDataSource: NostrDataSource("AccountData") {
   lateinit var account: Account

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

@@ -2,7 +2,6 @@ package com.vitorpamplona.amethyst.service
 
 import com.vitorpamplona.amethyst.model.Channel
 import com.vitorpamplona.amethyst.model.LocalCache
-import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
 import com.vitorpamplona.amethyst.service.relays.FeedType
 import com.vitorpamplona.amethyst.service.relays.TypedFilter

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

@@ -2,12 +2,11 @@ package com.vitorpamplona.amethyst.service
 
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.LocalCache
-import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.model.User
 import com.vitorpamplona.amethyst.service.relays.FeedType
 import com.vitorpamplona.amethyst.service.relays.TypedFilter
 import nostr.postr.JsonFilter
-import nostr.postr.events.PrivateDmEvent
+import com.vitorpamplona.amethyst.service.model.PrivateDmEvent
 
 object NostrChatroomDataSource: NostrDataSource("ChatroomFeed") {
   lateinit var account: Account

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

@@ -1,14 +1,13 @@
 package com.vitorpamplona.amethyst.service
 
 import com.vitorpamplona.amethyst.model.Account
-import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.service.model.ChannelCreateEvent
 import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
 import com.vitorpamplona.amethyst.service.model.ChannelMetadataEvent
 import com.vitorpamplona.amethyst.service.relays.FeedType
 import com.vitorpamplona.amethyst.service.relays.TypedFilter
 import nostr.postr.JsonFilter
-import nostr.postr.events.PrivateDmEvent
+import com.vitorpamplona.amethyst.service.model.PrivateDmEvent
 
 object NostrChatroomListDataSource: NostrDataSource("MailBoxFeed") {
   lateinit var account: Account

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

@@ -1,9 +1,7 @@
 package com.vitorpamplona.amethyst.service
 
+import android.util.Log
 import com.vitorpamplona.amethyst.model.LocalCache
-import com.vitorpamplona.amethyst.model.Note
-import com.vitorpamplona.amethyst.model.UrlCachedPreviewer
-import com.vitorpamplona.amethyst.model.toHexKey
 import com.vitorpamplona.amethyst.service.model.ChannelCreateEvent
 import com.vitorpamplona.amethyst.service.model.ChannelHideMessageEvent
 import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
@@ -11,27 +9,30 @@ import com.vitorpamplona.amethyst.service.model.ChannelMetadataEvent
 import com.vitorpamplona.amethyst.service.model.ChannelMuteUserEvent
 import com.vitorpamplona.amethyst.service.model.LnZapEvent
 import com.vitorpamplona.amethyst.service.model.LnZapRequestEvent
+import com.vitorpamplona.amethyst.service.model.LongTextNoteEvent
 import com.vitorpamplona.amethyst.service.model.ReactionEvent
 import com.vitorpamplona.amethyst.service.model.ReportEvent
 import com.vitorpamplona.amethyst.service.model.RepostEvent
 import com.vitorpamplona.amethyst.service.relays.Client
 import com.vitorpamplona.amethyst.service.relays.Relay
 import com.vitorpamplona.amethyst.service.relays.Subscription
-import com.vitorpamplona.amethyst.service.relays.hasValidSignature
 import java.util.Date
 import java.util.UUID
+import java.util.concurrent.atomic.AtomicBoolean
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
+import kotlinx.coroutines.NonCancellable
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
-import nostr.postr.events.ContactListEvent
-import nostr.postr.events.DeletionEvent
-import nostr.postr.events.Event
-import nostr.postr.events.MetadataEvent
-import nostr.postr.events.PrivateDmEvent
-import nostr.postr.events.RecommendRelayEvent
-import nostr.postr.events.TextNoteEvent
+import kotlinx.coroutines.withContext
+import com.vitorpamplona.amethyst.service.model.ContactListEvent
+import com.vitorpamplona.amethyst.service.model.DeletionEvent
+import com.vitorpamplona.amethyst.service.model.Event
+import com.vitorpamplona.amethyst.service.model.MetadataEvent
+import com.vitorpamplona.amethyst.service.model.PrivateDmEvent
+import com.vitorpamplona.amethyst.service.model.RecommendRelayEvent
+import com.vitorpamplona.amethyst.service.model.TextNoteEvent
 
 abstract class NostrDataSource(val debugName: String) {
   private var subscriptions = mapOf<String, Subscription>()
@@ -45,6 +46,7 @@ abstract class NostrDataSource(val debugName: String) {
     }
   }
 
+
   private val clientListener = object : Client.Listener() {
     override fun onEvent(event: Event, subscriptionId: String, relay: Relay) {
       if (subscriptionId in subscriptions.keys) {
@@ -60,41 +62,37 @@ abstract class NostrDataSource(val debugName: String) {
 
         try {
           when (event) {
-            is MetadataEvent -> LocalCache.consume(event)
-            is TextNoteEvent -> LocalCache.consume(event, relay)
-            is RecommendRelayEvent -> LocalCache.consume(event)
+            is ChannelCreateEvent -> LocalCache.consume(event)
+            is ChannelHideMessageEvent -> LocalCache.consume(event)
+            is ChannelMessageEvent -> LocalCache.consume(event, relay)
+            is ChannelMetadataEvent -> LocalCache.consume(event)
+            is ChannelMuteUserEvent -> LocalCache.consume(event)
             is ContactListEvent -> LocalCache.consume(event)
-            is PrivateDmEvent -> LocalCache.consume(event, relay)
             is DeletionEvent -> LocalCache.consume(event)
-            else -> when (event.kind) {
-              RepostEvent.kind -> {
-                val repostEvent = RepostEvent(event.id, event.pubKey, event.createdAt, event.tags, event.content, event.sig)
 
-                repostEvent.containedPost?.let { onEvent(it, subscriptionId, relay) }
-                LocalCache.consume(repostEvent)
-              }
-              ReactionEvent.kind -> LocalCache.consume(ReactionEvent(event.id, event.pubKey, event.createdAt, event.tags, event.content, event.sig))
-              ReportEvent.kind -> LocalCache.consume(ReportEvent(event.id, event.pubKey, event.createdAt, event.tags, event.content, event.sig), relay)
-
-              LnZapEvent.kind -> {
-                val zapEvent = LnZapEvent(event.id, event.pubKey, event.createdAt, event.tags, event.content, event.sig)
-
-                zapEvent.containedPost?.let { onEvent(it, subscriptionId, relay) }
-                LocalCache.consume(zapEvent)
-              }
-              LnZapRequestEvent.kind -> LocalCache.consume(LnZapRequestEvent(event.id, event.pubKey, event.createdAt, event.tags, event.content, event.sig))
-
-              ChannelCreateEvent.kind -> LocalCache.consume(ChannelCreateEvent(event.id, event.pubKey, event.createdAt, event.tags, event.content, event.sig))
-              ChannelMetadataEvent.kind -> LocalCache.consume(ChannelMetadataEvent(event.id, event.pubKey, event.createdAt, event.tags, event.content, event.sig))
-              ChannelMessageEvent.kind -> LocalCache.consume(ChannelMessageEvent(event.id, event.pubKey, event.createdAt, event.tags, event.content, event.sig), relay)
-              ChannelHideMessageEvent.kind -> LocalCache.consume(ChannelHideMessageEvent(event.id, event.pubKey, event.createdAt, event.tags, event.content, event.sig))
-              ChannelMuteUserEvent.kind -> LocalCache.consume(ChannelMuteUserEvent(event.id, event.pubKey, event.createdAt, event.tags, event.content, event.sig))
+            is LnZapEvent -> {
+              event.containedPost()?.let { onEvent(it, subscriptionId, relay) }
+              LocalCache.consume(event)
+            }
+            is LnZapRequestEvent -> LocalCache.consume(event)
+            is LongTextNoteEvent -> LocalCache.consume(event, relay)
+            is MetadataEvent -> LocalCache.consume(event)
+            is PrivateDmEvent -> LocalCache.consume(event, relay)
+            is ReactionEvent -> LocalCache.consume(event)
+            is RecommendRelayEvent -> LocalCache.consume(event)
+            is ReportEvent -> LocalCache.consume(event, relay)
+            is RepostEvent -> {
+              event.containedPost()?.let { onEvent(it, subscriptionId, relay) }
+              LocalCache.consume(event)
+            }
+            is TextNoteEvent -> LocalCache.consume(event, relay)
+            else -> {
+              Log.w("Event Not Supported", event.toJson())
             }
           }
         } catch (e: Exception) {
           e.printStackTrace()
         }
-
       }
     }
 
@@ -126,10 +124,12 @@ abstract class NostrDataSource(val debugName: String) {
   }
 
   open fun start() {
+    println("DataSource: ${this.javaClass.simpleName} Start")
     resetFilters()
   }
 
   open fun stop() {
+    println("DataSource: ${this.javaClass.simpleName} Stop")
     subscriptions.values.forEach { channel ->
       Client.close(channel.id)
       channel.typedFilters = null
@@ -147,17 +147,24 @@ abstract class NostrDataSource(val debugName: String) {
     subscriptions = subscriptions.minus(subscription.id)
   }
 
-  var handlerWaiting = false
-  @Synchronized
-  fun invalidateFilters() {
-    if (handlerWaiting) return
+  // Refreshes observers in batches.
+  var handlerWaiting = AtomicBoolean()
+
+  fun invalidateFilters() {
+    if (handlerWaiting.getAndSet(true)) return
+
+    println("DataSource: ${this.javaClass.simpleName} InvalidateFilters")
 
-    handlerWaiting = true
     val scope = CoroutineScope(Job() + Dispatchers.IO)
     scope.launch {
-      delay(200)
-      resetFiltersSuspend()
-      handlerWaiting = false
+      try {
+        delay(200)
+        resetFiltersSuspend()
+      } finally {
+        withContext(NonCancellable) {
+          handlerWaiting.set(false)
+        }
+      }
     }
   }
 

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

@@ -1,20 +1,17 @@
 package com.vitorpamplona.amethyst.service
 
-import com.vitorpamplona.amethyst.model.Account
-import com.vitorpamplona.amethyst.model.LocalCache
-import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
+import com.vitorpamplona.amethyst.service.model.LongTextNoteEvent
 import com.vitorpamplona.amethyst.service.relays.FeedType
 import com.vitorpamplona.amethyst.service.relays.TypedFilter
 import nostr.postr.JsonFilter
-import nostr.postr.events.TextNoteEvent
+import com.vitorpamplona.amethyst.service.model.TextNoteEvent
 
 object NostrGlobalDataSource: NostrDataSource("GlobalFeed") {
-  lateinit var account: Account
   fun createGlobalFilter() = TypedFilter(
     types = setOf(FeedType.GLOBAL),
     filter = JsonFilter(
-      kinds = listOf(TextNoteEvent.kind, ChannelMessageEvent.kind),
+      kinds = listOf(TextNoteEvent.kind, ChannelMessageEvent.kind, LongTextNoteEvent.kind),
       limit = 200
     )
   )

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

@@ -1,20 +1,15 @@
 package com.vitorpamplona.amethyst.service
 
 import com.vitorpamplona.amethyst.model.Account
-import com.vitorpamplona.amethyst.model.LocalCache
-import com.vitorpamplona.amethyst.model.LocalCacheState
-import com.vitorpamplona.amethyst.model.Note
-import com.vitorpamplona.amethyst.model.User
 import com.vitorpamplona.amethyst.model.UserState
-import com.vitorpamplona.amethyst.service.model.RepostEvent
+import com.vitorpamplona.amethyst.service.model.LongTextNoteEvent
 import com.vitorpamplona.amethyst.service.relays.FeedType
 import com.vitorpamplona.amethyst.service.relays.TypedFilter
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import nostr.postr.JsonFilter
-import nostr.postr.events.TextNoteEvent
-import nostr.postr.toHex
+import com.vitorpamplona.amethyst.service.model.TextNoteEvent
 
 object NostrHomeDataSource: NostrDataSource("HomeFeed") {
   lateinit var account: Account
@@ -53,7 +48,7 @@ object NostrHomeDataSource: NostrDataSource("HomeFeed") {
     return TypedFilter(
       types = setOf(FeedType.FOLLOWS),
       filter = JsonFilter(
-        kinds = listOf(TextNoteEvent.kind),
+        kinds = listOf(TextNoteEvent.kind, LongTextNoteEvent.kind),
         authors = followSet,
         limit = 400
       )

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

@@ -1,14 +1,11 @@
 package com.vitorpamplona.amethyst.service
 
-import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.model.decodePublicKey
-import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
 import com.vitorpamplona.amethyst.service.relays.FeedType
 import com.vitorpamplona.amethyst.service.relays.TypedFilter
 import nostr.postr.JsonFilter
 import nostr.postr.bechToBytes
-import nostr.postr.events.MetadataEvent
-import nostr.postr.events.TextNoteEvent
+import com.vitorpamplona.amethyst.service.model.MetadataEvent
 import nostr.postr.toHex
 
 object NostrSearchEventOrUserDataSource: NostrDataSource("SingleEventFeed") {

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

@@ -1,7 +1,6 @@
 package com.vitorpamplona.amethyst.service
 
 import com.vitorpamplona.amethyst.model.LocalCache
-import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.service.model.ChannelCreateEvent
 import com.vitorpamplona.amethyst.service.model.ChannelMetadataEvent
 import com.vitorpamplona.amethyst.service.relays.FeedType

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

@@ -1,12 +1,12 @@
 package com.vitorpamplona.amethyst.service
 
-import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.service.model.ChannelCreateEvent
 import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
 import com.vitorpamplona.amethyst.service.model.ChannelMetadataEvent
 import com.vitorpamplona.amethyst.service.model.LnZapEvent
 import com.vitorpamplona.amethyst.service.model.LnZapRequestEvent
+import com.vitorpamplona.amethyst.service.model.LongTextNoteEvent
 import com.vitorpamplona.amethyst.service.model.ReactionEvent
 import com.vitorpamplona.amethyst.service.model.ReportEvent
 import com.vitorpamplona.amethyst.service.model.RepostEvent
@@ -14,13 +14,42 @@ import com.vitorpamplona.amethyst.service.relays.FeedType
 import com.vitorpamplona.amethyst.service.relays.TypedFilter
 import java.util.Date
 import nostr.postr.JsonFilter
-import nostr.postr.events.TextNoteEvent
+import com.vitorpamplona.amethyst.service.model.TextNoteEvent
 
 object NostrSingleEventDataSource: NostrDataSource("SingleEventFeed") {
-  private var eventsToWatch = setOf<String>()
+  private var eventsToWatch = setOf<Note>()
+  private var addressesToWatch = setOf<Note>()
+
+  private fun createAddressFilter(): List<TypedFilter>? {
+    val addressesToWatch = eventsToWatch.filter { it.address() != null } + addressesToWatch
+
+    if (addressesToWatch.isEmpty()) {
+      return null
+    }
+
+    val now = Date().time / 1000
+
+    return addressesToWatch.filter {
+      val lastTime = it.lastReactionsDownloadTime
+      lastTime == null || lastTime < (now - 10)
+    }.mapNotNull {
+      it.address()?.let { aTag ->
+        TypedFilter(
+          types = FeedType.values().toSet(),
+          filter = JsonFilter(
+            kinds = listOf(
+              TextNoteEvent.kind, LongTextNoteEvent.kind, ReactionEvent.kind, RepostEvent.kind, ReportEvent.kind, LnZapEvent.kind, LnZapRequestEvent.kind
+            ),
+            tags = mapOf("a" to listOf(aTag.toTag())),
+            since = it.lastReactionsDownloadTime
+          )
+        )
+      }
+    }
+  }
 
   private fun createRepliesAndReactionsFilter(): List<TypedFilter>? {
-    val reactionsToWatch = eventsToWatch.map { LocalCache.getOrCreateNote(it) }
+    val reactionsToWatch = eventsToWatch
 
     if (reactionsToWatch.isEmpty()) {
       return null
@@ -36,7 +65,7 @@ object NostrSingleEventDataSource: NostrDataSource("SingleEventFeed") {
         types = FeedType.values().toSet(),
         filter = JsonFilter(
           kinds = listOf(
-            TextNoteEvent.kind, ReactionEvent.kind, RepostEvent.kind, ReportEvent.kind, LnZapEvent.kind, LnZapRequestEvent.kind
+            TextNoteEvent.kind, LongTextNoteEvent.kind, ReactionEvent.kind, RepostEvent.kind, ReportEvent.kind, LnZapEvent.kind, LnZapRequestEvent.kind
           ),
           tags = mapOf("e" to listOf(it.idHex)),
           since = it.lastReactionsDownloadTime
@@ -47,11 +76,9 @@ object NostrSingleEventDataSource: NostrDataSource("SingleEventFeed") {
 
   fun createLoadEventsIfNotLoadedFilter(): List<TypedFilter>? {
     val directEventsToLoad = eventsToWatch
-      .map { LocalCache.getOrCreateNote(it) }
       .filter { it.event == null }
 
     val threadingEventsToLoad = eventsToWatch
-      .map { LocalCache.getOrCreateNote(it) }
       .mapNotNull { it.replyTo }
       .flatten()
       .filter { it.event == null }
@@ -70,7 +97,7 @@ object NostrSingleEventDataSource: NostrDataSource("SingleEventFeed") {
         types = FeedType.values().toSet(),
         filter = JsonFilter(
           kinds = listOf(
-            TextNoteEvent.kind, ReactionEvent.kind, RepostEvent.kind, LnZapEvent.kind, LnZapRequestEvent.kind,
+            TextNoteEvent.kind, LongTextNoteEvent.kind, ReactionEvent.kind, RepostEvent.kind, LnZapEvent.kind, LnZapRequestEvent.kind,
             ChannelMessageEvent.kind, ChannelCreateEvent.kind, ChannelMetadataEvent.kind
           ),
           ids = interestedEvents.toList()
@@ -81,7 +108,7 @@ object NostrSingleEventDataSource: NostrDataSource("SingleEventFeed") {
 
   val singleEventChannel = requestNewChannel { time ->
     eventsToWatch.forEach {
-      LocalCache.getOrCreateNote(it).lastReactionsDownloadTime = time
+      it.lastReactionsDownloadTime = time
     }
     // Many relays operate with limits in the amount of filters.
     // As information comes, the filters will be rotated to get more data.
@@ -91,17 +118,28 @@ object NostrSingleEventDataSource: NostrDataSource("SingleEventFeed") {
   override fun updateChannelFilters() {
     val reactions = createRepliesAndReactionsFilter()
     val missing = createLoadEventsIfNotLoadedFilter()
+    val addresses = createAddressFilter()
 
-    singleEventChannel.typedFilters = listOfNotNull(reactions, missing).flatten().ifEmpty { null }
+    singleEventChannel.typedFilters = listOfNotNull(reactions, missing, addresses).flatten().ifEmpty { null }
   }
 
-  fun add(eventId: String) {
+  fun add(eventId: Note) {
     eventsToWatch = eventsToWatch.plus(eventId)
     invalidateFilters()
   }
 
-  fun remove(eventId: String) {
+  fun remove(eventId: Note) {
     eventsToWatch = eventsToWatch.minus(eventId)
     invalidateFilters()
   }
+
+  fun addAddress(aTag: Note) {
+    addressesToWatch = addressesToWatch.plus(aTag)
+    invalidateFilters()
+  }
+
+  fun removeAddress(aTag: Note) {
+    addressesToWatch = addressesToWatch.minus(aTag)
+    invalidateFilters()
+  }
 }

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

@@ -1,12 +1,11 @@
 package com.vitorpamplona.amethyst.service
 
-import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.User
 import com.vitorpamplona.amethyst.service.model.ReportEvent
 import com.vitorpamplona.amethyst.service.relays.FeedType
 import com.vitorpamplona.amethyst.service.relays.TypedFilter
 import nostr.postr.JsonFilter
-import nostr.postr.events.MetadataEvent
+import com.vitorpamplona.amethyst.service.model.MetadataEvent
 
 object NostrSingleUserDataSource: NostrDataSource("SingleUserFeed") {
   var usersToWatch = setOf<User>()

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

@@ -1,15 +1,9 @@
 package com.vitorpamplona.amethyst.service
 
-import com.vitorpamplona.amethyst.model.LocalCache
-import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.model.ThreadAssembler
-import com.vitorpamplona.amethyst.service.model.ReactionEvent
-import com.vitorpamplona.amethyst.service.model.RepostEvent
 import com.vitorpamplona.amethyst.service.relays.FeedType
 import com.vitorpamplona.amethyst.service.relays.TypedFilter
-import com.vitorpamplona.amethyst.ui.dal.ThreadFeedFilter
 import nostr.postr.JsonFilter
-import nostr.postr.events.TextNoteEvent
 
 object NostrThreadDataSource: NostrDataSource("SingleThreadFeed") {
   private var eventToWatch: String? = null

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

@@ -1,16 +1,15 @@
 package com.vitorpamplona.amethyst.service
 
-import android.util.Log
 import com.vitorpamplona.amethyst.model.LocalCache
-import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.model.User
 import com.vitorpamplona.amethyst.service.model.LnZapEvent
+import com.vitorpamplona.amethyst.service.model.LongTextNoteEvent
 import com.vitorpamplona.amethyst.service.relays.FeedType
 import com.vitorpamplona.amethyst.service.relays.TypedFilter
 import nostr.postr.JsonFilter
-import nostr.postr.events.ContactListEvent
-import nostr.postr.events.MetadataEvent
-import nostr.postr.events.TextNoteEvent
+import com.vitorpamplona.amethyst.service.model.ContactListEvent
+import com.vitorpamplona.amethyst.service.model.MetadataEvent
+import com.vitorpamplona.amethyst.service.model.TextNoteEvent
 
 object NostrUserProfileDataSource: NostrDataSource("UserProfileFeed") {
   var user: User? = null
@@ -40,7 +39,7 @@ object NostrUserProfileDataSource: NostrDataSource("UserProfileFeed") {
     TypedFilter(
       types = FeedType.values().toSet(),
       filter = JsonFilter(
-        kinds = listOf(TextNoteEvent.kind),
+        kinds = listOf(TextNoteEvent.kind, LongTextNoteEvent.kind),
         authors = listOf(it.pubkeyHex),
         limit = 200
       )

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

@@ -1,6 +1,5 @@
-package com.vitorpamplona.amethyst.lnurl
+package com.vitorpamplona.amethyst.service.lnurl
 
-import androidx.compose.ui.text.toLowerCase
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import java.net.URLEncoder
 import kotlinx.coroutines.CoroutineScope

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

@@ -1,6 +1,5 @@
-package com.vitorpamplona.amethyst.lnurl
+package com.vitorpamplona.amethyst.service.lnurl
 
-import androidx.compose.ui.text.toLowerCase
 import java.math.BigDecimal
 import java.util.Locale
 import java.util.regex.Pattern

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

@@ -0,0 +1,72 @@
+package com.vitorpamplona.amethyst.service.model
+
+import android.util.Log
+import com.vitorpamplona.amethyst.model.toByteArray
+import com.vitorpamplona.amethyst.model.toHexKey
+import com.vitorpamplona.amethyst.service.NIP19TLVTypes
+import com.vitorpamplona.amethyst.service.parseTLV
+import com.vitorpamplona.amethyst.service.toInt32
+import fr.acinq.secp256k1.Hex
+import nostr.postr.Bech32
+import nostr.postr.bechToBytes
+import nostr.postr.toByteArray
+
+data class ATag(val kind: Int, val pubKeyHex: String, val dTag: String) {
+    fun toTag() = "$kind:$pubKeyHex:$dTag"
+
+    fun toNAddr(): String {
+        val kind = kind.toByteArray()
+        val addr = pubKeyHex.toByteArray()
+        val dTag = dTag.toByteArray(Charsets.UTF_8)
+
+        val fullArray =
+            byteArrayOf(NIP19TLVTypes.SPECIAL.id, dTag.size.toByte()) + dTag +
+            byteArrayOf(NIP19TLVTypes.AUTHOR.id, addr.size.toByte()) + addr +
+            byteArrayOf(NIP19TLVTypes.KIND.id, kind.size.toByte()) + kind
+
+        return Bech32.encodeBytes(hrp = "naddr", fullArray, Bech32.Encoding.Bech32)
+    }
+
+    companion object {
+        fun parse(address: String): ATag? {
+            return if (address.startsWith("naddr") || address.startsWith("nostr:naddr"))
+                parseNAddr(address)
+            else
+                parseAtag(address)
+        }
+
+        fun parseAtag(atag: String): ATag? {
+            return try {
+                val parts = atag.split(":")
+              Hex.decode(parts[1])
+              ATag(parts[0].toInt(), parts[1], parts[2])
+            } catch (t: Throwable) {
+              Log.w("ATag",  "Error parsing A Tag: ${atag}: ${t.message}")
+                null
+            }
+        }
+
+        fun parseNAddr(naddr: String): ATag? {
+            try {
+                val key = naddr.removePrefix("nostr:")
+
+                if (key.startsWith("naddr")) {
+                    val tlv = parseTLV(key.bechToBytes())
+                    val d = tlv.get(NIP19TLVTypes.SPECIAL.id)?.get(0)?.toString(Charsets.UTF_8) ?: ""
+                    val relay = tlv.get(NIP19TLVTypes.RELAY.id)?.get(0)?.toString(Charsets.UTF_8)
+                    val author = tlv.get(NIP19TLVTypes.AUTHOR.id)?.get(0)?.toHexKey()
+                    val kind = tlv.get(NIP19TLVTypes.KIND.id)?.get(0)?.let { toInt32(it) }
+
+                    if (kind != null && author != null)
+                        return ATag(kind, author, d)
+                }
+
+            } catch (e: Throwable) {
+                Log.w( "ATag", "Issue trying to Decode NIP19 ${this}: ${e.message}")
+                //e.printStackTrace()
+            }
+
+            return null
+        }
+    }
+}

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

@@ -1,28 +1,24 @@
 package com.vitorpamplona.amethyst.service.model
 
 import android.util.Log
+import com.vitorpamplona.amethyst.model.HexKey
+import com.vitorpamplona.amethyst.model.toHexKey
 import java.util.Date
 import nostr.postr.Utils
-import nostr.postr.events.Event
-import nostr.postr.events.MetadataEvent
 
 class ChannelCreateEvent (
-  id: ByteArray,
-  pubKey: ByteArray,
+  id: HexKey,
+  pubKey: HexKey,
   createdAt: Long,
   tags: List<List<String>>,
   content: String,
-  sig: ByteArray
+  sig: HexKey
 ): Event(id, pubKey, createdAt, kind, tags, content, sig) {
-  @Transient val channelInfo: ChannelData
-
-  init {
-    channelInfo = try {
-      MetadataEvent.gson.fromJson(content, ChannelData::class.java)
-    } catch (e: Exception) {
-      Log.e("ChannelMetadataEvent", "Can't parse channel info $content", e)
-      ChannelData(null, null, null)
-    }
+  fun channelInfo() = try {
+    MetadataEvent.gson.fromJson(content, ChannelData::class.java)
+  } catch (e: Exception) {
+    Log.e("ChannelMetadataEvent", "Can't parse channel info $content", e)
+    ChannelData(null, null, null)
   }
 
   companion object {
@@ -39,11 +35,11 @@ class ChannelCreateEvent (
         ""
       }
 
-      val pubKey = Utils.pubkeyCreate(privateKey)
+      val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
       val tags = emptyList<List<String>>()
       val id = generateId(pubKey, createdAt, kind, tags, content)
       val sig = Utils.sign(id, privateKey)
-      return ChannelCreateEvent(id, pubKey, createdAt, tags, content, sig)
+      return ChannelCreateEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())
     }
   }
 

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

@@ -1,30 +1,26 @@
 package com.vitorpamplona.amethyst.service.model
 
+import com.vitorpamplona.amethyst.model.HexKey
+import com.vitorpamplona.amethyst.model.toHexKey
 import java.util.Date
 import nostr.postr.Utils
-import nostr.postr.events.Event
-import nostr.postr.toHex
 
 class ChannelHideMessageEvent (
-  id: ByteArray,
-  pubKey: ByteArray,
+  id: HexKey,
+  pubKey: HexKey,
   createdAt: Long,
   tags: List<List<String>>,
   content: String,
-  sig: ByteArray
+  sig: HexKey
 ): Event(id, pubKey, createdAt, kind, tags, content, sig) {
-  @Transient val eventsToHide: List<String>
-
-  init {
-    eventsToHide = tags.filter { it.firstOrNull() == "e" }.mapNotNull { it.getOrNull(1) }
-  }
+  fun eventsToHide() = tags.filter { it.firstOrNull() == "e" }.mapNotNull { it.getOrNull(1) }
 
   companion object {
     const val kind = 43
 
     fun create(reason: String, messagesToHide: List<String>?, mentions: List<String>?, privateKey: ByteArray, createdAt: Long = Date().time / 1000): ChannelHideMessageEvent {
       val content = reason
-      val pubKey = Utils.pubkeyCreate(privateKey)
+      val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
       val tags =
         messagesToHide?.map {
           listOf("e", it)
@@ -32,7 +28,7 @@ class ChannelHideMessageEvent (
 
       val id = generateId(pubKey, createdAt, kind, tags, content)
       val sig = Utils.sign(id, privateKey)
-      return ChannelHideMessageEvent(id, pubKey, createdAt, tags, content, sig)
+      return ChannelHideMessageEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())
     }
   }
 }

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

@@ -1,34 +1,29 @@
 package com.vitorpamplona.amethyst.service.model
 
+import com.vitorpamplona.amethyst.model.HexKey
+import com.vitorpamplona.amethyst.model.toHexKey
 import java.util.Date
 import nostr.postr.Utils
-import nostr.postr.events.Event
-import nostr.postr.toHex
 
 class ChannelMessageEvent (
-  id: ByteArray,
-  pubKey: ByteArray,
+  id: HexKey,
+  pubKey: HexKey,
   createdAt: Long,
   tags: List<List<String>>,
   content: String,
-  sig: ByteArray
+  sig: HexKey
 ): Event(id, pubKey, createdAt, kind, tags, content, sig) {
-  @Transient val channel: String?
-  @Transient val replyTos: List<String>
-  @Transient val mentions: List<String>
 
-  init {
-    channel = tags.firstOrNull { it[0] == "e" && it.size > 3 && it[3] == "root" }?.getOrNull(1) ?: tags.firstOrNull { it.firstOrNull() == "e" }?.getOrNull(1)
-    replyTos = tags.filter { it.getOrNull(1) != channel }.mapNotNull { it.getOrNull(1) }
-    mentions = tags.filter { it.firstOrNull() == "p" }.mapNotNull { it.getOrNull(1) }
-  }
+  fun channel() = tags.firstOrNull { it[0] == "e" && it.size > 3 && it[3] == "root" }?.getOrNull(1) ?: tags.firstOrNull { it.firstOrNull() == "e" }?.getOrNull(1)
+  fun replyTos() = tags.filter { it.getOrNull(1) != channel() }.mapNotNull { it.getOrNull(1) }
+  fun mentions() = tags.filter { it.firstOrNull() == "p" }.mapNotNull { it.getOrNull(1) }
 
   companion object {
     const val kind = 42
 
     fun create(message: String, channel: String, replyTos: List<String>? = null, mentions: List<String>? = null, privateKey: ByteArray, createdAt: Long = Date().time / 1000): ChannelMessageEvent {
       val content = message
-      val pubKey = Utils.pubkeyCreate(privateKey)
+      val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
       val tags = mutableListOf(
         listOf("e", channel, "", "root")
       )
@@ -41,7 +36,7 @@ class ChannelMessageEvent (
 
       val id = generateId(pubKey, createdAt, kind, tags, content)
       val sig = Utils.sign(id, privateKey)
-      return ChannelMessageEvent(id, pubKey, createdAt, tags, content, sig)
+      return ChannelMessageEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())
     }
   }
 }

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

@@ -1,34 +1,27 @@
 package com.vitorpamplona.amethyst.service.model
 
 import android.util.Log
+import com.vitorpamplona.amethyst.model.HexKey
+import com.vitorpamplona.amethyst.model.toHexKey
 import java.util.Date
-import nostr.postr.ContactMetaData
 import nostr.postr.Utils
-import nostr.postr.events.Event
-import nostr.postr.events.MetadataEvent
-import nostr.postr.toHex
 
 class ChannelMetadataEvent (
-  id: ByteArray,
-  pubKey: ByteArray,
+  id: HexKey,
+  pubKey: HexKey,
   createdAt: Long,
   tags: List<List<String>>,
   content: String,
-  sig: ByteArray
+  sig: HexKey
 ): Event(id, pubKey, createdAt, kind, tags, content, sig) {
-  @Transient val channel: String?
-  @Transient val channelInfo: ChannelCreateEvent.ChannelData
-
-  init {
-    channel = tags.firstOrNull { it.firstOrNull() == "e" }?.getOrNull(1)
-    channelInfo =
-      try {
-        MetadataEvent.gson.fromJson(content, ChannelCreateEvent.ChannelData::class.java)
-      } catch (e: Exception) {
-        Log.e("ChannelMetadataEvent", "Can't parse channel info $content", e)
-        ChannelCreateEvent.ChannelData(null, null, null)
-      }
-  }
+  fun channel() = tags.firstOrNull { it.firstOrNull() == "e" }?.getOrNull(1)
+  fun channelInfo() =
+    try {
+      MetadataEvent.gson.fromJson(content, ChannelCreateEvent.ChannelData::class.java)
+    } catch (e: Exception) {
+      Log.e("ChannelMetadataEvent", "Can't parse channel info $content", e)
+      ChannelCreateEvent.ChannelData(null, null, null)
+    }
 
   companion object {
     const val kind = 41
@@ -40,11 +33,11 @@ class ChannelMetadataEvent (
         else
           ""
 
-      val pubKey = Utils.pubkeyCreate(privateKey)
+      val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
       val tags = listOf( listOf("e", originalChannelIdHex, "", "root") )
       val id = generateId(pubKey, createdAt, kind, tags, content)
       val sig = Utils.sign(id, privateKey)
-      return ChannelMetadataEvent(id, pubKey, createdAt, tags, content, sig)
+      return ChannelMetadataEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())
     }
   }
 }

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

@@ -1,31 +1,27 @@
 package com.vitorpamplona.amethyst.service.model
 
+import com.vitorpamplona.amethyst.model.HexKey
+import com.vitorpamplona.amethyst.model.toHexKey
 import java.util.Date
 import nostr.postr.Utils
-import nostr.postr.events.Event
-import nostr.postr.events.MetadataEvent
-import nostr.postr.toHex
 
 class ChannelMuteUserEvent (
-  id: ByteArray,
-  pubKey: ByteArray,
+  id: HexKey,
+  pubKey: HexKey,
   createdAt: Long,
   tags: List<List<String>>,
   content: String,
-  sig: ByteArray
+  sig: HexKey
 ): Event(id, pubKey, createdAt, kind, tags, content, sig) {
-  @Transient val usersToMute: List<String>
 
-  init {
-    usersToMute = tags.filter { it.firstOrNull() == "p" }.mapNotNull { it.getOrNull(1) }
-  }
+  fun usersToMute() = tags.filter { it.firstOrNull() == "p" }.mapNotNull { it.getOrNull(1) }
 
   companion object {
     const val kind = 44
 
     fun create(reason: String, usersToMute: List<String>?, privateKey: ByteArray, createdAt: Long = Date().time / 1000): ChannelMuteUserEvent {
       val content = reason
-      val pubKey = Utils.pubkeyCreate(privateKey)
+      val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
       val tags =
         usersToMute?.map {
           listOf("p", it)
@@ -33,7 +29,7 @@ class ChannelMuteUserEvent (
 
       val id = generateId(pubKey, createdAt, kind, tags, content)
       val sig = Utils.sign(id, privateKey)
-      return ChannelMuteUserEvent(id, pubKey, createdAt, tags, content, sig)
+      return ChannelMuteUserEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())
     }
   }
 }

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

@@ -0,0 +1,59 @@
+package com.vitorpamplona.amethyst.service.model
+
+import android.util.Log
+import com.google.gson.reflect.TypeToken
+import com.vitorpamplona.amethyst.model.HexKey
+import com.vitorpamplona.amethyst.model.toHexKey
+import java.util.Date
+import nostr.postr.Utils
+
+data class Contact(val pubKeyHex: String, val relayUri: String?)
+
+class ContactListEvent(
+    id: HexKey,
+    pubKey: HexKey,
+    createdAt: Long,
+    tags: List<List<String>>,
+    content: String,
+    sig: HexKey
+): Event(id, pubKey, createdAt, kind, tags, content, sig) {
+    fun follows() = try {
+        tags.filter { it[0] == "p" }.map { Contact(it[1], it.getOrNull(2)) }
+    } catch (e: Exception) {
+        Log.e("ContactListEvent", "can't parse tags as follows: $tags", e)
+        null
+    }
+
+    fun relayUse() = try {
+        if (content.isNotEmpty())
+            gson.fromJson(content, object: TypeToken<Map<String, ReadWrite>>() {}.type)
+        else
+            null
+    } catch (e: Exception) {
+        Log.e("ContactListEvent", "can't parse content as relay lists: $tags", e)
+        null
+    }
+
+    companion object {
+        const val kind = 3
+
+        fun create(follows: List<Contact>, relayUse: Map<String, ReadWrite>?, privateKey: ByteArray, createdAt: Long = Date().time / 1000): ContactListEvent {
+            val content = if (relayUse != null)
+                gson.toJson(relayUse)
+            else
+                ""
+            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
+            val tags = follows.map {
+                if (it.relayUri != null)
+                    listOf("p", it.pubKeyHex, it.relayUri)
+                else
+                    listOf("p", it.pubKeyHex)
+            }
+            val id = generateId(pubKey, createdAt, kind, tags, content)
+            val sig = Utils.sign(id, privateKey)
+            return ContactListEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())
+        }
+    }
+
+    data class ReadWrite(val read: Boolean, val write: Boolean)
+}

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

@@ -0,0 +1,30 @@
+package com.vitorpamplona.amethyst.service.model
+
+import com.vitorpamplona.amethyst.model.HexKey
+import com.vitorpamplona.amethyst.model.toHexKey
+import java.util.Date
+import nostr.postr.Utils
+
+class DeletionEvent(
+    id: HexKey,
+    pubKey: HexKey,
+    createdAt: Long,
+    tags: List<List<String>>,
+    content: String,
+    sig: HexKey
+): Event(id, pubKey, createdAt, kind, tags, content, sig) {
+    fun deleteEvents() = tags.map { it[1] }
+
+    companion object {
+        const val kind = 5
+
+        fun create(deleteEvents: List<String>, privateKey: ByteArray, createdAt: Long = Date().time / 1000): DeletionEvent {
+            val content = ""
+            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
+            val tags = deleteEvents.map { listOf("e", it) }
+            val id = generateId(pubKey, createdAt, kind, tags, content)
+            val sig = Utils.sign(id, privateKey)
+            return DeletionEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())
+        }
+    }
+}

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

@@ -0,0 +1,197 @@
+package com.vitorpamplona.amethyst.service.model
+
+import com.google.gson.Gson
+import com.google.gson.GsonBuilder
+import com.google.gson.JsonArray
+import com.google.gson.JsonDeserializationContext
+import com.google.gson.JsonDeserializer
+import com.google.gson.JsonElement
+import com.google.gson.JsonObject
+import com.google.gson.JsonPrimitive
+import com.google.gson.JsonSerializationContext
+import com.google.gson.JsonSerializer
+import com.google.gson.annotations.SerializedName
+import com.vitorpamplona.amethyst.model.HexKey
+import com.vitorpamplona.amethyst.model.toHexKey
+import fr.acinq.secp256k1.Hex
+import fr.acinq.secp256k1.Secp256k1
+import java.lang.reflect.Type
+import java.security.MessageDigest
+import java.util.Date
+import nostr.postr.Utils
+import nostr.postr.toHex
+
+open class Event(
+    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,
+    val sig: HexKey
+) {
+    fun toJson(): String = gson.toJson(this)
+
+    fun generateId(): String {
+        val rawEvent = listOf(
+            0,
+            pubKey,
+            createdAt,
+            kind,
+            tags,
+            content
+        )
+        val rawEventJson = gson.toJson(rawEvent)
+        return sha256.digest(rawEventJson.toByteArray()).toHexKey()
+    }
+
+    /**
+     * Checks if the ID is correct and then if the pubKey's secret key signed the event.
+     */
+    fun checkSignature() {
+        if (!id.contentEquals(generateId())) {
+            throw Exception(
+                """|Unexpected ID.
+                   |  Event: ${toJson()}
+                   |  Actual ID: ${id}
+                   |  Generated: ${generateId()}""".trimIndent()
+            )
+        }
+        if (!secp256k1.verifySchnorr(Hex.decode(sig), Hex.decode(id), Hex.decode(pubKey))) {
+            throw Exception("""Bad signature!""")
+        }
+    }
+
+    fun hasValidSignature(): Boolean {
+        if (!id.contentEquals(generateId())) {
+            return false
+        }
+        if (!Secp256k1.get().verifySchnorr(Hex.decode(sig), Hex.decode(id), Hex.decode(pubKey))) {
+            return false
+        }
+
+        return true
+    }
+
+    class EventDeserializer : JsonDeserializer<Event> {
+        override fun deserialize(
+            json: JsonElement,
+            typeOfT: Type?,
+            context: JsonDeserializationContext?
+        ): Event {
+            val jsonObject = json.asJsonObject
+            return Event(
+                id = jsonObject.get("id").asString,
+                pubKey = jsonObject.get("pubkey").asString,
+                createdAt = jsonObject.get("created_at").asLong,
+                kind = jsonObject.get("kind").asInt,
+                tags = jsonObject.get("tags").asJsonArray.map {
+                    it.asJsonArray.map { s -> s.asString }
+                },
+                content = jsonObject.get("content").asString,
+                sig = jsonObject.get("sig").asString
+            )
+        }
+    }
+
+    class EventSerializer : JsonSerializer<Event> {
+        override fun serialize(
+            src: Event,
+            typeOfSrc: Type?,
+            context: JsonSerializationContext?
+        ): JsonElement {
+            return JsonObject().apply {
+                addProperty("id", src.id)
+                addProperty("pubkey", src.pubKey)
+                addProperty("created_at", src.createdAt)
+                addProperty("kind", src.kind)
+                add("tags", JsonArray().also { jsonTags ->
+                    src.tags.forEach { tag ->
+                        jsonTags.add(JsonArray().also { jsonTagElement ->
+                            tag.forEach { tagElement ->
+                                jsonTagElement.add(tagElement)
+                            }
+                        })
+                    }
+                })
+                addProperty("content", src.content)
+                addProperty("sig", src.sig)
+            }
+        }
+    }
+
+    class ByteArrayDeserializer : JsonDeserializer<ByteArray> {
+        override fun deserialize(
+            json: JsonElement,
+            typeOfT: Type?,
+            context: JsonDeserializationContext?
+        ): ByteArray = Hex.decode(json.asString)
+    }
+
+    class ByteArraySerializer : JsonSerializer<ByteArray> {
+        override fun serialize(
+            src: ByteArray,
+            typeOfSrc: Type?,
+            context: JsonSerializationContext?
+        ) = JsonPrimitive(src.toHex())
+    }
+
+    companion object {
+        private val secp256k1 = Secp256k1.get()
+
+        val sha256: MessageDigest = MessageDigest.getInstance("SHA-256")
+        val gson: Gson = GsonBuilder()
+            .disableHtmlEscaping()
+            .registerTypeAdapter(Event::class.java, EventSerializer())
+            .registerTypeAdapter(Event::class.java, EventDeserializer())
+            .registerTypeAdapter(ByteArray::class.java, ByteArraySerializer())
+            .registerTypeAdapter(ByteArray::class.java, ByteArrayDeserializer())
+            .create()
+
+        fun fromJson(json: String, lenient: Boolean = false): Event = gson.fromJson(json, Event::class.java).getRefinedEvent(lenient)
+
+        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) {
+            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)
+            ContactListEvent.kind -> ContactListEvent(id, pubKey, createdAt, tags, content, sig)
+            DeletionEvent.kind -> DeletionEvent(id, pubKey, createdAt, tags, content, sig)
+
+            LnZapEvent.kind -> LnZapEvent(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)
+            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)
+            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 generateId(pubKey: HexKey, createdAt: Long, kind: Int, tags: List<List<String>>, content: String): ByteArray {
+            val rawEvent = listOf(
+                0,
+                pubKey,
+                createdAt,
+                kind,
+                tags,
+                content
+            )
+            val rawEventJson = gson.toJson(rawEvent)
+            return sha256.digest(rawEventJson.toByteArray())
+        }
+
+        fun create(privateKey: ByteArray, kind: Int, tags: List<List<String>> = emptyList(), content: String = "", createdAt: Long = Date().time / 1000): Event {
+            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
+            val id = Companion.generateId(pubKey, createdAt, kind, tags, content)
+            val sig = Utils.sign(id, privateKey).toHexKey()
+            return Event(id.toHexKey(), pubKey, createdAt, kind, tags, content, sig)
+        }
+    }
+}

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

@@ -1,47 +1,37 @@
 package com.vitorpamplona.amethyst.service.model
 
-import com.vitorpamplona.amethyst.lnurl.LnInvoiceUtil
+import com.vitorpamplona.amethyst.model.HexKey
+import com.vitorpamplona.amethyst.service.lnurl.LnInvoiceUtil
 import com.vitorpamplona.amethyst.service.relays.Client
-import java.math.BigDecimal
-import java.util.Date
-import nostr.postr.Utils
-import nostr.postr.events.Event
-import nostr.postr.toHex
 
 class LnZapEvent (
-  id: ByteArray,
-  pubKey: ByteArray,
+  id: HexKey,
+  pubKey: HexKey,
   createdAt: Long,
   tags: List<List<String>>,
   content: String,
-  sig: ByteArray
+  sig: HexKey
 ): Event(id, pubKey, createdAt, kind, tags, content, sig) {
 
-  @Transient val zappedPost: List<String>
-  @Transient val zappedAuthor: List<String>
-  @Transient val containedPost: Event?
-  @Transient val lnInvoice: String?
-  @Transient val preimage: String?
-  @Transient val amount: BigDecimal?
+  fun zappedPost() = tags.filter { it.firstOrNull() == "e" }.mapNotNull { it.getOrNull(1) }
+  fun zappedAuthor() = tags.filter { it.firstOrNull() == "p" }.mapNotNull { it.getOrNull(1) }
 
-  init {
-    zappedPost = tags.filter { it.firstOrNull() == "e" }.mapNotNull { it.getOrNull(1) }
-    zappedAuthor = tags.filter { it.firstOrNull() == "p" }.mapNotNull { it.getOrNull(1) }
+  fun taggedAddresses() = tags.filter { it.firstOrNull() == "a" }.mapNotNull { it.getOrNull(1) }.mapNotNull { ATag.parse(it) }
 
-    lnInvoice = tags.filter { it.firstOrNull() == "bolt11" }.mapNotNull { it.getOrNull(1) }.firstOrNull()
-    amount = lnInvoice?.let { LnInvoiceUtil.getAmountInSats(lnInvoice) }
-    preimage = tags.filter { it.firstOrNull() == "preimage" }.mapNotNull { it.getOrNull(1) }.firstOrNull()
+  fun lnInvoice() = tags.filter { it.firstOrNull() == "bolt11" }.mapNotNull { it.getOrNull(1) }.firstOrNull()
+  fun preimage() = tags.filter { it.firstOrNull() == "preimage" }.mapNotNull { it.getOrNull(1) }.firstOrNull()
 
-    val description = tags.filter { it.firstOrNull() == "description" }.mapNotNull { it.getOrNull(1) }.firstOrNull()
+  fun description() = tags.filter { it.firstOrNull() == "description" }.mapNotNull { it.getOrNull(1) }.firstOrNull()
 
-    containedPost = try {
-      if (description == null)
-        null
-      else
-        fromJson(description, Client.lenient)
-    } catch (e: Exception) {
-      null
+  // Keeps this as a field because it's a heavier function used everywhere.
+  val amount = lnInvoice()?.let { LnInvoiceUtil.getAmountInSats(it) }
+
+  fun containedPost() = try {
+    description()?.let {
+      fromJson(it, Client.lenient)
     }
+  } catch (e: Exception) {
+    null
   }
 
   companion object {

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

@@ -1,55 +1,53 @@
 package com.vitorpamplona.amethyst.service.model
 
-import com.vitorpamplona.amethyst.service.relays.Client
+import com.vitorpamplona.amethyst.model.HexKey
+import com.vitorpamplona.amethyst.model.toHexKey
 import java.util.Date
 import nostr.postr.Utils
-import nostr.postr.events.ContactListEvent
-import nostr.postr.events.Event
 import nostr.postr.toHex
 
 class LnZapRequestEvent (
-  id: ByteArray,
-  pubKey: ByteArray,
+  id: HexKey,
+  pubKey: HexKey,
   createdAt: Long,
   tags: List<List<String>>,
   content: String,
-  sig: ByteArray
+  sig: HexKey
 ): Event(id, pubKey, createdAt, kind, tags, content, sig) {
-
-  @Transient val zappedPost: List<String>
-  @Transient val zappedAuthor: List<String>
-
-  init {
-    zappedPost = tags.filter { it.firstOrNull() == "e" }.mapNotNull { it.getOrNull(1) }
-    zappedAuthor = tags.filter { it.firstOrNull() == "p" }.mapNotNull { it.getOrNull(1) }
-  }
+  fun zappedPost() = tags.filter { it.firstOrNull() == "e" }.mapNotNull { it.getOrNull(1) }
+  fun zappedAuthor() = tags.filter { it.firstOrNull() == "p" }.mapNotNull { it.getOrNull(1) }
+  fun taggedAddresses() = tags.filter { it.firstOrNull() == "a" }.mapNotNull { it.getOrNull(1) }.mapNotNull { ATag.parse(it) }
 
   companion object {
     const val kind = 9734
 
     fun create(originalNote: Event, relays: Set<String>, privateKey: ByteArray, createdAt: Long = Date().time / 1000): LnZapRequestEvent {
       val content = ""
-      val pubKey = Utils.pubkeyCreate(privateKey)
-      val tags = listOf(
-        listOf("e", originalNote.id.toHex()),
-        listOf("p", originalNote.pubKey.toHex()),
+      val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
+      var tags = listOf(
+        listOf("e", originalNote.id),
+        listOf("p", originalNote.pubKey),
         listOf("relays") + relays
       )
+      if (originalNote is LongTextNoteEvent) {
+        tags = tags + listOf( listOf("a", originalNote.address().toTag()) )
+      }
+
       val id = generateId(pubKey, createdAt, kind, tags, content)
       val sig = Utils.sign(id, privateKey)
-      return LnZapRequestEvent(id, pubKey, createdAt, tags, content, sig)
+      return LnZapRequestEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())
     }
 
     fun create(userHex: String, relays: Set<String>, privateKey: ByteArray, createdAt: Long = Date().time / 1000): LnZapRequestEvent {
       val content = ""
-      val pubKey = Utils.pubkeyCreate(privateKey)
+      val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
       val tags = listOf(
         listOf("p", userHex),
         listOf("relays") + relays
       )
       val id = generateId(pubKey, createdAt, kind, tags, content)
       val sig = Utils.sign(id, privateKey)
-      return LnZapRequestEvent(id, pubKey, createdAt, tags, content, sig)
+      return LnZapRequestEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())
     }
   }
 }

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

@@ -0,0 +1,50 @@
+package com.vitorpamplona.amethyst.service.model
+
+import com.vitorpamplona.amethyst.model.HexKey
+import com.vitorpamplona.amethyst.model.toHexKey
+import java.util.Date
+import nostr.postr.Utils
+
+class LongTextNoteEvent(
+    id: HexKey,
+    pubKey: HexKey,
+    createdAt: Long,
+    tags: List<List<String>>,
+    content: String,
+    sig: HexKey
+): Event(id, pubKey, createdAt, kind, tags, content, sig) {
+    fun replyTos() = tags.filter { it.firstOrNull() == "e" }.mapNotNull { it.getOrNull(1) }
+    fun mentions() = tags.filter { it.firstOrNull() == "p" }.mapNotNull { it.getOrNull(1) }
+
+    fun dTag() = tags.filter { it.firstOrNull() == "d" }.mapNotNull { it.getOrNull(1) }.firstOrNull() ?: ""
+    fun address() = ATag(kind, pubKey, dTag())
+
+    fun topics() = tags.filter { it.firstOrNull() == "t" }.mapNotNull { it.getOrNull(1) }
+    fun title() = tags.filter { it.firstOrNull() == "title" }.mapNotNull { it.getOrNull(1) }.firstOrNull()
+    fun image() = tags.filter { it.firstOrNull() == "image" }.mapNotNull { it.getOrNull(1) }.firstOrNull()
+    fun summary() = tags.filter { it.firstOrNull() == "summary" }.mapNotNull { it.getOrNull(1) }.firstOrNull()
+
+    fun publishedAt() = try {
+        tags.filter { it.firstOrNull() == "published_at" }.mapNotNull { it.getOrNull(1) }.firstOrNull()?.toLong()
+    } catch (_: Exception) {
+        null
+    }
+
+    companion object {
+        const val kind = 30023
+
+        fun create(msg: String, replyTos: List<String>?, mentions: List<String>?, privateKey: ByteArray, createdAt: Long = Date().time / 1000): LongTextNoteEvent {
+            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
+            val tags = mutableListOf<List<String>>()
+            replyTos?.forEach {
+                tags.add(listOf("e", it))
+            }
+            mentions?.forEach {
+                tags.add(listOf("p", it))
+            }
+            val id = generateId(pubKey, createdAt, kind, tags, msg)
+            val sig = Utils.sign(id, privateKey)
+            return LongTextNoteEvent(id.toHexKey(), pubKey, createdAt, tags, msg, sig.toHexKey())
+        }
+    }
+}

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

@@ -0,0 +1,48 @@
+package com.vitorpamplona.amethyst.service.model
+
+import android.util.Log
+import com.google.gson.Gson
+import com.vitorpamplona.amethyst.model.HexKey
+import com.vitorpamplona.amethyst.model.toHexKey
+import java.util.Date
+import nostr.postr.Utils
+
+data class ContactMetaData(
+    val name: String,
+    val picture: String,
+    val about: String,
+    val nip05: String?)
+
+class MetadataEvent(
+    id: HexKey,
+    pubKey: HexKey,
+    createdAt: Long,
+    tags: List<List<String>>,
+    content: String,
+    sig: HexKey
+): Event(id, pubKey, createdAt, kind, tags, content, sig) {
+    fun contactMetaData() = try {
+        gson.fromJson(content, ContactMetaData::class.java)
+    } catch (e: Exception) {
+        Log.e("MetadataEvent", "Can't parse $content", e)
+        null
+    }
+
+    companion object {
+        const val kind = 0
+        val gson = Gson()
+
+        fun create(contactMetaData: ContactMetaData, privateKey: ByteArray, createdAt: Long = Date().time / 1000): MetadataEvent {
+            return create(gson.toJson(contactMetaData), privateKey, createdAt = createdAt)
+        }
+
+        fun create(contactMetaData: String, privateKey: ByteArray, createdAt: Long = Date().time / 1000): MetadataEvent {
+            val content = contactMetaData
+            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
+            val tags = listOf<List<String>>()
+            val id = generateId(pubKey, createdAt, kind, tags, content)
+            val sig = Utils.sign(id, privateKey)
+            return MetadataEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())
+        }
+    }
+}

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

@@ -0,0 +1,86 @@
+package com.vitorpamplona.amethyst.service.model
+
+import android.util.Log
+import com.vitorpamplona.amethyst.model.HexKey
+import com.vitorpamplona.amethyst.model.toHexKey
+import fr.acinq.secp256k1.Hex
+import java.util.Date
+import nostr.postr.Utils
+import nostr.postr.toHex
+
+class PrivateDmEvent(
+    id: HexKey,
+    pubKey: HexKey,
+    createdAt: Long,
+    tags: List<List<String>>,
+    content: String,
+    sig: HexKey
+) : Event(id, pubKey, createdAt, kind, tags, content, sig) {
+    /**
+     * This may or may not be the actual recipient's pub key. The event is intended to look like a
+     * nip-04 EncryptedDmEvent but may omit the recipient, too. This value can be queried and used
+     * for initial messages.
+     */
+    fun recipientPubKey() = tags.firstOrNull { it.firstOrNull() == "p" }?.run { Hex.decode(this[1]).toHexKey() } // makes sure its a valid one
+
+    /**
+     * To be fully compatible with nip-04, we read e-tags that are in violation to nip-18.
+     *
+     * Nip-18 messages should refer to other events by inline references in the content like
+     * `[](e/c06f795e1234a9a1aecc731d768d4f3ca73e80031734767067c82d67ce82e506).
+     */
+    fun replyTo() = tags.firstOrNull { it.firstOrNull() == "e" }?.getOrNull(1)
+
+    fun plainContent(privKey: ByteArray, pubKey: ByteArray): String? {
+        return try {
+            val sharedSecret = Utils.getSharedSecret(privKey, pubKey)
+
+            val retVal = Utils.decrypt(content, sharedSecret)
+
+            if (retVal.startsWith(nip18Advertisement)) {
+                retVal.substring(16)
+            } else {
+                retVal
+            }
+        } catch (e: Exception) {
+            Log.w("PrivateDM", "Error decrypting the message ${e.message}")
+            null
+        }
+    }
+
+
+    companion object {
+        const val kind = 4
+
+        const val nip18Advertisement = "[//]: # (nip18)\n"
+
+        fun create(
+            recipientPubKey: ByteArray,
+            msg: String,
+            replyTos: List<String>? = null, mentions: List<String>? = null,
+            privateKey: ByteArray,
+            createdAt: Long = Date().time / 1000,
+            publishedRecipientPubKey: ByteArray? = null,
+            advertiseNip18: Boolean = true
+        ): PrivateDmEvent {
+            val content = Utils.encrypt(
+                if (advertiseNip18) { nip18Advertisement } else { "" } + msg,
+                privateKey,
+                recipientPubKey)
+            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
+            val tags = mutableListOf<List<String>>()
+            publishedRecipientPubKey?.let {
+                tags.add(listOf("p", publishedRecipientPubKey.toHex()))
+            }
+            replyTos?.forEach {
+                tags.add(listOf("e", it))
+            }
+            mentions?.forEach {
+                tags.add(listOf("p", it))
+            }
+            val id = generateId(pubKey, createdAt, kind, tags, content)
+            val sig = Utils.sign(id, privateKey)
+            return PrivateDmEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())
+        }
+    }
+}

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

@@ -1,26 +1,23 @@
 package com.vitorpamplona.amethyst.service.model
 
+import com.vitorpamplona.amethyst.model.HexKey
+import com.vitorpamplona.amethyst.model.toHexKey
 import java.util.Date
 import nostr.postr.Utils
-import nostr.postr.events.Event
 import nostr.postr.toHex
 
 class ReactionEvent (
-  id: ByteArray,
-  pubKey: ByteArray,
+  id: HexKey,
+  pubKey: HexKey,
   createdAt: Long,
   tags: List<List<String>>,
   content: String,
-  sig: ByteArray
+  sig: HexKey
 ): Event(id, pubKey, createdAt, kind, tags, content, sig) {
 
-  @Transient val originalPost: List<String>
-  @Transient val originalAuthor: List<String>
-
-  init {
-    originalPost = tags.filter { it.firstOrNull() == "e" }.mapNotNull { it.getOrNull(1) }
-    originalAuthor = tags.filter { it.firstOrNull() == "p" }.mapNotNull { it.getOrNull(1) }
-  }
+  fun originalPost() = tags.filter { it.firstOrNull() == "e" }.mapNotNull { it.getOrNull(1) }
+  fun originalAuthor() = tags.filter { it.firstOrNull() == "p" }.mapNotNull { it.getOrNull(1) }
+  fun taggedAddresses() = tags.filter { it.firstOrNull() == "a" }.mapNotNull { it.getOrNull(1) }.mapNotNull { ATag.parse(it) }
 
   companion object {
     const val kind = 7
@@ -34,11 +31,16 @@ class ReactionEvent (
     }
 
     fun create(content: String, originalNote: Event, privateKey: ByteArray, createdAt: Long = Date().time / 1000): ReactionEvent {
-      val pubKey = Utils.pubkeyCreate(privateKey)
-      val tags = listOf( listOf("e", originalNote.id.toHex()), listOf("p", originalNote.pubKey.toHex()))
+      val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
+
+      var tags = listOf( listOf("e", originalNote.id), listOf("p", originalNote.pubKey))
+      if (originalNote is LongTextNoteEvent) {
+        tags = tags + listOf( listOf("a", originalNote.address().toTag()) )
+      }
+
       val id = generateId(pubKey, createdAt, kind, tags, content)
       val sig = Utils.sign(id, privateKey)
-      return ReactionEvent(id, pubKey, createdAt, tags, content, sig)
+      return ReactionEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())
     }
   }
 }

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

@@ -0,0 +1,37 @@
+package com.vitorpamplona.amethyst.service.model
+
+import com.vitorpamplona.amethyst.model.HexKey
+import com.vitorpamplona.amethyst.model.toHexKey
+import java.net.URI
+import java.util.Date
+import nostr.postr.Utils
+
+class RecommendRelayEvent(
+    id: HexKey,
+    pubKey: HexKey,
+    createdAt: Long,
+    tags: List<List<String>>,
+    content: String,
+    sig: HexKey,
+    val lenient: Boolean = false
+): Event(id, pubKey, createdAt, kind, tags, content, sig) {
+
+    fun relay() = if (lenient)
+        URI.create(content.trim())
+    else
+        URI.create(content)
+
+
+    companion object {
+        const val kind = 2
+
+        fun create(relay: URI, privateKey: ByteArray, createdAt: Long = Date().time / 1000): RecommendRelayEvent {
+            val content = relay.toString()
+            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
+            val tags = listOf<List<String>>()
+            val id = generateId(pubKey, createdAt, kind, tags, content)
+            val sig = Utils.sign(id, privateKey)
+            return RecommendRelayEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())
+        }
+    }
+}

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

@@ -1,66 +1,95 @@
 package com.vitorpamplona.amethyst.service.model
 
-import androidx.compose.ui.text.toUpperCase
+import com.vitorpamplona.amethyst.model.HexKey
+import com.vitorpamplona.amethyst.model.toHexKey
 import java.util.Date
 import nostr.postr.Utils
-import nostr.postr.events.Event
 import nostr.postr.toHex
 
+data class ReportedKey(val key: String, val reportType: ReportEvent.ReportType)
+
 // NIP 56 event.
 class ReportEvent (
-  id: ByteArray,
-  pubKey: ByteArray,
+  id: HexKey,
+  pubKey: HexKey,
   createdAt: Long,
   tags: List<List<String>>,
   content: String,
-  sig: ByteArray
+  sig: HexKey
 ): Event(id, pubKey, createdAt, kind, tags, content, sig) {
 
-  @Transient val reportType: List<ReportType>
-  @Transient val reportedPost: List<String>
-  @Transient val reportedAuthor: List<String>
-
-  init {
-    reportType = tags.filter { it.firstOrNull() == "report" }.mapNotNull { it.getOrNull(1) }.map { ReportType.valueOf(it.toUpperCase()) }
-    reportedPost = tags.filter { it.firstOrNull() == "e" }.mapNotNull { it.getOrNull(1) }
-    reportedAuthor = tags.filter { it.firstOrNull() == "p" }.mapNotNull { it.getOrNull(1) }
+  private fun defaultReportType(): ReportType {
+    // Works with old and new structures for report.
+    var reportType = tags.filter { it.firstOrNull() == "report" }.mapNotNull { it.getOrNull(1) }.map { ReportType.valueOf(it.toUpperCase()) }.firstOrNull()
+    if (reportType == null) {
+      reportType = tags.mapNotNull { it.getOrNull(2) }.map { ReportType.valueOf(it.toUpperCase()) }.firstOrNull()
+    }
+    if (reportType == null) {
+      reportType = ReportType.SPAM
+    }
+    return reportType
   }
 
+  fun reportedPost() = tags
+    .filter { it.firstOrNull() == "e" && it.getOrNull(1) != null }
+    .map {
+      ReportedKey(
+        it[1],
+        it.getOrNull(2)?.toUpperCase()?.let { it1 -> ReportType.valueOf(it1) }?: defaultReportType()
+      )
+    }
+
+  fun reportedAuthor() = tags
+    .filter { it.firstOrNull() == "p" && it.getOrNull(1) != null }
+    .map {
+      ReportedKey(
+        it[1],
+        it.getOrNull(2)?.toUpperCase()?.let { it1 -> ReportType.valueOf(it1) }?: defaultReportType()
+      )
+    }
+
+  fun taggedAddresses() = tags.filter { it.firstOrNull() == "a" }.mapNotNull { it.getOrNull(1) }.mapNotNull { ATag.parse(it) }
+
   companion object {
     const val kind = 1984
 
     fun create(reportedPost: Event, type: ReportType, privateKey: ByteArray, createdAt: Long = Date().time / 1000): ReportEvent {
       val content = ""
 
-      val reportTypeTag = listOf("report", type.name.toLowerCase())
-      val reportPostTag = listOf("e", reportedPost.id.toHex())
-      val reportAuthorTag = listOf("p", reportedPost.pubKey.toHex())
+      val reportPostTag = listOf("e", reportedPost.id, type.name.toLowerCase())
+      val reportAuthorTag = listOf("p", reportedPost.pubKey, type.name.toLowerCase())
+
+      val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
+      var tags:List<List<String>> = listOf(reportPostTag, reportAuthorTag)
+
+      if (reportedPost is LongTextNoteEvent) {
+        tags = tags + listOf( listOf("a", reportedPost.address().toTag()) )
+      }
 
-      val pubKey = Utils.pubkeyCreate(privateKey)
-      val tags:List<List<String>> = listOf(reportTypeTag, reportPostTag, reportAuthorTag)
       val id = generateId(pubKey, createdAt, kind, tags, content)
       val sig = Utils.sign(id, privateKey)
-      return ReportEvent(id, pubKey, createdAt, tags, content, sig)
+      return ReportEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())
     }
 
     fun create(reportedUser: String, type: ReportType, privateKey: ByteArray, createdAt: Long = Date().time / 1000): ReportEvent {
       val content = ""
 
-      val reportTypeTag = listOf("report", type.name.toLowerCase())
-      val reportAuthorTag = listOf("p", reportedUser)
+      val reportAuthorTag = listOf("p", reportedUser, type.name.toLowerCase())
 
-      val pubKey = Utils.pubkeyCreate(privateKey)
-      val tags:List<List<String>> = listOf(reportTypeTag, reportAuthorTag)
+      val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
+      val tags:List<List<String>> = listOf(reportAuthorTag)
       val id = generateId(pubKey, createdAt, kind, tags, content)
       val sig = Utils.sign(id, privateKey)
-      return ReportEvent(id, pubKey, createdAt, tags, content, sig)
+      return ReportEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())
     }
   }
 
   enum class ReportType() {
-    EXPLICIT,
+    EXPLICIT, // Not used anymore.
     ILLEGAL,
     SPAM,
-    IMPERSONATION
+    IMPERSONATION,
+    NUDITY,
+    PROFANITY,
   }
 }

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

@@ -1,33 +1,30 @@
 package com.vitorpamplona.amethyst.service.model
 
+import com.vitorpamplona.amethyst.model.HexKey
+import com.vitorpamplona.amethyst.model.toHexKey
 import com.vitorpamplona.amethyst.service.relays.Client
 import java.util.Date
 import nostr.postr.Utils
-import nostr.postr.events.Event
 import nostr.postr.toHex
 
 class RepostEvent (
-  id: ByteArray,
-  pubKey: ByteArray,
+  id: HexKey,
+  pubKey: HexKey,
   createdAt: Long,
   tags: List<List<String>>,
   content: String,
-  sig: ByteArray
+  sig: HexKey
 ): Event(id, pubKey, createdAt, kind, tags, content, sig) {
 
-  @Transient val boostedPost: List<String>
-  @Transient val originalAuthor: List<String>
-  @Transient val containedPost: Event?
 
-  init {
-    boostedPost = tags.filter { it.firstOrNull() == "e" }.mapNotNull { it.getOrNull(1) }
-    originalAuthor = tags.filter { it.firstOrNull() == "p" }.mapNotNull { it.getOrNull(1) }
+  fun boostedPost() = tags.filter { it.firstOrNull() == "e" }.mapNotNull { it.getOrNull(1) }
+  fun originalAuthor() = tags.filter { it.firstOrNull() == "p" }.mapNotNull { it.getOrNull(1) }
+  fun taggedAddresses() = tags.filter { it.firstOrNull() == "a" }.mapNotNull { it.getOrNull(1) }.mapNotNull { ATag.parse(it) }
 
-    containedPost = try {
-      fromJson(content, Client.lenient)
-    } catch (e: Exception) {
-      null
-    }
+  fun containedPost() = try {
+    fromJson(content, Client.lenient)
+  } catch (e: Exception) {
+    null
   }
 
   companion object {
@@ -36,14 +33,19 @@ class RepostEvent (
     fun create(boostedPost: Event, privateKey: ByteArray, createdAt: Long = Date().time / 1000): RepostEvent {
       val content = boostedPost.toJson()
 
-      val replyToPost = listOf("e", boostedPost.id.toHex())
-      val replyToAuthor = listOf("p", boostedPost.pubKey.toHex())
+      val replyToPost = listOf("e", boostedPost.id)
+      val replyToAuthor = listOf("p", boostedPost.pubKey)
+
+      val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
+      var tags:List<List<String>> = boostedPost.tags.plus(listOf(replyToPost, replyToAuthor))
+
+      if (boostedPost is LongTextNoteEvent) {
+        tags = tags + listOf( listOf("a", boostedPost.address().toTag()) )
+      }
 
-      val pubKey = Utils.pubkeyCreate(privateKey)
-      val tags:List<List<String>> = boostedPost.tags.plus(listOf(replyToPost, replyToAuthor))
       val id = generateId(pubKey, createdAt, kind, tags, content)
       val sig = Utils.sign(id, privateKey)
-      return RepostEvent(id, pubKey, createdAt, tags, content, sig)
+      return RepostEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())
     }
   }
 }

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

@@ -0,0 +1,40 @@
+package com.vitorpamplona.amethyst.service.model
+
+import com.vitorpamplona.amethyst.model.HexKey
+import com.vitorpamplona.amethyst.model.toHexKey
+import java.util.Date
+import nostr.postr.Utils
+
+class TextNoteEvent(
+    id: HexKey,
+    pubKey: HexKey,
+    createdAt: Long,
+    tags: List<List<String>>,
+    content: String,
+    sig: HexKey
+): Event(id, pubKey, createdAt, kind, tags, content, sig) {
+    fun mentions() = tags.filter { it.firstOrNull() == "p" }.mapNotNull { it.getOrNull(1) }
+    fun taggedAddresses() = tags.filter { it.firstOrNull() == "a" }.mapNotNull { it.getOrNull(1) }.mapNotNull { ATag.parse(it) }
+    fun replyTos() = tags.filter { it.firstOrNull() == "e" }.mapNotNull { it.getOrNull(1) }
+
+    companion object {
+        const val kind = 1
+
+        fun create(msg: String, replyTos: List<String>?, mentions: List<String>?, addresses: List<ATag>?, privateKey: ByteArray, createdAt: Long = Date().time / 1000): TextNoteEvent {
+            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
+            val tags = mutableListOf<List<String>>()
+            replyTos?.forEach {
+                tags.add(listOf("e", it))
+            }
+            mentions?.forEach {
+                tags.add(listOf("p", it))
+            }
+            addresses?.forEach {
+                tags.add(listOf("a", it.toTag()))
+            }
+            val id = generateId(pubKey, createdAt, kind, tags, msg)
+            val sig = Utils.sign(id, privateKey)
+            return TextNoteEvent(id.toHexKey(), pubKey, createdAt, tags, msg, sig.toHexKey())
+        }
+    }
+}

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

@@ -4,7 +4,7 @@ import java.util.UUID
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
-import nostr.postr.events.Event
+import com.vitorpamplona.amethyst.service.model.Event
 
 /**
  * The Nostr Client manages multiple personae the user may switch between. Events are received and
@@ -38,9 +38,7 @@ object Client: RelayPool.Listener {
         if (relays.size != newRelayConfig.size) return false
 
         relays.forEach { oldRelayInfo ->
-            val newRelayInfo = newRelayConfig.find { it.url == oldRelayInfo.url }
-
-            if (newRelayInfo == null) return false
+            val newRelayInfo = newRelayConfig.find { it.url == oldRelayInfo.url } ?: return false
 
             if (!oldRelayInfo.isSameRelayConfig(newRelayInfo)) return false
         }

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

@@ -1,16 +0,0 @@
-package com.vitorpamplona.amethyst.service.relays
-
-import fr.acinq.secp256k1.Secp256k1
-import nostr.postr.events.Event
-import nostr.postr.events.generateId
-
-fun Event.hasValidSignature(): Boolean {
-  if (!id.contentEquals(generateId())) {
-    return false
-  }
-  if (!Secp256k1.get().verifySchnorr(sig, id, pubKey)) {
-    return false
-  }
-
-  return true
-}

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

@@ -3,8 +3,7 @@ package com.vitorpamplona.amethyst.service.relays
 import android.util.Log
 import com.google.gson.JsonElement
 import java.util.Date
-import java.util.concurrent.TimeUnit
-import nostr.postr.events.Event
+import com.vitorpamplona.amethyst.service.model.Event
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
@@ -89,7 +88,7 @@ class Relay(
                             "NOTICE" -> listeners.forEach {
                                 //Log.w("Relay", "Relay onNotice $url, $channel")
                                 // "channel" being the second string in the string array ...
-                                it.onError(this@Relay, channel, Error("Relay sent notice: $channel"))
+                                it.onError(this@Relay, channel, Error("Relay sent notice: " + channel))
                             }
                             "OK" -> listeners.forEach {
                                 //Log.w("Relay", "Relay onOK $url, $channel")

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

@@ -5,7 +5,7 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
-import nostr.postr.events.Event
+import com.vitorpamplona.amethyst.service.model.Event
 
 /**
  * RelayPool manages the connection to multiple Relays and lets consumers deal with simple events.
@@ -94,7 +94,6 @@ object RelayPool: Relay.Listener {
         fun onSendResponse(eventId: String, success: Boolean, message: String, relay: Relay)
     }
 
-    @Synchronized
     override fun onEvent(relay: Relay, subscriptionId: String, event: Event) {
         listeners.forEach { it.onEvent(event, subscriptionId, relay) }
     }

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

@@ -1,6 +1,5 @@
 package com.vitorpamplona.amethyst.service.relays
 
-import com.google.gson.Gson
 import com.google.gson.GsonBuilder
 import com.google.gson.JsonArray
 import com.google.gson.JsonObject

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

@@ -21,7 +21,6 @@ import com.vitorpamplona.amethyst.service.relays.Client
 import com.vitorpamplona.amethyst.ui.screen.AccountScreen
 import com.vitorpamplona.amethyst.ui.screen.AccountStateViewModel
 import com.vitorpamplona.amethyst.ui.theme.AmethystTheme
-import java.util.*
 
 class MainActivity : ComponentActivity() {
   override fun onCreate(savedInstanceState: Bundle?) {

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

@@ -17,18 +17,17 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.input.KeyboardCapitalization
 import androidx.compose.ui.text.style.TextDirection
 import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
 import androidx.compose.ui.window.Dialog
 import androidx.compose.ui.window.DialogProperties
 import androidx.lifecycle.viewmodel.compose.viewModel
+import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.Channel
-import com.vitorpamplona.amethyst.ui.screen.AccountStateViewModel
-import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 
 @Composable
 fun NewChannelView(onClose: () -> Unit, account: Account, channel: Channel? = null) {
@@ -71,13 +70,13 @@ fun NewChannelView(onClose: () -> Unit, account: Account, channel: Channel? = nu
                 Spacer(modifier = Modifier.height(15.dp))
 
                 OutlinedTextField(
-                    label = { Text(text = "Channel Name") },
+                    label = { Text(text = stringResource(R.string.channel_name)) },
                     modifier = Modifier.fillMaxWidth(),
                     value = postViewModel.channelName.value,
                     onValueChange = { postViewModel.channelName.value = it },
                     placeholder = {
                         Text(
-                            text = "My Awesome Group",
+                            text = stringResource(R.string.my_awesome_group),
                             color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
                         )
                     },
@@ -90,7 +89,7 @@ fun NewChannelView(onClose: () -> Unit, account: Account, channel: Channel? = nu
                 Spacer(modifier = Modifier.height(15.dp))
 
                 OutlinedTextField(
-                    label = { Text(text = "Picture Url") },
+                    label = { Text(text = stringResource(R.string.picture_url)) },
                     modifier = Modifier.fillMaxWidth(),
                     value = postViewModel.channelPicture.value,
                     onValueChange = { postViewModel.channelPicture.value = it },
@@ -105,13 +104,13 @@ fun NewChannelView(onClose: () -> Unit, account: Account, channel: Channel? = nu
                 Spacer(modifier = Modifier.height(15.dp))
 
                 OutlinedTextField(
-                    label = { Text(text = "Description") },
+                    label = { Text(text = stringResource(R.string.description)) },
                     modifier = Modifier.fillMaxWidth().height(100.dp),
                     value = postViewModel.channelDescription.value,
                     onValueChange = { postViewModel.channelDescription.value = it },
                     placeholder = {
                         Text(
-                            text = "About us.. ",
+                            text = stringResource(R.string.about_us),
                             color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
                         )
                     },

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

@@ -4,12 +4,8 @@ import android.content.Context
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.ui.text.input.TextFieldValue
 import androidx.lifecycle.ViewModel
-import com.vitorpamplona.amethyst.LocalPreferences
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.Channel
-import com.vitorpamplona.amethyst.ui.screen.AccountStateViewModel
-import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
-import nostr.postr.toHex
 
 class NewChannelViewModel: ViewModel() {
     private var account: Account? = null

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

@@ -25,6 +25,7 @@ import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalSoftwareKeyboardController
 import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.input.KeyboardCapitalization
 import androidx.compose.ui.text.style.TextDirection
 import androidx.compose.ui.unit.dp
@@ -38,9 +39,9 @@ import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.ui.components.*
 import com.vitorpamplona.amethyst.ui.navigation.UploadFromGallery
 import com.vitorpamplona.amethyst.ui.note.ReplyInformation
-import com.vitorpamplona.amethyst.ui.screen.UserLine
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.UserLine
 import kotlinx.coroutines.delay
-import nostr.postr.events.TextNoteEvent
+import com.vitorpamplona.amethyst.service.model.TextNoteEvent
 
 
 @OptIn(ExperimentalComposeUiApi::class)
@@ -108,7 +109,7 @@ fun NewPostView(onClose: () -> Unit, baseReplyTo: Note? = null, quote: Note? = n
                     ) {
                         Column(modifier = Modifier.fillMaxWidth().verticalScroll(scroolState)) {
                             if (postViewModel.replyTos != null && baseReplyTo?.event is TextNoteEvent) {
-                                ReplyInformation(postViewModel.replyTos, postViewModel.mentions, "✖ ") {
+                                ReplyInformation(postViewModel.replyTos, postViewModel.mentions, account, "✖ ") {
                                     postViewModel.removeFromReplyList(it)
                                 }
                             }
@@ -136,7 +137,7 @@ fun NewPostView(onClose: () -> Unit, baseReplyTo: Note? = null, quote: Note? = n
                                     },
                                 placeholder = {
                                     Text(
-                                        text = "What's on your mind?",
+                                        text = stringResource(R.string.what_s_on_your_mind),
                                         color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
                                     )
                                 },
@@ -221,7 +222,7 @@ fun CloseButton(onCancel: () -> Unit) {
                 backgroundColor = Color.Gray
             )
     ) {
-        Text(text = "Cancel", color = Color.White)
+        Text(text = stringResource(R.string.cancel), color = Color.White)
     }
 }
 
@@ -240,7 +241,7 @@ fun PostButton(onPost: () -> Unit = {}, isActive: Boolean, modifier: Modifier =
                 backgroundColor = if (isActive) MaterialTheme.colors.primary else Color.Gray
             )
     ) {
-        Text(text = "Post", color = Color.White)
+        Text(text = stringResource(R.string.post), color = Color.White)
     }
 }
 
@@ -259,7 +260,7 @@ fun SaveButton(onPost: () -> Unit = {}, isActive: Boolean, modifier: Modifier =
                 backgroundColor = if (isActive) MaterialTheme.colors.primary else Color.Gray
             )
     ) {
-        Text(text = "Save", color = Color.White)
+        Text(text = stringResource(R.string.save), color = Color.White)
     }
 }
 
@@ -278,7 +279,7 @@ fun CreateButton(onPost: () -> Unit = {}, isActive: Boolean, modifier: Modifier
                 backgroundColor = if (isActive) MaterialTheme.colors.primary else Color.Gray
             )
     ) {
-        Text(text = "Create", color = Color.White)
+        Text(text = stringResource(R.string.create), color = Color.White)
     }
 }
 

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

@@ -14,7 +14,6 @@ import com.vitorpamplona.amethyst.ui.components.isValidURL
 import com.vitorpamplona.amethyst.ui.components.noProtocolUrlValidator
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.launch
-import nostr.postr.toNpub
 
 class NewPostViewModel: ViewModel() {
     private var account: Account? = null
@@ -42,7 +41,6 @@ class NewPostViewModel: ViewModel() {
                 } else {
                     this.mentions = currentMentions.plus(replyUser)
                 }
-
             }
         }
 
@@ -64,12 +62,12 @@ class NewPostViewModel: ViewModel() {
 
     fun tagIndex(user: User): Int {
         // Postr Events assembles replies before mentions in the tag order
-        return (if (originalNote?.channel != null) 1 else 0) + (replyTos?.size ?: 0) + (mentions?.indexOf(user) ?: 0)
+        return (if (originalNote?.channel() != null) 1 else 0) + (replyTos?.size ?: 0) + (mentions?.indexOf(user) ?: 0)
     }
 
     fun tagIndex(note: Note): Int {
         // Postr Events assembles replies before mentions in the tag order
-        return (if (originalNote?.channel != null) 1 else 0) + (replyTos?.indexOf(note) ?: 0)
+        return (if (originalNote?.channel() != null) 1 else 0) + (replyTos?.indexOf(note) ?: 0)
     }
 
     fun sendPost() {
@@ -104,8 +102,8 @@ class NewPostViewModel: ViewModel() {
             }.joinToString(" ")
         }.joinToString("\n")
 
-        if (originalNote?.channel != null) {
-            account?.sendChannelMeesage(newMessage, originalNote!!.channel!!.idHex, originalNote!!, mentions)
+        if (originalNote?.channel() != null) {
+            account?.sendChannelMessage(newMessage, originalNote!!.channel()!!.idHex, originalNote!!, mentions)
         } else {
             account?.sendPost(newMessage, replyTos, mentions)
         }

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

@@ -41,6 +41,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
@@ -141,7 +142,7 @@ fun ServerConfigHeader() {
             Column(Modifier.weight(1f)) {
                 Row(verticalAlignment = Alignment.CenterVertically) {
                     Text(
-                        text = "Relay Address",
+                        text = stringResource(R.string.relay_address),
                         modifier = Modifier.weight(1f),
                         maxLines = 1,
                         overflow = TextOverflow.Ellipsis
@@ -154,7 +155,7 @@ fun ServerConfigHeader() {
                     Spacer(modifier = Modifier.size(25.dp))
 
                     Text(
-                        text = "Posts",
+                        text = stringResource(R.string.posts),
                         maxLines = 1,
                         fontSize = 14.sp,
                         modifier = Modifier.weight(1f),
@@ -164,7 +165,7 @@ fun ServerConfigHeader() {
                     Spacer(modifier = Modifier.size(10.dp))
 
                     Text(
-                        text = "Posts",
+                        text = stringResource(id = R.string.posts),
                         maxLines = 1,
                         fontSize = 14.sp,
                         modifier = Modifier.weight(1f),
@@ -174,7 +175,7 @@ fun ServerConfigHeader() {
                     Spacer(modifier = Modifier.size(10.dp))
 
                     Text(
-                        text = "Errors",
+                        text = stringResource(R.string.errors),
                         maxLines = 1,
                         fontSize = 14.sp,
                         modifier = Modifier.weight(1f),
@@ -227,7 +228,9 @@ fun ServerConfig(
                     Icon(
                         imageVector = Icons.Default.Cancel,
                         null,
-                        modifier = Modifier.padding(end = 5.dp).size(15.dp),
+                        modifier = Modifier
+                            .padding(end = 5.dp)
+                            .size(15.dp),
                         tint = Color.Red
                     )
                 }
@@ -252,8 +255,10 @@ fun ServerConfig(
                             ) {
                                 Icon(
                                     painterResource(R.drawable.ic_home),
-                                    "Home Feed",
-                                    modifier = Modifier.padding(end = 5.dp).size(15.dp),
+                                    stringResource(R.string.home_feed),
+                                    modifier = Modifier
+                                        .padding(end = 5.dp)
+                                        .size(15.dp),
                                     tint = if (item.feedTypes.contains(FeedType.FOLLOWS)) Color.Green else MaterialTheme.colors.onSurface.copy(
                                         alpha = 0.32f
                                     )
@@ -265,8 +270,10 @@ fun ServerConfig(
                             ) {
                                 Icon(
                                     painterResource(R.drawable.ic_dm),
-                                    "Private Message Feed",
-                                    modifier = Modifier.padding(horizontal = 5.dp).size(15.dp),
+                                    stringResource(R.string.private_message_feed),
+                                    modifier = Modifier
+                                        .padding(horizontal = 5.dp)
+                                        .size(15.dp),
                                     tint = if (item.feedTypes.contains(FeedType.PRIVATE_DMS)) Color.Green else MaterialTheme.colors.onSurface.copy(
                                         alpha = 0.32f
                                     )
@@ -278,8 +285,10 @@ fun ServerConfig(
                             ) {
                                 Icon(
                                     imageVector = Icons.Default.Groups,
-                                    "Public Chat Feed",
-                                    modifier = Modifier.padding(horizontal = 5.dp).size(15.dp),
+                                    stringResource(R.string.public_chat_feed),
+                                    modifier = Modifier
+                                        .padding(horizontal = 5.dp)
+                                        .size(15.dp),
                                     tint = if (item.feedTypes.contains(FeedType.PUBLIC_CHATS)) Color.Green else MaterialTheme.colors.onSurface.copy(
                                         alpha = 0.32f
                                     )
@@ -291,8 +300,10 @@ fun ServerConfig(
                             ) {
                                 Icon(
                                     imageVector = Icons.Default.Public,
-                                    "Global Feed",
-                                    modifier = Modifier.padding(horizontal = 5.dp).size(15.dp),
+                                    stringResource(R.string.global_feed),
+                                    modifier = Modifier
+                                        .padding(horizontal = 5.dp)
+                                        .size(15.dp),
                                     tint = if (item.feedTypes.contains(FeedType.GLOBAL)) Color.Green else MaterialTheme.colors.onSurface.copy(
                                         alpha = 0.32f
                                     )
@@ -310,7 +321,9 @@ fun ServerConfig(
                                 Icon(
                                     imageVector = Icons.Default.Download,
                                     null,
-                                    modifier = Modifier.padding(horizontal = 5.dp).size(15.dp),
+                                    modifier = Modifier
+                                        .padding(horizontal = 5.dp)
+                                        .size(15.dp),
                                     tint = if (item.read) Color.Green else MaterialTheme.colors.onSurface.copy(
                                         alpha = 0.32f
                                     )
@@ -332,7 +345,9 @@ fun ServerConfig(
                                 Icon(
                                     imageVector = Icons.Default.Upload,
                                     null,
-                                    modifier = Modifier.padding(horizontal = 5.dp).size(15.dp),
+                                    modifier = Modifier
+                                        .padding(horizontal = 5.dp)
+                                        .size(15.dp),
                                     tint = if (item.write) Color.Green else MaterialTheme.colors.onSurface.copy(
                                         alpha = 0.32f
                                     )
@@ -350,7 +365,9 @@ fun ServerConfig(
                             Icon(
                                 imageVector = Icons.Default.SyncProblem,
                                 null,
-                                modifier = Modifier.padding(horizontal = 5.dp).size(15.dp),
+                                modifier = Modifier
+                                    .padding(horizontal = 5.dp)
+                                    .size(15.dp),
                                 tint = if (item.errorCount > 0) Color.Yellow else Color.Green
                             )
 
@@ -396,7 +413,7 @@ fun EditableServerConfig(relayToAdd: String, onNewRelay: (RelaySetupInfo) -> Uni
 
     Row(verticalAlignment = Alignment.CenterVertically) {
         OutlinedTextField(
-            label = { Text(text = "Add a Relay") },
+            label = { Text(text = stringResource(R.string.add_a_relay)) },
             modifier =  Modifier.weight(1f),
             value = url,
             onValueChange = { url = it },
@@ -449,7 +466,7 @@ fun EditableServerConfig(relayToAdd: String, onNewRelay: (RelaySetupInfo) -> Uni
                     backgroundColor = if (url.isNotBlank()) MaterialTheme.colors.primary else MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
                 )
         ) {
-            Text(text = "Add", color = Color.White)
+            Text(text = stringResource(id = R.string.add), color = Color.White)
         }
 
     }

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

@@ -2,7 +2,6 @@ package com.vitorpamplona.amethyst.ui.actions
 
 import android.content.Context
 import androidx.lifecycle.ViewModel
-import com.vitorpamplona.amethyst.LocalPreferences
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.RelaySetupInfo
 import com.vitorpamplona.amethyst.service.relays.FeedType

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

@@ -17,15 +17,14 @@ import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.input.KeyboardCapitalization
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.Dialog
 import androidx.compose.ui.window.DialogProperties
 import androidx.lifecycle.viewmodel.compose.viewModel
+import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.model.Account
-import com.vitorpamplona.amethyst.model.Channel
-import com.vitorpamplona.amethyst.ui.screen.AccountStateViewModel
-import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 
 @OptIn(ExperimentalComposeUiApi::class)
 @Composable
@@ -64,7 +63,7 @@ fun NewUserMetadataView(onClose: () -> Unit, account: Account) {
                             postViewModel.create()
                             onClose()
                         },
-                        postViewModel.userName.value.isNotBlank()
+                        true
                     )
                 }
 
@@ -72,13 +71,13 @@ fun NewUserMetadataView(onClose: () -> Unit, account: Account) {
 
                 Row(modifier = Modifier.fillMaxWidth(1f), verticalAlignment = Alignment.CenterVertically) {
                     OutlinedTextField(
-                        label = { Text(text = "Display Name") },
+                        label = { Text(text = stringResource(R.string.display_name)) },
                         modifier =  Modifier.weight(1f),
                         value = postViewModel.displayName.value,
                         onValueChange = { postViewModel.displayName.value = it },
                         placeholder = {
                             Text(
-                                text = "My display name",
+                                text = stringResource(R.string.my_display_name),
                                 color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
                             )
                         },
@@ -91,13 +90,13 @@ fun NewUserMetadataView(onClose: () -> Unit, account: Account) {
                     Text("@", Modifier.padding(5.dp))
 
                     OutlinedTextField(
-                        label = { Text(text = "Username") },
+                        label = { Text(text = stringResource(R.string.username)) },
                         modifier = Modifier.weight(1f),
                         value = postViewModel.userName.value,
                         onValueChange = { postViewModel.userName.value = it },
                         placeholder = {
                             Text(
-                                text = "My username",
+                                text = stringResource(R.string.my_username),
                                 color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
                             )
                         },
@@ -108,7 +107,7 @@ fun NewUserMetadataView(onClose: () -> Unit, account: Account) {
                 Spacer(modifier = Modifier.height(10.dp))
 
                 OutlinedTextField(
-                    label = { Text(text = "About me") },
+                    label = { Text(text = stringResource(R.string.about_me)) },
                     modifier = Modifier
                         .fillMaxWidth()
                         .height(100.dp),
@@ -116,7 +115,7 @@ fun NewUserMetadataView(onClose: () -> Unit, account: Account) {
                     onValueChange = { postViewModel.about.value = it },
                     placeholder = {
                         Text(
-                            text = "About me",
+                            text = stringResource(id = R.string.about_me),
                             color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
                         )
                     },
@@ -129,7 +128,7 @@ fun NewUserMetadataView(onClose: () -> Unit, account: Account) {
                 Spacer(modifier = Modifier.height(10.dp))
 
                 OutlinedTextField(
-                    label = { Text(text = "Avatar URL") },
+                    label = { Text(text = stringResource(R.string.avatar_url)) },
                     modifier = Modifier.fillMaxWidth(),
                     value = postViewModel.picture.value,
                     onValueChange = { postViewModel.picture.value = it },
@@ -145,7 +144,7 @@ fun NewUserMetadataView(onClose: () -> Unit, account: Account) {
                 Spacer(modifier = Modifier.height(10.dp))
 
                 OutlinedTextField(
-                    label = { Text(text = "Banner URL") },
+                    label = { Text(text = stringResource(R.string.banner_url)) },
                     modifier = Modifier.fillMaxWidth(),
                     value = postViewModel.banner.value,
                     onValueChange = { postViewModel.banner.value = it },
@@ -161,7 +160,7 @@ fun NewUserMetadataView(onClose: () -> Unit, account: Account) {
                 Spacer(modifier = Modifier.height(10.dp))
 
                 OutlinedTextField(
-                    label = { Text(text = "Website URL") },
+                    label = { Text(text = stringResource(R.string.website_url)) },
                     modifier = Modifier.fillMaxWidth(),
                     value = postViewModel.website.value,
                     onValueChange = { postViewModel.website.value = it },
@@ -177,7 +176,7 @@ fun NewUserMetadataView(onClose: () -> Unit, account: Account) {
                 Spacer(modifier = Modifier.height(10.dp))
 
                 OutlinedTextField(
-                    label = { Text(text = "NIP-05") },
+                    label = { Text(text = stringResource(R.string.nip_05)) },
                     modifier = Modifier.fillMaxWidth(),
                     value = postViewModel.nip05.value,
                     onValueChange = { postViewModel.nip05.value = it },
@@ -192,7 +191,7 @@ fun NewUserMetadataView(onClose: () -> Unit, account: Account) {
 
                 Spacer(modifier = Modifier.height(10.dp))
                 OutlinedTextField(
-                    label = { Text(text = "LN Address") },
+                    label = { Text(text = stringResource(R.string.ln_address)) },
                     modifier = Modifier.fillMaxWidth(),
                     value = postViewModel.lnAddress.value,
                     onValueChange = { postViewModel.lnAddress.value = it },
@@ -208,13 +207,13 @@ fun NewUserMetadataView(onClose: () -> Unit, account: Account) {
                 Spacer(modifier = Modifier.height(10.dp))
 
                 OutlinedTextField(
-                    label = { Text(text = "LN URL (outdated)") },
+                    label = { Text(text = stringResource(R.string.ln_url_outdated)) },
                     modifier = Modifier.fillMaxWidth(),
                     value = postViewModel.lnURL.value,
                     onValueChange = { postViewModel.lnURL.value = it },
                     placeholder = {
                         Text(
-                            text = "LNURL...",
+                            text = stringResource(R.string.lnurl),
                             color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
                         )
                     },

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

@@ -11,10 +11,12 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import com.google.accompanist.permissions.ExperimentalPermissionsApi
 import com.google.accompanist.permissions.isGranted
 import com.google.accompanist.permissions.rememberPermissionState
+import com.vitorpamplona.amethyst.R
 import kotlinx.coroutines.launch
 
 /**
@@ -29,6 +31,7 @@ fun SaveToGallery(url: String) {
     val localContext = LocalContext.current
     val scope = rememberCoroutineScope()
 
+
     fun saveImage() {
         ImageSaver.saveImage(
             context = localContext,
@@ -37,7 +40,7 @@ fun SaveToGallery(url: String) {
                 scope.launch {
                     Toast.makeText(
                         localContext,
-                        "Image saved to the gallery",
+                        localContext.getString(R.string.image_saved_to_the_gallery),
                         Toast.LENGTH_SHORT
                     )
                         .show()
@@ -47,7 +50,7 @@ fun SaveToGallery(url: String) {
                 scope.launch {
                     Toast.makeText(
                         localContext,
-                        "Failed to save the image",
+                        localContext.getString(R.string.failed_to_save_the_image),
                         Toast.LENGTH_SHORT
                     )
                         .show()
@@ -78,6 +81,6 @@ fun SaveToGallery(url: String) {
                 backgroundColor = Color.Gray
             )
     ) {
-        Text(text = "Save", color = Color.White)
+        Text(text = stringResource(id = R.string.save), color = Color.White)
     }
 }

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

@@ -12,10 +12,12 @@ import androidx.compose.material.Text
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import com.google.accompanist.permissions.ExperimentalPermissionsApi
 import com.google.accompanist.permissions.isGranted
 import com.google.accompanist.permissions.rememberPermissionState
+import com.vitorpamplona.amethyst.R
 
 @OptIn(ExperimentalPermissionsApi::class)
 @Composable
@@ -54,9 +56,9 @@ fun UploadFromGallery(
                     }
                 ) {
                     if (!isUploading) {
-                        Text("Upload Image")
+                        Text(stringResource(R.string.upload_image))
                     } else {
-                        Text("Uploading…")
+                        Text(stringResource(R.string.uploading))
                     }
                 }
             }
@@ -68,9 +70,9 @@ fun UploadFromGallery(
                 enabled = !isUploading,
             ) {
                 if (!isUploading) {
-                    Text("Upload Image")
+                    Text(stringResource(R.string.upload_image))
                 } else {
-                    Text("Uploading…")
+                    Text(stringResource(R.string.uploading))
                 }
             }
         }

app/src/main/java/com/vitorpamplona/amethyst/ui/buttons/NewChannelButton.kt

@@ -9,8 +9,6 @@ import androidx.compose.material.MaterialTheme
 import androidx.compose.material.OutlinedButton
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.Add
-import androidx.compose.material.icons.outlined.Visibility
-import androidx.compose.material.icons.outlined.VisibilityOff
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
@@ -18,14 +16,11 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.ui.actions.NewChannelView
-import com.vitorpamplona.amethyst.ui.actions.NewPostView
-import com.vitorpamplona.amethyst.ui.screen.AccountStateViewModel
-import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 
 @Composable
 fun NewChannelButton(account: Account) {
@@ -45,7 +40,7 @@ fun NewChannelButton(account: Account) {
     ) {
         Icon(
             imageVector = Icons.Outlined.Add,
-            contentDescription = "New Channel",
+            contentDescription = stringResource(R.string.new_channel),
             modifier = Modifier.size(26.dp),
             tint = Color.White
         )

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

@@ -11,14 +11,22 @@ import androidx.compose.ui.graphics.painter.Painter
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.unit.Dp
-import androidx.compose.ui.unit.dp
 import coil.compose.AsyncImage
 import coil.compose.AsyncImagePainter
 import coil.compose.LocalImageLoader
-import java.net.URLEncoder
 import java.util.Base64
 
-data class ResizeImage(val url: String?, val size: Dp)
+data class ResizeImage(val url: String?, val size: Dp) {
+  fun proxyUrl(): String? {
+    if (url == null) return null
+
+    // Fixes Image size to reduce pings to servers for each size used in the app
+    val imgPx = 200 // with(LocalDensity.current) { model.size.toPx().toInt() }
+    val base64 = Base64.getUrlEncoder().encodeToString(url.toByteArray())
+
+    return "https://d12fidohs5rlxk.cloudfront.net/preset:sharp/rs:fit:$imgPx:$imgPx:0/gravity:sm/$base64"
+  }
+}
 
 
 @Composable
@@ -42,7 +50,6 @@ fun AsyncImageProxy(
     AsyncImage(
       model = model.url,
       contentDescription = contentDescription,
-      imageLoader = LocalImageLoader.current,
       modifier = modifier,
       placeholder = placeholder,
       error = error,
@@ -57,14 +64,9 @@ fun AsyncImageProxy(
       filterQuality = filterQuality
     )
   } else {
-    val imgPx = with(LocalDensity.current) { model.size.toPx().toInt() }
-    val base64 = Base64.getUrlEncoder().encodeToString(model.url.toByteArray())
-    val extension = model.url.split(".").lastOrNull()
-
     AsyncImage(
-      model = "https://d12fidohs5rlxk.cloudfront.net/preset:sharp/rs:fit:$imgPx:$imgPx:0/gravity:sm/$base64",
+      model = model.proxyUrl(),
       contentDescription = contentDescription,
-      imageLoader = LocalImageLoader.current,
       modifier = modifier,
       placeholder = placeholder,
       error = error,

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

@@ -8,7 +8,6 @@ import androidx.compose.material.LocalTextStyle
 import androidx.compose.material.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.platform.LocalUriHandler
 import androidx.compose.ui.text.AnnotatedString
 
 @Composable

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

@@ -4,12 +4,9 @@ import androidx.compose.foundation.text.ClickableText
 import androidx.compose.material.LocalTextStyle
 import androidx.compose.material.MaterialTheme
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.livedata.observeAsState
 import androidx.compose.ui.text.AnnotatedString
 import androidx.navigation.NavController
 import com.vitorpamplona.amethyst.model.Note
-import com.vitorpamplona.amethyst.model.toNote
 import com.vitorpamplona.amethyst.ui.note.toShortenHex
 
 @Composable

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

@@ -1,6 +1,5 @@
 package com.vitorpamplona.amethyst.ui.components
 
-import android.content.ActivityNotFoundException
 import android.content.Context
 import android.content.Intent
 import android.net.Uri
@@ -9,7 +8,6 @@ import androidx.compose.material.LocalTextStyle
 import androidx.compose.material.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.platform.LocalUriHandler
 import androidx.compose.ui.text.AnnotatedString
 
 @Composable

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

@@ -42,10 +42,10 @@ fun ClickableRoute(
         onClick = { navController.navigate("Channel/${nip19.hex}") },
         style = LocalTextStyle.current.copy(color = MaterialTheme.colors.primary)
       )
-    } else if (note.channel != null) {
+    } else if (note.channel() != null) {
       ClickableText(
-        text = AnnotatedString("@${note.channel?.toBestDisplayName()} "),
-        onClick = { navController.navigate("Channel/${note.channel?.idHex}") },
+        text = AnnotatedString("@${note.channel()?.toBestDisplayName()} "),
+        onClick = { navController.navigate("Channel/${note.channel()?.idHex}") },
         style = LocalTextStyle.current.copy(color = MaterialTheme.colors.primary)
       )
     } else {

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

@@ -13,6 +13,7 @@ import androidx.compose.material.ButtonDefaults
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
@@ -22,9 +23,13 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Brush
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.compositeOver
+import androidx.compose.ui.platform.LocalLayoutDirection
 import androidx.compose.ui.unit.dp
 import androidx.navigation.NavController
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
+import com.vitorpamplona.amethyst.R
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.LayoutDirection
 
 @Composable
 fun ExpandableRichTextViewer(
@@ -41,7 +46,17 @@ fun ExpandableRichTextViewer(
   val text = if (showFullText) content else content.take(350)
 
   Box(contentAlignment = Alignment.BottomCenter) {
-    RichTextViewer(text, canPreview, modifier, tags, backgroundColor, accountViewModel, navController)
+    //CompositionLocalProvider(LocalLayoutDirection provides LayoutDirection.Rtl) {
+      RichTextViewer(
+        text,
+        canPreview,
+        modifier,
+        tags,
+        backgroundColor,
+        accountViewModel,
+        navController
+      )
+    //}
 
     if (content.length > 350 && !showFullText) {
       Row(
@@ -67,7 +82,7 @@ fun ExpandableRichTextViewer(
           ),
           contentPadding = PaddingValues(vertical = 6.dp, horizontal = 16.dp)
         ) {
-          Text(text = "Show More", color = Color.White)
+          Text(text = stringResource(R.string.show_more), color = Color.White)
         }
       }
     }

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

@@ -9,35 +9,26 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material.Button
 import androidx.compose.material.ButtonDefaults
 import androidx.compose.material.Divider
 import androidx.compose.material.Icon
-import androidx.compose.material.LocalTextStyle
 import androidx.compose.material.MaterialTheme
-import androidx.compose.material.OutlinedTextField
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.input.KeyboardCapitalization
-import androidx.compose.ui.text.input.KeyboardType
-import androidx.compose.ui.text.style.TextDirection
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.core.content.ContextCompat.startActivity
 import com.vitorpamplona.amethyst.R
-import com.vitorpamplona.amethyst.lnurl.LnInvoiceUtil
+import com.vitorpamplona.amethyst.service.lnurl.LnInvoiceUtil
 import java.text.NumberFormat
 
 @Composable
@@ -78,7 +69,7 @@ fun InvoicePreview(lnInvoice: String) {
         )
 
         Text(
-          text = "Lightning Invoice",
+          text = stringResource(R.string.lightning_invoice),
           fontSize = 20.sp,
           fontWeight = FontWeight.W500,
           modifier = Modifier.padding(start = 10.dp)
@@ -89,7 +80,9 @@ fun InvoicePreview(lnInvoice: String) {
 
       amount?.let {
         Text(
-          text = "${NumberFormat.getInstance().format(amount)} sats",
+          text = "${
+            NumberFormat.getInstance().format(amount)
+          } ${stringResource(id = R.string.sats)}",
           fontSize = 25.sp,
           fontWeight = FontWeight.W500,
           modifier = Modifier
@@ -100,7 +93,9 @@ fun InvoicePreview(lnInvoice: String) {
 
 
       Button(
-        modifier = Modifier.fillMaxWidth().padding(vertical = 10.dp),
+        modifier = Modifier
+          .fillMaxWidth()
+          .padding(vertical = 10.dp),
         onClick = {
           runCatching {
             val intent = Intent(Intent.ACTION_VIEW, Uri.parse("lightning:$lnInvoice"))
@@ -112,7 +107,7 @@ fun InvoicePreview(lnInvoice: String) {
           backgroundColor = MaterialTheme.colors.primary
         )
       ) {
-        Text(text = "Pay", color = Color.White, fontSize = 20.sp)
+        Text(text = stringResource(R.string.pay), color = Color.White, fontSize = 20.sp)
       }
     }
   }

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

@@ -30,6 +30,7 @@ import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.input.KeyboardCapitalization
 import androidx.compose.ui.text.input.KeyboardType
@@ -37,7 +38,7 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.core.content.ContextCompat.startActivity
 import com.vitorpamplona.amethyst.R
-import com.vitorpamplona.amethyst.lnurl.LightningAddressResolver
+import com.vitorpamplona.amethyst.service.lnurl.LightningAddressResolver
 import com.vitorpamplona.amethyst.model.Account
 import kotlinx.coroutines.launch
 
@@ -73,7 +74,7 @@ fun InvoiceRequest(lud16: String, toUserPubKeyHex: String, account: Account, onC
         )
 
         Text(
-          text = "Lightning Tips",
+          text = stringResource(R.string.lightning_tips),
           fontSize = 20.sp,
           fontWeight = FontWeight.W500,
           modifier = Modifier.padding(start = 10.dp)
@@ -86,13 +87,13 @@ fun InvoiceRequest(lud16: String, toUserPubKeyHex: String, account: Account, onC
       var amount by remember { mutableStateOf(1000L) }
 
       OutlinedTextField(
-        label = { Text(text = "Note to Receiver") },
+        label = { Text(text = stringResource(R.string.note_to_receiver)) },
         modifier = Modifier.fillMaxWidth(),
         value = message,
         onValueChange = { message = it },
         placeholder = {
           Text(
-            text = "Thank you so much!",
+            text = stringResource(R.string.thank_you_so_much),
             color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
           )
         },
@@ -103,7 +104,7 @@ fun InvoiceRequest(lud16: String, toUserPubKeyHex: String, account: Account, onC
       )
 
       OutlinedTextField(
-        label = { Text(text = "Amount in Sats") },
+        label = { Text(text = stringResource(R.string.amount_in_sats)) },
         modifier = Modifier.fillMaxWidth(),
         value = amount.toString(),
         onValueChange = {
@@ -152,7 +153,7 @@ fun InvoiceRequest(lud16: String, toUserPubKeyHex: String, account: Account, onC
           backgroundColor = MaterialTheme.colors.primary
         )
       ) {
-        Text(text = "Send Sats", color = Color.White, fontSize = 20.sp)
+        Text(text = stringResource(R.string.send_sats), color = Color.White, fontSize = 20.sp)
       }
     }
   }

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

@@ -4,28 +4,48 @@ import android.util.Patterns
 import androidx.compose.animation.animateContentSize
 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
-import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.*
-import androidx.compose.runtime.*
+import androidx.compose.material.LocalContentColor
+import androidx.compose.material.LocalTextStyle
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.Text
+import androidx.compose.material.contentColorFor
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.getValue
 import androidx.compose.runtime.livedata.observeAsState
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.compositeOver
+import androidx.compose.ui.text.Paragraph
+import androidx.compose.ui.text.SpanStyle
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.text.style.TextDecoration
 import androidx.compose.ui.text.style.TextDirection
 import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
 import androidx.navigation.NavController
 import com.google.accompanist.flowlayout.FlowRow
-import com.vitorpamplona.amethyst.lnurl.LnInvoiceUtil
+import com.halilibo.richtext.markdown.Markdown
+import com.halilibo.richtext.markdown.MarkdownParseOptions
+import com.halilibo.richtext.ui.RichTextStyle
+import com.halilibo.richtext.ui.material.MaterialRichText
+import com.halilibo.richtext.ui.resolveDefaults
+import com.vitorpamplona.amethyst.service.lnurl.LnInvoiceUtil
 import com.vitorpamplona.amethyst.model.LocalCache
-import com.vitorpamplona.amethyst.model.toByteArray
-import com.vitorpamplona.amethyst.model.toNote
 import com.vitorpamplona.amethyst.service.Nip19
 import com.vitorpamplona.amethyst.ui.note.NoteCompose
-import com.vitorpamplona.amethyst.ui.note.toShortenHex
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
-import nostr.postr.toNpub
 import java.net.MalformedURLException
 import java.net.URISyntaxException
 import java.net.URL
@@ -61,61 +81,109 @@ fun RichTextViewer(
   accountViewModel: AccountViewModel,
   navController: NavController,
 ) {
+
+  val myMarkDownStyle = RichTextStyle().resolveDefaults().copy(
+    codeBlockStyle = RichTextStyle().resolveDefaults().codeBlockStyle?.copy(
+      textStyle = TextStyle(
+        fontFamily = FontFamily.Monospace,
+        fontSize = 14.sp
+      ),
+      modifier = Modifier
+        .padding(0.dp)
+        .fillMaxWidth()
+        .clip(shape = RoundedCornerShape(15.dp))
+        .border(
+          1.dp,
+          MaterialTheme.colors.onSurface.copy(alpha = 0.12f),
+          RoundedCornerShape(15.dp)
+        )
+        .background(MaterialTheme.colors.onSurface.copy(alpha = 0.05f).compositeOver(backgroundColor))
+    ),
+    stringStyle = RichTextStyle().resolveDefaults().stringStyle?.copy(
+      linkStyle = SpanStyle(
+        textDecoration = TextDecoration.Underline,
+        color = MaterialTheme.colors.primary
+      ),
+      codeStyle = SpanStyle(
+        fontFamily = FontFamily.Monospace,
+        fontSize = 14.sp,
+        background = MaterialTheme.colors.onSurface.copy(alpha = 0.22f).compositeOver(backgroundColor)
+      )
+    )
+  )
+
   Column(modifier = modifier.animateContentSize()) {
-    // FlowRow doesn't work well with paragraphs. So we need to split them
-    content.split('\n').forEach { paragraph ->
 
-      FlowRow() {
-        paragraph.split(' ').forEach { word: String ->
+    if ( content.startsWith("# ")
+      || content.contains("##")
+      || content.contains("**")
+      || content.contains("__")
+      || content.contains("```")
+    ) {
 
-          if (canPreview) {
-            // Explicit URL
-            val lnInvoice = LnInvoiceUtil.findInvoice(word)
-            if (lnInvoice != null) {
-              InvoicePreview(lnInvoice)
-            } else if (isValidURL(word)) {
-              val removedParamsFromUrl = word.split("?")[0].toLowerCase()
-              if (imageExtension.matcher(removedParamsFromUrl).matches()) {
-                ZoomableImageView(word)
-              } else if (videoExtension.matcher(removedParamsFromUrl).matches()) {
-                VideoView(word)
+      MaterialRichText(
+        style = myMarkDownStyle,
+      ) {
+        Markdown(
+          content = content,
+          markdownParseOptions = MarkdownParseOptions.Default,
+        )
+      }
+    } else {
+      // FlowRow doesn't work well with paragraphs. So we need to split them
+      content.split('\n').forEach { paragraph ->
+        FlowRow() {
+          val s = if (isArabic(paragraph))  paragraph.split(' ').reversed() else paragraph.split(' ');
+          s.forEach { word: String ->
+            if (canPreview) {
+              // Explicit URL
+              val lnInvoice = LnInvoiceUtil.findInvoice(word)
+              if (lnInvoice != null) {
+                InvoicePreview(lnInvoice)
+              } else if (isValidURL(word)) {
+                val removedParamsFromUrl = word.split("?")[0].toLowerCase()
+                if (imageExtension.matcher(removedParamsFromUrl).matches()) {
+                  ZoomableImageView(word)
+                } else if (videoExtension.matcher(removedParamsFromUrl).matches()) {
+                  VideoView(word)
+                } else {
+                  UrlPreview(word, word)
+                }
+              } else if (Patterns.EMAIL_ADDRESS.matcher(word).matches()) {
+                ClickableEmail(word)
+              } else if (Patterns.PHONE.matcher(word).matches() && word.length > 6) {
+                ClickablePhone(word)
+              } else if (noProtocolUrlValidator.matcher(word).matches()) {
+                UrlPreview("https://$word", word)
+              } else if (tagIndex.matcher(word).matches() && tags != null) {
+                TagLink(word, tags, canPreview, backgroundColor, accountViewModel, navController)
+              } else if (isBechLink(word)) {
+                BechLink(word, navController)
               } else {
-                UrlPreview(word, word)
+                Text(
+                  text = "$word ",
+                  style = LocalTextStyle.current.copy(textDirection = TextDirection.Content),
+                )
               }
-            } else if (Patterns.EMAIL_ADDRESS.matcher(word).matches()) {
-              ClickableEmail(word)
-            } else if (Patterns.PHONE.matcher(word).matches() && word.length > 6) {
-              ClickablePhone(word)
-            } else if (noProtocolUrlValidator.matcher(word).matches()) {
-              UrlPreview("https://$word", word)
-            } else if (tagIndex.matcher(word).matches() && tags != null) {
-              TagLink(word, tags, backgroundColor, accountViewModel, navController)
-            } else if (isBechLink(word)) {
-              BechLink(word, navController)
             } else {
-              Text(
-                text = "$word ",
-                style = LocalTextStyle.current.copy(textDirection = TextDirection.Content),
-              )
-            }
-          } else {
-            if (isValidURL(word)) {
-              ClickableUrl("$word ", word)
-            } else if (Patterns.EMAIL_ADDRESS.matcher(word).matches()) {
-              ClickableEmail(word)
-            } else if (Patterns.PHONE.matcher(word).matches() && word.length > 6) {
-              ClickablePhone(word)
-            } else if (noProtocolUrlValidator.matcher(word).matches()) {
-              ClickableUrl(word, "https://$word")
-            } else if (tagIndex.matcher(word).matches() && tags != null) {
-              TagLink(word, tags, backgroundColor, accountViewModel, navController)
-            } else if (isBechLink(word)) {
-              BechLink(word, navController)
-            } else {
-              Text(
-                text = "$word ",
-                style = LocalTextStyle.current.copy(textDirection = TextDirection.Content),
-              )
+              if (isValidURL(word)) {
+                ClickableUrl("$word ", word)
+              } else if (Patterns.EMAIL_ADDRESS.matcher(word).matches()) {
+                ClickableEmail(word)
+              } else if (Patterns.PHONE.matcher(word).matches() && word.length > 6) {
+                ClickablePhone(word)
+              } else if (noProtocolUrlValidator.matcher(word).matches()) {
+                ClickableUrl(word, "https://$word")
+              } else if (tagIndex.matcher(word).matches() && tags != null) {
+                TagLink(word, tags, canPreview, backgroundColor, accountViewModel, navController)
+              } else if (isBechLink(word)) {
+                BechLink(word, navController)
+              } else {
+                Text(
+                  text = "$word ",
+                  style = LocalTextStyle.current.copy(textDirection = TextDirection.Content),
+                )
+              }
             }
           }
         }
@@ -124,6 +192,10 @@ fun RichTextViewer(
   }
 }
 
+private fun isArabic(text: String): Boolean {
+  return text.any { it in '\u0600'..'\u06FF' || it in '\u0750'..'\u077F' }
+}
+
 
 fun isBechLink(word: String): Boolean {
   return word.startsWith("nostr:", true)
@@ -162,7 +234,7 @@ fun BechLink(word: String, navController: NavController) {
 
 
 @Composable
-fun TagLink(word: String, tags: List<List<String>>, backgroundColor: Color, accountViewModel: AccountViewModel, navController: NavController) {
+fun TagLink(word: String, tags: List<List<String>>, canPreview: Boolean, backgroundColor: Color, accountViewModel: AccountViewModel, navController: NavController) {
   val matcher = tagIndex.matcher(word)
 
   val index = try {
@@ -195,22 +267,27 @@ fun TagLink(word: String, tags: List<List<String>>, backgroundColor: Color, acco
     } else if (tags[index][0] == "e") {
       val note = LocalCache.checkGetOrCreateNote(tags[index][1])
       if (note != null) {
-        //ClickableNoteTag(note, navController)
-        NoteCompose(
-          baseNote = note,
-          accountViewModel = accountViewModel,
-          modifier = Modifier
-            .padding(0.dp)
-            .fillMaxWidth()
-            .clip(shape = RoundedCornerShape(15.dp))
-            .border(
-              1.dp,
-              MaterialTheme.colors.onSurface.copy(alpha = 0.12f),
-              RoundedCornerShape(15.dp)
-            ),
-          parentBackgroundColor = MaterialTheme.colors.onSurface.copy(alpha = 0.05f).compositeOver(backgroundColor),
-          isQuotedNote = true,
-          navController = navController)
+        if (canPreview) {
+          NoteCompose(
+            baseNote = note,
+            accountViewModel = accountViewModel,
+            modifier = Modifier
+              .padding(0.dp)
+              .fillMaxWidth()
+              .clip(shape = RoundedCornerShape(15.dp))
+              .border(
+                1.dp,
+                MaterialTheme.colors.onSurface.copy(alpha = 0.12f),
+                RoundedCornerShape(15.dp)
+              ),
+            parentBackgroundColor = MaterialTheme.colors.onSurface.copy(alpha = 0.05f)
+              .compositeOver(backgroundColor),
+            isQuotedNote = true,
+            navController = navController
+          )
+        } else {
+          ClickableNoteTag(note, navController)
+        }
       } else {
         // if here the tag is not a valid Nostr Hex
         Text(text = "$word ")

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

@@ -27,6 +27,7 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.SpanStyle
 import androidx.compose.ui.text.buildAnnotatedString
 import androidx.compose.ui.text.style.TextOverflow
@@ -34,10 +35,13 @@ import androidx.compose.ui.text.withStyle
 import androidx.compose.ui.unit.dp
 import androidx.core.os.ConfigurationCompat
 import androidx.navigation.NavController
+import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.service.lang.LanguageTranslatorService
 import com.vitorpamplona.amethyst.service.lang.ResultOrError
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import java.util.Locale
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
 
 @Composable
 fun TranslateableRichTextViewer(
@@ -62,19 +66,21 @@ fun TranslateableRichTextViewer(
   val account = accountState?.account ?: return
 
   LaunchedEffect(accountState) {
-    LanguageTranslatorService.autoTranslate(
-      content,
-      account.dontTranslateFrom,
-      account.translateTo
-    ).addOnCompleteListener { task ->
-      if (task.isSuccessful) {
-        if (task.result.sourceLang != null && task.result.targetLang != null) {
-          val preference = account.preferenceBetween(task.result.sourceLang!!, task.result.targetLang!!)
-          showOriginal = preference == task.result.sourceLang
+    withContext(Dispatchers.IO) {
+      LanguageTranslatorService.autoTranslate(
+        content,
+        account.dontTranslateFrom,
+        account.translateTo
+      ).addOnCompleteListener { task ->
+        if (task.isSuccessful && content != task.result.result) {
+          if (task.result.sourceLang != null && task.result.targetLang != null) {
+            val preference = account.preferenceBetween(task.result.sourceLang!!, task.result.targetLang!!)
+            showOriginal = preference == task.result.sourceLang
+          }
+          translatedTextState.value = task.result
+        } else {
+          translatedTextState.value = ResultOrError(content, null, null, null)
         }
-        translatedTextState.value = task.result
-      } else {
-        translatedTextState.value = ResultOrError(content, null, null, null)
       }
     }
   }
@@ -106,17 +112,17 @@ fun TranslateableRichTextViewer(
           val annotatedTranslationString = buildAnnotatedString {
             withStyle(clickableTextStyle) {
               pushStringAnnotation("langSettings", true.toString())
-              append("Auto")
+              append(stringResource(R.string.auto))
             }
 
-            append("-translated from ")
+            append("-${stringResource(R.string.translated_from)} ")
 
             withStyle(clickableTextStyle) {
               pushStringAnnotation("showOriginal", true.toString())
               append(Locale(source).displayName)
             }
 
-            append(" to ")
+            append(" ${stringResource(R.string.to)} ")
 
             withStyle(clickableTextStyle) {
               pushStringAnnotation("showOriginal", false.toString())
@@ -159,7 +165,7 @@ fun TranslateableRichTextViewer(
 
               Spacer(modifier = Modifier.size(10.dp))
 
-              Text("Never translate from ${Locale(source).displayName}")
+              Text(stringResource(R.string.never_translate_from) + "${Locale(source).displayName}")
             }
             Divider()
             DropdownMenuItem(onClick = {
@@ -177,7 +183,13 @@ fun TranslateableRichTextViewer(
 
               Spacer(modifier = Modifier.size(10.dp))
 
-              Text("Show in ${Locale(source).displayName} first")
+              Text(
+                "${stringResource(R.string.show_in)} ${Locale(source).displayName} ${
+                  stringResource(
+                    R.string.first
+                  )
+                }"
+              )
             }
             DropdownMenuItem(onClick = {
               accountViewModel.prefer(source, target, target)
@@ -194,7 +206,7 @@ fun TranslateableRichTextViewer(
 
               Spacer(modifier = Modifier.size(10.dp))
 
-              Text("Show in ${Locale(target).displayName} first")
+              Text("${stringResource(id = R.string.show_in)} ${Locale(target).displayName} ${R.string.first}")
             }
             Divider()
 
@@ -217,7 +229,7 @@ fun TranslateableRichTextViewer(
 
                   Spacer(modifier = Modifier.size(10.dp))
                   
-                  Text("Always translate to ${lang.displayName}")
+                  Text("${stringResource(R.string.always_translate_to)}${lang.displayName}")
                 }
               }
             }

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

@@ -8,29 +8,52 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
+import androidx.compose.ui.platform.LocalContext
 import com.baha.url.preview.IUrlPreviewCallback
 import com.baha.url.preview.UrlInfoItem
+import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.model.UrlCachedPreviewer
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
 
 
 @Composable
-fun UrlPreview(url: String, urlText: String, showUrlIfError: Boolean = true) {
+fun UrlPreview(url: String, urlText: String) {
+  val default = UrlCachedPreviewer.cache[url]?.let {
+    if (it.url == url)
+      UrlPreviewState.Loaded(it)
+    else
+      UrlPreviewState.Empty
+
+  } ?: UrlPreviewState.Loading
+  var context = LocalContext.current
+
   var urlPreviewState by remember { mutableStateOf<UrlPreviewState>(UrlPreviewState.Loading) }
 
   // Doesn't use a viewModel because of viewModel reusing issues (too many UrlPreview are created).
   LaunchedEffect(url) {
-    UrlCachedPreviewer.previewInfo(url, object : IUrlPreviewCallback {
-      override fun onComplete(urlInfo: UrlInfoItem) {
-        if (urlInfo.allFetchComplete() && urlInfo.url == url)
-          urlPreviewState = UrlPreviewState.Loaded(urlInfo)
-        else
-          urlPreviewState = UrlPreviewState.Empty
-      }
+    if (urlPreviewState == UrlPreviewState.Loading) {
+      withContext(Dispatchers.IO) {
+        UrlCachedPreviewer.previewInfo(url, object : IUrlPreviewCallback {
+          override fun onComplete(urlInfo: UrlInfoItem) {
+            if (urlInfo.allFetchComplete() && urlInfo.url == url)
+              urlPreviewState = UrlPreviewState.Loaded(urlInfo)
+            else
+              urlPreviewState = UrlPreviewState.Empty
+          }
 
-      override fun onFailed(throwable: Throwable) {
-        urlPreviewState = UrlPreviewState.Error("Error parsing preview for ${url}: ${throwable.message}")
+          override fun onFailed(throwable: Throwable) {
+            urlPreviewState = UrlPreviewState.Error(
+              context.getString(
+                R.string.error_parsing_preview_for,
+                url,
+                throwable.message
+              )
+            )
+          }
+        })
       }
-    })
+    }
   }
 
   Crossfade(targetState = urlPreviewState, animationSpec = tween(durationMillis = 100)) { state ->
@@ -39,9 +62,7 @@ fun UrlPreview(url: String, urlText: String, showUrlIfError: Boolean = true) {
         UrlPreviewCard(url, state.previewInfo)
       }
       else -> {
-        if (showUrlIfError) {
-          ClickableUrl(urlText, url)
-        }
+        ClickableUrl(urlText, url)
       }
     }
   }

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

@@ -15,10 +15,12 @@ import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalUriHandler
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import coil.compose.AsyncImage
 import com.baha.url.preview.UrlInfoItem
+import com.vitorpamplona.amethyst.R
 
 @Composable
 fun UrlPreviewCard(
@@ -36,7 +38,7 @@ fun UrlPreviewCard(
     Column {
       AsyncImage(
         model = previewInfo.image,
-        contentDescription = "Preview Card Image for ${url}",
+        contentDescription = stringResource(R.string.preview_card_image_for, url),
         contentScale = ContentScale.FillWidth,
         modifier = Modifier.fillMaxWidth()
       )

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

@@ -16,8 +16,6 @@ import com.google.android.exoplayer2.Player
 import com.google.android.exoplayer2.source.ProgressiveMediaSource
 import com.google.android.exoplayer2.ui.AspectRatioFrameLayout
 import com.google.android.exoplayer2.ui.StyledPlayerView
-import com.google.android.exoplayer2.upstream.DefaultHttpDataSource
-import com.google.android.exoplayer2.upstream.cache.CacheDataSource
 import com.vitorpamplona.amethyst.VideoCache
 
 @Composable

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

@@ -17,7 +17,9 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.graphicsLayer
 import androidx.compose.ui.input.pointer.pointerInput
 import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.res.stringResource
 import coil.compose.AsyncImage
+import com.vitorpamplona.amethyst.R
 
 @Composable
 fun ZoomableAsyncImage(imageUrl: String) {
@@ -46,14 +48,16 @@ fun ZoomableAsyncImage(imageUrl: String) {
     ) {
         AsyncImage(
             model = imageUrl,
-            contentDescription = "Profile Image",
+            contentDescription = stringResource(id = R.string.profile_image),
             contentScale = ContentScale.FillWidth,
-            modifier = Modifier.fillMaxSize().graphicsLayer(
-                scaleX = scale,
-                scaleY = scale,
-                translationX = offsetX,
-                translationY = offsetY
-            ),
+            modifier = Modifier
+                .fillMaxSize()
+                .graphicsLayer(
+                    scaleX = scale,
+                    scaleY = scale,
+                    translationX = offsetX,
+                    translationY = offsetY
+                ),
         )
     }
 }

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

@@ -3,18 +3,26 @@ package com.vitorpamplona.amethyst.ui.components
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.border
 import androidx.compose.foundation.combinedClickable
-import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Surface
-import androidx.compose.runtime.*
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalClipboardManager
-import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.Dialog

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

@@ -4,10 +4,6 @@ import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.Channel
 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.Note
-import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
-import com.vitorpamplona.amethyst.service.relays.FeedType
-import com.vitorpamplona.amethyst.service.relays.TypedFilter
-import nostr.postr.JsonFilter
 
 object ChannelFeedFilter: FeedFilter<Note>() {
   lateinit var account: Account
@@ -20,6 +16,6 @@ object ChannelFeedFilter: FeedFilter<Note>() {
 
   // returns the last Note of each user.
   override fun feed(): List<Note> {
-    return channel.notes?.values?.filter { account.isAcceptable(it) }?.sortedBy { it.event?.createdAt }?.reversed() ?: emptyList()
+    return channel.notes?.values?.filter { account.isAcceptable(it) }?.sortedBy { it.createdAt() }?.reversed() ?: emptyList()
   }
 }

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

@@ -23,6 +23,6 @@ object ChatroomFeedFilter: FeedFilter<Note>() {
 
     val messages = myAccount.userProfile().privateChatrooms[myUser] ?: return emptyList()
 
-    return messages.roomMessages.filter { myAccount.isAcceptable(it) }.sortedBy { it.event?.createdAt }.reversed()
+    return messages.roomMessages.filter { myAccount.isAcceptable(it) }.sortedBy { it.createdAt() }.reversed()
   }
 }

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

@@ -17,17 +17,17 @@ object ChatroomListKnownFeedFilter: FeedFilter<Note>() {
 
     val privateMessages = messagingWith.mapNotNull {
       privateChatrooms[it]?.roomMessages?.sortedBy {
-        it.event?.createdAt
+        it.createdAt()
       }?.lastOrNull {
         it.event != null
       }
     }
 
     val publicChannels = account.followingChannels().map {
-      it.notes.values.filter { account.isAcceptable(it) }.sortedBy { it.event?.createdAt }.lastOrNull { it.event != null }
+      it.notes.values.filter { account.isAcceptable(it) }.sortedBy { it.createdAt() }.lastOrNull { it.event != null }
     }
 
-    return (privateMessages + publicChannels).filterNotNull().sortedBy { it.event?.createdAt }.reversed()
+    return (privateMessages + publicChannels).filterNotNull().sortedBy { it.createdAt() }.reversed()
   }
 
 }

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

@@ -17,13 +17,13 @@ object ChatroomListNewFeedFilter: FeedFilter<Note>() {
 
     val privateMessages = messagingWith.mapNotNull {
       privateChatrooms[it]?.roomMessages?.sortedBy {
-        it.event?.createdAt
+        it.createdAt()
       }?.lastOrNull {
         it.event != null
       }
     }
 
-    return privateMessages.sortedBy { it.event?.createdAt }.reversed()
+    return privateMessages.sortedBy { it.createdAt() }.reversed()
   }
 
 }

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

@@ -1,14 +1,8 @@
 package com.vitorpamplona.amethyst.ui.dal
 
 import android.util.Log
-import com.vitorpamplona.amethyst.model.Note
-import com.vitorpamplona.amethyst.model.UrlCachedPreviewer
 import kotlin.time.ExperimentalTime
 import kotlin.time.measureTimedValue
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.launch
 
 abstract class FeedFilter<T>() {
   @OptIn(ExperimentalTime::class)

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

@@ -4,21 +4,25 @@ import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
-import com.vitorpamplona.amethyst.service.relays.FeedType
-import com.vitorpamplona.amethyst.service.relays.TypedFilter
-import nostr.postr.JsonFilter
-import nostr.postr.events.TextNoteEvent
+import com.vitorpamplona.amethyst.service.model.LongTextNoteEvent
+import com.vitorpamplona.amethyst.service.model.TextNoteEvent
 
 object GlobalFeedFilter: FeedFilter<Note>() {
   lateinit var account: Account
 
   override fun feed() = LocalCache.notes.values
-    .filter { account.isAcceptable(it) }
     .filter {
-      (it.event is TextNoteEvent && (it.event as TextNoteEvent).replyTos.isEmpty()) ||
-      (it.event is ChannelMessageEvent && (it.event as ChannelMessageEvent).replyTos.isEmpty())
+      (it.event is TextNoteEvent || it.event is LongTextNoteEvent || it.event is ChannelMessageEvent)
+        && it.replyTo.isNullOrEmpty()
     }
-    .sortedBy { it.event?.createdAt }
+    .filter {
+      // does not show events already in the public chat list
+           (it.channel() == null || it.channel() !in account.followingChannels())
+      // does not show people the user already follows
+        && (it.author !in account.userProfile().follows)
+    }
+    .filter { account.isAcceptable(it) }
+    .sortedBy { it.createdAt() }
     .reversed()
 
 }

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

@@ -4,7 +4,7 @@ import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.service.model.RepostEvent
-import nostr.postr.events.TextNoteEvent
+import com.vitorpamplona.amethyst.service.model.TextNoteEvent
 
 object HomeConversationsFeedFilter: FeedFilter<Note>() {
   lateinit var account: Account
@@ -17,9 +17,10 @@ object HomeConversationsFeedFilter: FeedFilter<Note>() {
         (it.event is TextNoteEvent || it.event is RepostEvent)
           && it.author in user.follows
           // && account.isAcceptable(it)  // This filter follows only. No need to check if acceptable
+          && it.author?.let { !HomeNewThreadFeedFilter.account.isHidden(it) } ?: true
           && !it.isNewThread()
       }
-      .sortedBy { it.event?.createdAt }
+      .sortedBy { it.createdAt() }
       .reversed()
   }
 }

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

@@ -2,19 +2,10 @@ package com.vitorpamplona.amethyst.ui.dal
 
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.LocalCache
-import com.vitorpamplona.amethyst.model.LocalCacheState
 import com.vitorpamplona.amethyst.model.Note
-import com.vitorpamplona.amethyst.model.User
-import com.vitorpamplona.amethyst.model.UserState
+import com.vitorpamplona.amethyst.service.model.LongTextNoteEvent
 import com.vitorpamplona.amethyst.service.model.RepostEvent
-import com.vitorpamplona.amethyst.service.relays.FeedType
-import com.vitorpamplona.amethyst.service.relays.TypedFilter
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.launch
-import nostr.postr.JsonFilter
-import nostr.postr.events.TextNoteEvent
-import nostr.postr.toHex
+import com.vitorpamplona.amethyst.service.model.TextNoteEvent
 
 object HomeNewThreadFeedFilter: FeedFilter<Note>() {
   lateinit var account: Account
@@ -22,14 +13,26 @@ object HomeNewThreadFeedFilter: FeedFilter<Note>() {
   override fun feed(): List<Note> {
     val user = account.userProfile()
 
-    return LocalCache.notes.values
+    val notes = LocalCache.notes.values
       .filter {
-        (it.event is TextNoteEvent || it.event is RepostEvent)
+        (it.event is TextNoteEvent || it.event is RepostEvent || it.event is LongTextNoteEvent)
           && it.author in user.follows
           // && account.isAcceptable(it)  // This filter follows only. No need to check if acceptable
+          && it.author?.let { !account.isHidden(it) } ?: true
           && it.isNewThread()
       }
-      .sortedBy { it.event?.createdAt }
+
+    val longFormNotes = LocalCache.addressables.values
+      .filter {
+        (it.event is TextNoteEvent || it.event is RepostEvent || it.event is LongTextNoteEvent)
+          && it.author in user.follows
+          // && account.isAcceptable(it)  // This filter follows only. No need to check if acceptable
+          && it.author?.let { !account.isHidden(it) } ?: true
+          && it.isNewThread()
+      }
+
+    return (notes + longFormNotes)
+      .sortedBy { it.createdAt() }
       .reversed()
   }
 }

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

@@ -2,26 +2,68 @@ package com.vitorpamplona.amethyst.ui.dal
 
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.Note
-import com.vitorpamplona.amethyst.model.User
 import com.vitorpamplona.amethyst.service.model.ChannelCreateEvent
-import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
 import com.vitorpamplona.amethyst.service.model.ChannelMetadataEvent
 import com.vitorpamplona.amethyst.service.model.LnZapRequestEvent
+import com.vitorpamplona.amethyst.service.model.ReactionEvent
 import com.vitorpamplona.amethyst.service.model.RepostEvent
-import nostr.postr.JsonFilter
+import com.vitorpamplona.amethyst.service.model.TextNoteEvent
 
 object NotificationFeedFilter: FeedFilter<Note>() {
   lateinit var account: Account
 
   override fun feed(): List<Note> {
     return account.userProfile().taggedPosts
-      .filter { it.author == null || (!account.isHidden(it.author!!) && it.author != account.userProfile()) }
+      .filter {
+           it.author == null
+        || (!account.isHidden(it.author!!) && it.author != account.userProfile())
+      }
       .filter {
            it.event !is ChannelCreateEvent
         && it.event !is ChannelMetadataEvent
         && it.event !is LnZapRequestEvent
       }
-      .sortedBy { it.event?.createdAt }
+      .filter {
+        it.event !is TextNoteEvent
+          ||
+          (
+            it.event is TextNoteEvent
+              &&
+              (
+                it.replyTo?.any { it.author == account.userProfile() } == true
+                  ||
+                  account.userProfile() in it.directlyCiteUsers()
+                )
+            )
+      }
+      .filter {
+        it.event !is ReactionEvent
+          ||
+          (
+            it.event is ReactionEvent
+              &&
+              (
+                it.replyTo?.lastOrNull()?.author == account.userProfile()
+                  ||
+                  account.userProfile() in it.directlyCiteUsers()
+                )
+            )
+      }
+      .filter {
+        it.event !is RepostEvent
+          ||
+          (
+            it.event is RepostEvent
+              &&
+              (
+                it.replyTo?.lastOrNull()?.author == account.userProfile()
+                  ||
+                  account.userProfile() in it.directlyCiteUsers()
+                )
+            )
+      }
+
+      .sortedBy { it.createdAt() }
       .reversed()
   }
 }

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

@@ -1,9 +1,7 @@
 package com.vitorpamplona.amethyst.ui.dal
 
-import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.model.ThreadAssembler
-import com.vitorpamplona.amethyst.service.NostrThreadDataSource
 
 object ThreadFeedFilter: FeedFilter<Note>() {
   var noteId: String? = null

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

@@ -17,7 +17,7 @@ object UserProfileConversationsFeedFilter: FeedFilter<Note>() {
   override fun feed(): List<Note> {
     return user?.notes
       ?.filter { account?.isAcceptable(it) == true && !it.isNewThread() }
-      ?.sortedBy { it.event?.createdAt }
+      ?.sortedBy { it.createdAt() }
       ?.reversed()
       ?: emptyList()
   }