v0.17.4

add leak canary to detect memory leaks in debug builds

app/build.gradle

@@ -11,8 +11,8 @@ android {
         applicationId "com.vitorpamplona.amethyst"
         minSdk 26
         targetSdk 33
-        versionCode 56
-        versionName "0.17.0"
+        versionCode 60
+        versionName "0.17.4"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {
@@ -136,6 +136,9 @@ dependencies {
     implementation 'com.google.mlkit:language-id:17.0.4'
     implementation 'com.google.android.gms:play-services-mlkit-language-id:17.0.0'
 
+    // Automatic memory leak detection
+    debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.10'
+
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'

app/src/main/AndroidManifest.xml

@@ -24,7 +24,6 @@
         android:usesCleartextTraffic="true"
         tools:targetApi="33">
         <activity
-            android:label="@string/app_name"
             android:name=".ui.MainActivity"
             android:exported="true"
             android:windowSoftInputMode="adjustResize"

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

@@ -23,6 +23,7 @@ class LocalPreferences(context: Context) {
       remove("relays")
       remove("dontTranslateFrom")
       remove("translateTo")
+      remove("zapAmounts")
     }.apply()
   }
 
@@ -35,6 +36,7 @@ class LocalPreferences(context: Context) {
       account.localRelays.let { putString("relays", gson.toJson(it)) }
       account.dontTranslateFrom.let { putStringSet("dontTranslateFrom", it) }
       account.translateTo.let { putString("translateTo", it) }
+      account.zapAmountChoices.let { putString("zapAmounts", gson.toJson(it)) }
     }.apply()
   }
 
@@ -52,6 +54,11 @@ class LocalPreferences(context: Context) {
       val dontTranslateFrom = getStringSet("dontTranslateFrom", null) ?: setOf()
       val translateTo = getString("translateTo", null) ?: Locale.getDefault().language
 
+      val zapAmountChoices = gson.fromJson(
+        getString("zapAmounts", "[]"),
+        object : TypeToken<List<Long>>() {}.type
+      ) ?: listOf(500L, 1000L, 5000L)
+
       if (pubKey != null) {
         return Account(
           Persona(privKey = privKey?.toByteArray(), pubKey = pubKey.toByteArray()),
@@ -59,7 +66,8 @@ class LocalPreferences(context: Context) {
           hiddenUsers,
           localRelays,
           dontTranslateFrom,
-          translateTo
+          translateTo,
+          zapAmountChoices
         )
       } else {
         return null

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

@@ -1,5 +1,6 @@
 package com.vitorpamplona.amethyst.lnurl
 
+import androidx.compose.ui.text.toLowerCase
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import java.net.URLEncoder
 import kotlinx.coroutines.CoroutineScope
@@ -20,11 +21,19 @@ class LightningAddressResolver {
   fun assembleUrl(lnaddress: String): String? {
     val parts = lnaddress.split("@")
 
-    if (parts.size != 2) {
-      return null
+    if (parts.size == 2) {
+      return "https://${parts[1]}/.well-known/lnurlp/${parts[0]}"
     }
 
-    return "https://${parts[1]}/.well-known/lnurlp/${parts[0]}"
+    if (lnaddress.toLowerCase().startsWith("lnurl")) {
+      return try {
+        String(Bech32.decodeBytes(lnaddress, false).second)
+      } catch (e: Exception) {
+        null
+      }
+    }
+
+    return null
   }
 
   fun fetchLightningAddressJson(lnaddress: String, onSuccess: (String) -> Unit, onError: (String) -> Unit) {

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

@@ -56,7 +56,8 @@ class Account(
   var hiddenUsers: Set<String> = setOf(),
   var localRelays: Set<RelaySetupInfo> = Constants.defaultRelays.toSet(),
   var dontTranslateFrom: Set<String> = getLanguagesSpokenByUser(),
-  var translateTo: String = Locale.getDefault().language
+  var translateTo: String = Locale.getDefault().language,
+  var zapAmountChoices: List<Long> = listOf(500L, 1000L, 5000L)
 ) {
   var transientHiddenUsers: Set<String> = setOf()
 
@@ -327,6 +328,11 @@ class Account(
     invalidateData(live)
   }
 
+  fun changeZapAmounts(newAmounts: List<Long>) {
+    zapAmountChoices = newAmounts
+    invalidateData(live)
+  }
+
   fun sendChangeChannel(name: String, about: String, picture: String, channel: Channel) {
     if (!isWriteable()) return
 
@@ -414,13 +420,13 @@ class Account(
         reconnectIfRelaysHaveChanged()
       }
     }
-    LocalCache.liveSpam.observeForever {
+    LocalCache.antiSpam.liveSpam.observeForever {
       GlobalScope.launch(Dispatchers.IO) {
-        LocalCache.spamMessages.snapshot().values.forEach {
-          if (it !in hiddenUsers) {
-            val userToBlock = LocalCache.getOrCreateUser(it)
+        it.cache.spamMessages.snapshot().values.forEach {
+          if (it.pubkeyHex !in transientHiddenUsers && it.duplicatedMessages > 5) {
+            val userToBlock = LocalCache.getOrCreateUser(it.pubkeyHex)
             if (userToBlock != userProfile() && userToBlock !in userProfile().follows) {
-              transientHiddenUsers = transientHiddenUsers + it
+              transientHiddenUsers = transientHiddenUsers + it.pubkeyHex
             }
           }
         }

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

@@ -0,0 +1,92 @@
+package com.vitorpamplona.amethyst.model
+
+import android.util.Log
+import android.util.LruCache
+import androidx.lifecycle.LiveData
+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 kotlinx.coroutines.withContext
+import nostr.postr.events.Event
+import nostr.postr.toHex
+
+class AntiSpamFilter {
+  val recentMessages = LruCache<Int, String>(1000)
+  val spamMessages = LruCache<Int, Spammer>(1000)
+
+  @Synchronized
+  fun isSpam(event: Event): Boolean {
+    val idHex = event.id.toHexKey()
+
+    // if already processed, ok
+    if (LocalCache.notes[idHex] != null) return false
+
+    // if short message, ok
+    if (event.content.length < 50) return false
+
+    // double list strategy:
+    // if duplicated, it goes into spam. 1000 spam messages are saved into the spam list.
+
+    // Considers tags so that same replies to different people don't count.
+    val hash = (event.content + event.tags.flatten().joinToString(",")).hashCode()
+
+    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 down offenders
+      if (spamMessages.get(hash) == null) {
+        spamMessages.put(hash, Spammer(event.pubKey.toHexKey(), 2))
+        liveSpam.invalidateData()
+      } else {
+        spamMessages.get(hash).duplicatedMessages++
+        liveSpam.invalidateData()
+      }
+
+      return true
+    }
+
+    recentMessages.put(hash, idHex)
+
+    return false
+  }
+
+  val liveSpam: AntiSpamLiveData = AntiSpamLiveData(this)
+}
+
+
+class AntiSpamLiveData(val cache: AntiSpamFilter): LiveData<AntiSpamState>(AntiSpamState(cache)) {
+
+  // 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)
+        refresh()
+      } finally {
+        withContext(NonCancellable) {
+          handlerWaiting.set(false)
+        }
+      }
+    }
+  }
+
+  private fun refresh() {
+    postValue(AntiSpamState(cache))
+  }
+}
+
+class AntiSpamState(val cache: AntiSpamFilter) {
+
+}

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

@@ -41,8 +41,43 @@ fun decodePublicKey(key: String): ByteArray {
     Persona(privKey = key.bechToBytes()).pubKey
   } else if (key.startsWith("npub")) {
     key.bechToBytes()
+  } else if (key.startsWith("note")) {
+    key.bechToBytes()
   } else { //if (pattern.matcher(key).matches()) {
   //} else {
     Hex.decode(key)
   }
+}
+
+data class DirtyKeyInfo(val type: String, val keyHex: String, val restOfWord: String)
+
+fun parseDirtyWordForKey(mightBeAKey: String): DirtyKeyInfo? {
+  var key = mightBeAKey
+  if (key.startsWith("nostr:", true)) {
+    key = key.substring("nostr:".length)
+  }
+
+  key = key.removePrefix("@")
+
+  if (key.length < 63)
+    return null
+
+  try {
+
+    val keyB32 = key.substring(0, 63)
+    val restOfWord = key.substring(63)
+
+    if (key.startsWith("nsec1", true)) {
+      return DirtyKeyInfo("npub", Persona(privKey = keyB32.bechToBytes()).pubKey.toHexKey(), restOfWord)
+    } else if (key.startsWith("npub1", true)) {
+      return DirtyKeyInfo("npub", keyB32.bechToBytes().toHexKey(), restOfWord)
+    } else if (key.startsWith("note1", true)) {
+      return DirtyKeyInfo("note", keyB32.bechToBytes().toHexKey(), restOfWord)
+    }
+
+  } catch (e: Exception) {
+    e.printStackTrace()
+  }
+
+  return null
 }

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

@@ -41,23 +41,24 @@ import nostr.postr.events.PrivateDmEvent
 import nostr.postr.events.RecommendRelayEvent
 import nostr.postr.events.TextNoteEvent
 import nostr.postr.toHex
+import nostr.postr.toNpub
 
+data class Spammer(val pubkeyHex: HexKey, var duplicatedMessages: Int)
 
 object LocalCache {
   val metadataParser = jacksonObjectMapper()
     .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
     .readerFor(UserMetadata::class.java)
 
+  val antiSpam = AntiSpamFilter()
+
   val users = ConcurrentHashMap<HexKey, User>()
   val notes = ConcurrentHashMap<HexKey, Note>()
   val channels = ConcurrentHashMap<HexKey, Channel>()
 
-  val recentMessages = LruCache<Int, String>(1000)
-  val spamMessages = LruCache<Int, String>(1000)
-
-  fun checkGetOrCreateUser(key: HexKey): User? {
+  fun checkGetOrCreateUser(key: String): User? {
     return try {
-      val checkHex = Hex.decode(key) // Checks if this is a valid Hex
+      val checkHex = Hex.decode(key).toNpub() // Checks if this is a valid Hex
       getOrCreateUser(key)
     } catch (e: IllegalArgumentException) {
       Log.e("LocalCache", "Invalid Key to create user: $key", e)
@@ -74,6 +75,16 @@ object LocalCache {
     }
   }
 
+  fun checkGetOrCreateNote(key: String): Note? {
+    return try {
+      val checkHex = Hex.decode(key).toNote() // Checks if this is a valid Hex
+      getOrCreateNote(key)
+    } catch (e: IllegalArgumentException) {
+      Log.e("LocalCache", "Invalid Key to create note: $key", e)
+      null
+    }
+  }
+
   @Synchronized
   fun getOrCreateNote(idHex: String): Note {
     return notes[idHex] ?: run {
@@ -83,6 +94,17 @@ object LocalCache {
     }
   }
 
+  fun checkGetOrCreateChannel(key: String): Channel? {
+    return try {
+      val checkHex = Hex.decode(key).toNote() // Checks if this is a valid Hex
+      getOrCreateChannel(key)
+    } catch (e: IllegalArgumentException) {
+      Log.e("LocalCache", "Invalid Key to create channel: $key", e)
+      null
+    }
+  }
+
+
   @Synchronized
   fun getOrCreateChannel(key: String): Channel {
     return channels[key] ?: run {
@@ -120,32 +142,11 @@ object LocalCache {
       .format(DateTimeFormatter.ofPattern("uuuu MMM d hh:mm a"))
   }
 
-  @Synchronized
-  fun isRepeatedMessageSpam(event: Event): Boolean {
-    val idHex = event.id.toHexKey()
-    // if already processed, return
-    if (notes[idHex] != null) return false
-
-    // double list strategy:
-    // if duplicated, it goes into spam. 1000 spam messages are saved into the spam list.
-    val hash = (event.content + event.tags.flatten().joinToString(",")).hashCode()
-    if (event.content.length > 50 && ((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", " | ")}")
-      if (spamMessages.get(hash) == null) {
-        spamMessages.put(hash, event.pubKey.toHexKey())
-        liveSpam.invalidateData()
-      }
-      return true
-    }
-    recentMessages.put(hash, idHex)
-    return false
-  }
 
   fun consume(event: TextNoteEvent, relay: Relay? = null) {
-    if (isRepeatedMessageSpam(event)) return
+    if (antiSpam.isSpam(event)) return
 
     val note = getOrCreateNote(event.id.toHex())
-
     val author = getOrCreateUser(event.pubKey.toHexKey())
 
     if (relay != null) {
@@ -157,7 +158,7 @@ object LocalCache {
     if (note.event != null) return
 
     val mentions = event.mentions.mapNotNull { checkGetOrCreateUser(it) }
-    val replyTo = replyToWithoutCitations(event).map { getOrCreateNote(it) }
+    val replyTo = replyToWithoutCitations(event).mapNotNull { checkGetOrCreateNote(it) }
 
     note.loadEvent(event, author, mentions, replyTo)
 
@@ -266,7 +267,7 @@ object LocalCache {
 
     //Log.d("PM", "${author.toBestDisplayName()} to ${recipient?.toBestDisplayName()}")
 
-    val repliesTo = event.tags.filter { it.firstOrNull() == "e" }.mapNotNull { it.getOrNull(1) }.map { getOrCreateNote(it) }
+    val repliesTo = event.tags.filter { it.firstOrNull() == "e" }.mapNotNull { it.getOrNull(1) }.mapNotNull { checkGetOrCreateNote(it) }
     val mentions = event.tags.filter { it.firstOrNull() == "p" }.mapNotNull { it.getOrNull(1) }.mapNotNull { checkGetOrCreateUser(it) }
 
     note.loadEvent(event, author, mentions, repliesTo)
@@ -293,7 +294,7 @@ object LocalCache {
 
     val author = getOrCreateUser(event.pubKey.toHexKey())
     val mentions = event.originalAuthor.mapNotNull { checkGetOrCreateUser(it) }
-    val repliesTo = event.boostedPost.map { getOrCreateNote(it) }
+    val repliesTo = event.boostedPost.mapNotNull { checkGetOrCreateNote(it) }
 
     note.loadEvent(event, author, mentions, repliesTo)
 
@@ -324,7 +325,7 @@ object LocalCache {
 
     val author = getOrCreateUser(event.pubKey.toHexKey())
     val mentions = event.originalAuthor.mapNotNull { checkGetOrCreateUser(it) }
-    val repliesTo = event.originalPost.map { getOrCreateNote(it) }
+    val repliesTo = event.originalPost.mapNotNull { checkGetOrCreateNote(it) }
 
     note.loadEvent(event, author, mentions, repliesTo)
 
@@ -369,7 +370,7 @@ object LocalCache {
 
     val author = getOrCreateUser(event.pubKey.toHexKey())
     val mentions = event.reportedAuthor.mapNotNull { checkGetOrCreateUser(it) }
-    val repliesTo = event.reportedPost.map { getOrCreateNote(it) }
+    val repliesTo = event.reportedPost.mapNotNull { checkGetOrCreateNote(it) }
 
     note.loadEvent(event, author, mentions, repliesTo)
 
@@ -410,7 +411,7 @@ object LocalCache {
     if (event.channel.isNullOrBlank()) return
 
     // new event
-    val oldChannel = getOrCreateChannel(event.channel)
+    val oldChannel = checkGetOrCreateChannel(event.channel) ?: return
     val author = getOrCreateUser(event.pubKey.toHexKey())
     if (event.createdAt > oldChannel.updatedMetadataAt) {
       if (oldChannel.creator == null || oldChannel.creator == author) {
@@ -430,9 +431,9 @@ object LocalCache {
 
   fun consume(event: ChannelMessageEvent, relay: Relay?) {
     if (event.channel.isNullOrBlank()) return
-    if (isRepeatedMessageSpam(event)) return
+    if (antiSpam.isSpam(event)) return
 
-    val channel = getOrCreateChannel(event.channel)
+    val channel = checkGetOrCreateChannel(event.channel) ?: return
 
     val note = getOrCreateNote(event.id.toHex())
     channel.addNote(note)
@@ -449,7 +450,7 @@ object LocalCache {
 
     val mentions = event.mentions.mapNotNull { checkGetOrCreateUser(it) }
     val replyTo = event.replyTos
-      .map { getOrCreateNote(it) }
+      .mapNotNull { checkGetOrCreateNote(it) }
       .filter { it.event !is ChannelCreateEvent }
 
     note.channel = channel
@@ -489,7 +490,7 @@ object LocalCache {
 
     val author = getOrCreateUser(event.pubKey.toHexKey())
     val mentions = event.zappedAuthor.mapNotNull { checkGetOrCreateUser(it) }
-    val repliesTo = event.zappedPost.map { getOrCreateNote(it) }
+    val repliesTo = event.zappedPost.mapNotNull { checkGetOrCreateNote(it) }
 
     note.loadEvent(event, author, mentions, repliesTo)
 
@@ -525,7 +526,7 @@ object LocalCache {
 
     val author = getOrCreateUser(event.pubKey.toHexKey())
     val mentions = event.zappedAuthor.mapNotNull { checkGetOrCreateUser(it) }
-    val repliesTo = event.zappedPost.map { getOrCreateNote(it) }
+    val repliesTo = event.zappedPost.mapNotNull { checkGetOrCreateNote(it) }
 
     note.loadEvent(event, author, mentions, repliesTo)
 
@@ -647,7 +648,6 @@ object LocalCache {
 
   // Observers line up here.
   val live: LocalCacheLiveData = LocalCacheLiveData(this)
-  val liveSpam: LocalCacheLiveData = LocalCacheLiveData(this)
 
   private fun refreshObservers() {
     live.invalidateData()

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

@@ -9,7 +9,7 @@ class ThreadAssembler {
     if (note.replyTo == null || note.replyTo?.isEmpty() == true) return note
 
     val markedAsRoot = note.event?.tags?.firstOrNull { it[0] == "e" && it.size > 3 && it[3] == "root" }?.getOrNull(1)
-    if (markedAsRoot != null) return LocalCache.getOrCreateNote(markedAsRoot)
+    if (markedAsRoot != null) return LocalCache.checkGetOrCreateNote(markedAsRoot)
 
     val hasNoReplyTo = note.replyTo?.firstOrNull { it.replyTo?.isEmpty() == true }
     if (hasNoReplyTo != null) return hasNoReplyTo

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

@@ -1,5 +1,7 @@
 package com.vitorpamplona.amethyst.model
 
+import android.util.Patterns
+import androidx.compose.ui.text.toLowerCase
 import androidx.lifecycle.LiveData
 import com.vitorpamplona.amethyst.service.NostrSingleUserDataSource
 import com.vitorpamplona.amethyst.service.model.LnZapEvent
@@ -9,6 +11,7 @@ import com.vitorpamplona.amethyst.ui.note.toShortenHex
 import fr.acinq.secp256k1.Hex
 import java.math.BigDecimal
 import java.util.concurrent.atomic.AtomicBoolean
+import java.util.regex.Pattern
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
@@ -16,10 +19,13 @@ import kotlinx.coroutines.NonCancellable
 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 nostr.postr.toNpub
 
+val lnurlpPattern = Pattern.compile("(?i:http|https):\\/\\/((.+)\\/)*\\.well-known\\/lnurlp\\/(.*)")
+
 class User(val pubkeyHex: String) {
     var info: UserMetadata? = null
 
@@ -231,6 +237,22 @@ class User(val pubkeyHex: String) {
         info?.latestMetadata = latestMetadata
         info?.updatedMetadataAt = latestMetadata.createdAt
 
+        if (newUserInfo.lud16.isNullOrBlank() && newUserInfo.lud06?.toLowerCase()?.startsWith("lnurl") == true) {
+            try {
+                val url = String(Bech32.decodeBytes(newUserInfo.lud06!!, false).second)
+
+                val matcher = lnurlpPattern.matcher(url)
+                while (matcher.find()) {
+                    val domain = matcher.group(2)
+                    val username = matcher.group(3)
+
+                    info?.lud16 = "$username@$domain"
+                }
+            } catch (t: Throwable) {
+                // Doesn't create errors.
+            }
+        }
+
         liveSet?.metadata?.invalidateData()
     }
 

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

@@ -45,11 +45,9 @@ import nostr.postr.events.TextNoteEvent
 
 @OptIn(ExperimentalComposeUiApi::class)
 @Composable
-fun NewPostView(onClose: () -> Unit, baseReplyTo: Note? = null, account: Account) {
+fun NewPostView(onClose: () -> Unit, baseReplyTo: Note? = null, quote: Note? = null, account: Account) {
     val postViewModel: NewPostViewModel = viewModel()
 
-    postViewModel.load(account, baseReplyTo)
-
     val context = LocalContext.current
 
     // initialize focus reference to be able to request focus programmatically
@@ -59,6 +57,7 @@ fun NewPostView(onClose: () -> Unit, baseReplyTo: Note? = null, account: Account
     val scroolState = rememberScrollState()
 
     LaunchedEffect(Unit) {
+        postViewModel.load(account, baseReplyTo, quote)
         delay(100)
         focusRequester.requestFocus()
 
@@ -245,6 +244,25 @@ fun PostButton(onPost: () -> Unit = {}, isActive: Boolean, modifier: Modifier =
     }
 }
 
+@Composable
+fun SaveButton(onPost: () -> Unit = {}, isActive: Boolean, modifier: Modifier = Modifier) {
+    Button(
+        modifier = modifier,
+        onClick = {
+            if (isActive) {
+                onPost()
+            }
+        },
+        shape = RoundedCornerShape(20.dp),
+        colors = ButtonDefaults
+            .buttonColors(
+                backgroundColor = if (isActive) MaterialTheme.colors.primary else Color.Gray
+            )
+    ) {
+        Text(text = "Save", color = Color.White)
+    }
+}
+
 @Composable
 fun CreateButton(onPost: () -> Unit = {}, isActive: Boolean, modifier: Modifier = Modifier) {
     Button(

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

@@ -31,7 +31,7 @@ class NewPostViewModel: ViewModel() {
     var userSuggestions by mutableStateOf<List<User>>(emptyList())
     var userSuggestionAnchor: TextRange? = null
 
-    fun load(account: Account, replyingTo: Note?) {
+    fun load(account: Account, replyingTo: Note?, quote: Note?) {
         originalNote = replyingTo
         replyingTo?.let { replyNote ->
             this.replyTos = (replyNote.replyTo ?: emptyList()).plus(replyNote)
@@ -45,49 +45,60 @@ class NewPostViewModel: ViewModel() {
 
             }
         }
+
+        quote?.let {
+            message = TextFieldValue(message.text + "\n\n@${it.idNote()}")
+        }
+
         this.account = account
     }
 
-    fun addUserToMentionsIfNotInAndReturnIndex(user: User): Int {
-        val replyToSize = replyTos?.size ?: 0
+    fun addUserToMentions(user: User) {
+        mentions = if (mentions?.contains(user) == true) mentions else mentions?.plus(user) ?: listOf(user)
+    }
 
-        var myMentions = mentions
-        if (myMentions == null) {
-            mentions = listOf(user)
-            return replyToSize + 0 // position of the user
-        }
+    fun addNoteToReplyTos(note: Note) {
+        note.author?.let { addUserToMentions(it) }
+        replyTos = if (replyTos?.contains(note) == true) replyTos else replyTos?.plus(note) ?: listOf(note)
+    }
 
-        val index = myMentions.indexOf(user)
+    fun tagIndex(user: User): Int {
+        // Postr Events assembles replies before mentions in the tag order
+        return (replyTos?.size ?: 0) + (mentions?.indexOf(user) ?: 0)
+    }
 
-        if (index >= 0) return replyToSize + index
-
-        myMentions = myMentions.plus(user)
-        mentions = myMentions
-        return replyToSize + myMentions.indexOf(user)
+    fun tagIndex(note: Note): Int {
+        // Postr Events assembles replies before mentions in the tag order
+        return (replyTos?.indexOf(note) ?: 0)
     }
 
     fun sendPost() {
-        // Moves @npub to mentions
+        // adds all references to mentions and reply tos
+        message.text.split('\n').forEach { paragraph: String ->
+            paragraph.split(' ').forEach { word: String ->
+                val results = parseDirtyWordForKey(word)
+
+                if (results?.type == "npub") {
+                    addUserToMentions(LocalCache.getOrCreateUser(results.keyHex))
+                } else if (results?.type == "note") {
+                    addNoteToReplyTos(LocalCache.getOrCreateNote(results.keyHex))
+                }
+            }
+        }
+
+        // Tags the text in the correct order.
         val newMessage = message.text.split('\n').map { paragraph: String ->
             paragraph.split(' ').map { word: String ->
-                try {
-                    if (word.startsWith("@npub") && word.length >= 64) {
-                        val keyB32 = word.substring(0, 64)
-                        val restOfWord = word.substring(64)
+                val results = parseDirtyWordForKey(word)
+                if (results?.type == "npub") {
+                    val user = LocalCache.getOrCreateUser(results.keyHex)
 
-                        val key = decodePublicKey(keyB32.removePrefix("@"))
-                        val user = LocalCache.getOrCreateUser(key.toHexKey())
+                    "#[${tagIndex(user)}]${results.restOfWord}"
+                } else if (results?.type == "note") {
+                    val note = LocalCache.getOrCreateNote(results.keyHex)
 
-                        val index = addUserToMentionsIfNotInAndReturnIndex(user)
-
-                        val newWord = "#[${index}]"
-
-                        newWord + restOfWord
-                    } else {
-                        word
-                    }
-                } catch (e: Exception) {
-                    // if it can't parse the key, don't try to change.
+                    "#[${tagIndex(note)}]${results.restOfWord}"
+                } else {
                     word
                 }
             }.joinToString(" ")
@@ -102,6 +113,7 @@ class NewPostViewModel: ViewModel() {
         message = TextFieldValue("")
         urlPreview = null
         isUploadingImage = false
+        mentions = null
     }
 
     fun upload(it: Uri, context: Context) {
@@ -128,6 +140,7 @@ class NewPostViewModel: ViewModel() {
         message = TextFieldValue("")
         urlPreview = null
         isUploadingImage = false
+        mentions = null
     }
 
     fun findUrlInMessage(): String? {

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

@@ -23,12 +23,15 @@ import androidx.compose.ui.graphics.Brush
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
 import androidx.navigation.NavController
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 
 @Composable
 fun ExpandableRichTextViewer(
   content: String,
   canPreview: Boolean,
+  modifier: Modifier = Modifier,
   tags: List<List<String>>?,
+  accountViewModel: AccountViewModel,
   navController: NavController
 ) {
   var showFullText by remember { mutableStateOf(false) }
@@ -36,7 +39,7 @@ fun ExpandableRichTextViewer(
   val text = if (showFullText) content else content.take(350)
 
   Box(contentAlignment = Alignment.BottomCenter) {
-    RichTextViewer(text, canPreview, tags, navController)
+    RichTextViewer(text, canPreview, modifier, tags, accountViewModel, navController)
 
     if (content.length > 350 && !showFullText) {
       Row(

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

@@ -2,11 +2,16 @@ package com.vitorpamplona.amethyst.ui.components
 
 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.shape.RoundedCornerShape
 import androidx.compose.material.*
 import androidx.compose.runtime.*
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
 import androidx.compose.ui.text.style.TextDirection
+import androidx.compose.ui.unit.dp
 import androidx.navigation.NavController
 import com.google.accompanist.flowlayout.FlowRow
 import com.vitorpamplona.amethyst.lnurl.LnInvoiceUtil
@@ -14,7 +19,9 @@ 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
@@ -45,12 +52,12 @@ fun isValidURL(url: String?): Boolean {
 fun RichTextViewer(
   content: String,
   canPreview: Boolean,
+  modifier: Modifier = Modifier,
   tags: List<List<String>>?,
-  navController: NavController
+  accountViewModel: AccountViewModel,
+  navController: NavController,
 ) {
-  Column(
-    Modifier
-      .animateContentSize()) {
+  Column(modifier = modifier.animateContentSize()) {
     // FlowRow doesn't work well with paragraphs. So we need to split them
     content.split('\n').forEach { paragraph ->
 
@@ -78,7 +85,7 @@ fun RichTextViewer(
             } else if (noProtocolUrlValidator.matcher(word).matches()) {
               UrlPreview("https://$word", word)
             } else if (tagIndex.matcher(word).matches() && tags != null) {
-              TagLink(word, tags, navController)
+              TagLink(word, tags, accountViewModel, navController)
             } else if (isBechLink(word)) {
               BechLink(word, navController)
             } else {
@@ -97,7 +104,7 @@ fun RichTextViewer(
             } else if (noProtocolUrlValidator.matcher(word).matches()) {
               ClickableUrl(word, "https://$word")
             } else if (tagIndex.matcher(word).matches() && tags != null) {
-              TagLink(word, tags, navController)
+              TagLink(word, tags, accountViewModel, navController)
             } else if (isBechLink(word)) {
               BechLink(word, navController)
             } else {
@@ -151,7 +158,7 @@ fun BechLink(word: String, navController: NavController) {
 
 
 @Composable
-fun TagLink(word: String, tags: List<List<String>>, navController: NavController) {
+fun TagLink(word: String, tags: List<List<String>>, accountViewModel: AccountViewModel, navController: NavController) {
   val matcher = tagIndex.matcher(word)
 
   val index = try {
@@ -177,7 +184,17 @@ fun TagLink(word: String, tags: List<List<String>>, navController: NavController
     } else if (tags[index][0] == "e") {
       val note = LocalCache.notes[tags[index][1]]
       if (note != null) {
-        ClickableNoteTag(note, navController)
+        //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))
+            .background(MaterialTheme.colors.onSurface.copy(alpha = 0.05f)),
+          isQuotedNote = true,
+          navController = navController)
       } else {
         Text(text = "${tags[index][1].toByteArray().toNote().toShortenHex()} ")
       }

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

@@ -37,6 +37,7 @@ import java.util.Locale
 fun TranslateableRichTextViewer(
   content: String,
   canPreview: Boolean,
+  modifier: Modifier = Modifier,
   tags: List<List<String>>?,
   accountViewModel: AccountViewModel,
   navController: NavController
@@ -70,7 +71,9 @@ fun TranslateableRichTextViewer(
     ExpandableRichTextViewer(
       toBeViewed,
       canPreview,
+      modifier,
       tags,
+      accountViewModel,
       navController
     )
 

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

@@ -1,6 +1,8 @@
 package com.vitorpamplona.amethyst.ui.note
 
+import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.background
+import androidx.compose.foundation.combinedClickable
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
@@ -26,9 +28,11 @@ import androidx.navigation.NavController
 import com.google.accompanist.flowlayout.FlowRow
 import com.vitorpamplona.amethyst.NotificationCache
 import com.vitorpamplona.amethyst.R
+import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
 import com.vitorpamplona.amethyst.ui.screen.BoostSetCard
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 
+@OptIn(ExperimentalFoundationApi::class)
 @Composable
 fun BoostSetCompose(boostSetCard: BoostSetCard, isInnerNote: Boolean = false, routeForLastRead: String, accountViewModel: AccountViewModel, navController: NavController) {
     val noteState by boostSetCard.note.live().metadata.observeAsState()
@@ -39,6 +43,9 @@ fun BoostSetCompose(boostSetCard: BoostSetCard, isInnerNote: Boolean = false, ro
 
     val context = LocalContext.current.applicationContext
 
+    val noteEvent = note?.event
+    var popupExpanded by remember { mutableStateOf(false) }
+
     if (note?.event == null) {
         BlankNote(Modifier, isInnerNote)
     } else {
@@ -55,6 +62,19 @@ fun BoostSetCompose(boostSetCard: BoostSetCard, isInnerNote: Boolean = false, ro
         Column(
             modifier = Modifier.background(
                 if (isNew) MaterialTheme.colors.primary.copy(0.12f) else MaterialTheme.colors.background
+            ).combinedClickable(
+                onClick = {
+                    if (noteEvent !is ChannelMessageEvent) {
+                        navController.navigate("Note/${note.idHex}"){
+                            launchSingleTop = true
+                        }
+                    } else {
+                        note.channel?.let {
+                            navController.navigate("Channel/${it.idHex}")
+                        }
+                    }
+                },
+                onLongClick = { popupExpanded = true }
             )
         ) {
             Row(modifier = Modifier
@@ -90,7 +110,16 @@ fun BoostSetCompose(boostSetCard: BoostSetCard, isInnerNote: Boolean = false, ro
                         }
                     }
 
-                    NoteCompose(note, null, Modifier.padding(top = 5.dp), true, accountViewModel, navController)
+                    NoteCompose(
+                        baseNote = note,
+                        routeForLastRead = null,
+                        modifier = Modifier.padding(top = 5.dp),
+                        isBoostedNote = true,
+                        accountViewModel = accountViewModel,
+                        navController = navController
+                    )
+
+                    NoteDropDownMenu(note, popupExpanded, { popupExpanded = false }, accountViewModel)
                 }
             }
         }

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

@@ -224,6 +224,7 @@ fun ChatroomMessageCompose(baseNote: Note, routeForLastRead: String?, innerQuote
                                         TranslateableRichTextViewer(
                                             eventContent,
                                             canPreview,
+                                            Modifier,
                                             note.event?.tags,
                                             accountViewModel,
                                             navController
@@ -232,6 +233,7 @@ fun ChatroomMessageCompose(baseNote: Note, routeForLastRead: String?, innerQuote
                                         TranslateableRichTextViewer(
                                             "Could Not decrypt the message",
                                             true,
+                                            Modifier,
                                             note.event?.tags,
                                             accountViewModel,
                                             navController

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

@@ -1,6 +1,8 @@
 package com.vitorpamplona.amethyst.ui.note
 
+import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.background
+import androidx.compose.foundation.combinedClickable
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
@@ -26,9 +28,11 @@ import androidx.navigation.NavController
 import com.google.accompanist.flowlayout.FlowRow
 import com.vitorpamplona.amethyst.NotificationCache
 import com.vitorpamplona.amethyst.R
+import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
 import com.vitorpamplona.amethyst.ui.screen.LikeSetCard
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 
+@OptIn(ExperimentalFoundationApi::class)
 @Composable
 fun LikeSetCompose(likeSetCard: LikeSetCard, modifier: Modifier = Modifier, isInnerNote: Boolean = false, routeForLastRead: String, accountViewModel: AccountViewModel, navController: NavController) {
     val noteState by likeSetCard.note.live().metadata.observeAsState()
@@ -39,6 +43,9 @@ fun LikeSetCompose(likeSetCard: LikeSetCard, modifier: Modifier = Modifier, isIn
 
     val context = LocalContext.current.applicationContext
 
+    val noteEvent = note?.event
+    var popupExpanded by remember { mutableStateOf(false) }
+
     if (note == null) {
         BlankNote(Modifier, isInnerNote)
     } else {
@@ -55,6 +62,19 @@ fun LikeSetCompose(likeSetCard: LikeSetCard, modifier: Modifier = Modifier, isIn
         Column(
             modifier = Modifier.background(
                 if (isNew) MaterialTheme.colors.primary.copy(0.12f) else MaterialTheme.colors.background
+            ).combinedClickable(
+                onClick = {
+                    if (noteEvent !is ChannelMessageEvent) {
+                        navController.navigate("Note/${note.idHex}"){
+                            launchSingleTop = true
+                        }
+                    } else {
+                        note.channel?.let {
+                            navController.navigate("Channel/${it.idHex}")
+                        }
+                    }
+                },
+                onLongClick = { popupExpanded = true }
             )
         ) {
             Row(modifier = Modifier
@@ -90,7 +110,16 @@ fun LikeSetCompose(likeSetCard: LikeSetCard, modifier: Modifier = Modifier, isIn
                         }
                     }
 
-                    NoteCompose(note, null, Modifier.padding(top = 5.dp), true, accountViewModel, navController)
+                    NoteCompose(
+                        baseNote = note,
+                        routeForLastRead = null,
+                        modifier = Modifier.padding(top = 5.dp),
+                        isBoostedNote = true,
+                        accountViewModel = accountViewModel,
+                        navController = navController
+                    )
+
+                    NoteDropDownMenu(note, popupExpanded, { popupExpanded = false }, accountViewModel)
                 }
             }
         }

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

@@ -56,7 +56,6 @@ import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.RoboHashCache
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.model.User
-import com.vitorpamplona.amethyst.model.toNote
 import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
 import com.vitorpamplona.amethyst.service.model.ReactionEvent
 import com.vitorpamplona.amethyst.service.model.ReportEvent
@@ -74,7 +73,8 @@ fun NoteCompose(
     baseNote: Note,
     routeForLastRead: String? = null,
     modifier: Modifier = Modifier,
-    isInnerNote: Boolean = false,
+    isBoostedNote: Boolean = false,
+    isQuotedNote: Boolean = false,
     accountViewModel: AccountViewModel,
     navController: NavController
 ) {
@@ -100,13 +100,13 @@ fun NoteCompose(
         BlankNote(modifier.combinedClickable(
             onClick = {  },
             onLongClick = { popupExpanded = true },
-        ), isInnerNote)
+        ), isBoostedNote)
     } else if (!account.isAcceptable(noteForReports) && !showHiddenNote) {
         HiddenNote(
             account.getRelevantReports(noteForReports),
             account.userProfile(),
             modifier,
-            isInnerNote,
+            isBoostedNote,
             navController,
             onClick = { showHiddenNote = true }
         )
@@ -150,12 +150,12 @@ fun NoteCompose(
             Row(
                 modifier = Modifier
                     .padding(
-                        start = if (!isInnerNote) 12.dp else 0.dp,
-                        end = if (!isInnerNote) 12.dp else 0.dp,
+                        start = if (!isBoostedNote) 12.dp else 0.dp,
+                        end = if (!isBoostedNote) 12.dp else 0.dp,
                         top = 10.dp)
             ) {
 
-                if (!isInnerNote) {
+                if (!isBoostedNote && !isQuotedNote) {
                     Column(Modifier.width(55.dp)) {
                     // Draws the boosted picture outside the boosted card.
                         Box(modifier = Modifier
@@ -222,9 +222,17 @@ fun NoteCompose(
                     }
                 }
 
-                Column(modifier = Modifier.padding(start = if (!isInnerNote) 10.dp else 0.dp)) {
+                Column(
+                    modifier = Modifier.padding(start = if (!isBoostedNote && !isQuotedNote) 10.dp else 0.dp)
+                ) {
                     Row(verticalAlignment = Alignment.CenterVertically) {
-                        NoteUsernameDisplay(note, Modifier.weight(1f))
+                        if (isQuotedNote) {
+                            NoteAuthorPicture(note, navController, account.userProfile(), 25.dp)
+                            NoteUsernameDisplay(note, Modifier.padding(start = 5.dp).weight(1f))
+                        } else {
+                            NoteUsernameDisplay(note, Modifier.weight(1f))
+                        }
+
 
                         if (noteEvent !is RepostEvent) {
                             Text(
@@ -268,7 +276,7 @@ fun NoteCompose(
                             NoteCompose(
                                 it,
                                 modifier = Modifier,
-                                isInnerNote = true,
+                                isBoostedNote = true,
                                 accountViewModel = accountViewModel,
                                 navController = navController
                             )
@@ -312,6 +320,7 @@ fun NoteCompose(
                             TranslateableRichTextViewer(
                                 eventContent,
                                 canPreview,
+                                Modifier.fillMaxWidth(),
                                 noteEvent.tags,
                                 accountViewModel,
                                 navController
@@ -546,7 +555,7 @@ fun NoteDropDownMenu(note: Note, popupExpanded: Boolean, onDismiss: () -> Unit,
         }
         Divider()
         DropdownMenuItem(onClick = { note.author?.let { accountViewModel.hide(it, context) }; onDismiss() }) {
-            Text("Hide User")
+            Text("Block & Hide User")
         }
         Divider()
         DropdownMenuItem(onClick = {

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

@@ -1,24 +1,39 @@
 package com.vitorpamplona.amethyst.ui.note
 
-import android.content.Intent
-import android.net.Uri
 import android.widget.Toast
+import androidx.compose.foundation.ExperimentalFoundationApi
+import androidx.compose.foundation.border
+import androidx.compose.foundation.combinedClickable
+import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.ExperimentalLayoutApi
+import androidx.compose.foundation.layout.FlowRow
 import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.imePadding
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.material.Button
+import androidx.compose.material.ButtonDefaults
 import androidx.compose.material.Icon
 import androidx.compose.material.IconButton
 import androidx.compose.material.MaterialTheme
+import androidx.compose.material.OutlinedTextField
+import androidx.compose.material.Surface
 import androidx.compose.material.Text
+import androidx.compose.material.TextFieldDefaults
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Bolt
-import androidx.compose.material.icons.filled.MoreVert
 import androidx.compose.material.icons.outlined.BarChart
 import androidx.compose.material.icons.outlined.Bolt
+import androidx.compose.material.ripple.rememberRipple
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.livedata.observeAsState
 import androidx.compose.runtime.mutableStateOf
@@ -26,28 +41,48 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
+import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.focus.focusRequester
+import androidx.compose.ui.focus.onFocusChanged
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.ColorFilter
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalSoftwareKeyboardController
 import androidx.compose.ui.platform.LocalUriHandler
 import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.semantics.Role
+import androidx.compose.ui.text.input.KeyboardCapitalization
+import androidx.compose.ui.text.input.KeyboardType
+import androidx.compose.ui.text.input.TextFieldValue
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.unit.IntOffset
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import androidx.core.content.ContextCompat
+import androidx.compose.ui.window.Dialog
+import androidx.compose.ui.window.DialogProperties
+import androidx.compose.ui.window.Popup
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewmodel.compose.viewModel
 import coil.compose.AsyncImage
 import coil.request.CachePolicy
 import coil.request.ImageRequest
+import com.vitorpamplona.amethyst.LocalPreferences
 import com.vitorpamplona.amethyst.R
-import com.vitorpamplona.amethyst.lnurl.LightningAddressResolver
+import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.ui.actions.CloseButton
 import com.vitorpamplona.amethyst.ui.actions.NewPostView
+import com.vitorpamplona.amethyst.ui.actions.SaveButton
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.theme.BitcoinOrange
 import java.math.BigDecimal
 import java.math.RoundingMode
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 
+@OptIn(ExperimentalFoundationApi::class)
 @Composable
 fun ReactionsRow(baseNote: Note, accountViewModel: AccountViewModel) {
   val accountState by accountViewModel.accountLiveData.observeAsState()
@@ -74,8 +109,20 @@ fun ReactionsRow(baseNote: Note, accountViewModel: AccountViewModel) {
     mutableStateOf<Note?>(null)
   }
 
+  var wantsToQuote by remember {
+    mutableStateOf<Note?>(null)
+  }
+
   if (wantsToReplyTo != null)
-    NewPostView({ wantsToReplyTo = null }, wantsToReplyTo, account)
+    NewPostView({ wantsToReplyTo = null }, wantsToReplyTo, null, account)
+
+  if (wantsToQuote != null)
+    NewPostView({ wantsToQuote = null }, null, wantsToQuote, account)
+
+  var wantsToZap by remember { mutableStateOf(false) }
+  var wantsToChangeZapAmount by remember { mutableStateOf(false) }
+
+  var wantsToBoost by remember { mutableStateOf(false) }
 
   Row(
     modifier = Modifier
@@ -118,7 +165,7 @@ fun ReactionsRow(baseNote: Note, accountViewModel: AccountViewModel) {
       modifier = Modifier.then(Modifier.size(20.dp)),
       onClick = {
         if (account.isWriteable())
-          accountViewModel.boost(baseNote)
+          wantsToBoost = true
         else
           scope.launch {
             Toast.makeText(
@@ -129,6 +176,20 @@ fun ReactionsRow(baseNote: Note, accountViewModel: AccountViewModel) {
           }
       }
     ) {
+      if (wantsToBoost) {
+        BoostTypeChoicePopup(
+          baseNote,
+          accountViewModel,
+          onDismiss = {
+            wantsToBoost = false
+          },
+          onQuote = {
+            wantsToBoost = false
+            wantsToQuote = baseNote
+          }
+        )
+      }
+
       if (boostedNote?.isBoostedBy(account.userProfile()) == true) {
         Icon(
           painter = painterResource(R.drawable.ic_retweeted),
@@ -192,26 +253,69 @@ fun ReactionsRow(baseNote: Note, accountViewModel: AccountViewModel) {
       modifier = Modifier.weight(1f)
     )
 
-    IconButton(
-      modifier = Modifier.then(Modifier.size(20.dp)),
-      onClick = {
-        if (account.isWriteable()) {
-          accountViewModel.zap(baseNote, 1000 * 1000, "", context) {
-            scope.launch {
-              Toast.makeText(context, it, Toast.LENGTH_SHORT).show()
+
+    Row(
+      modifier = Modifier
+        .then(Modifier.size(20.dp))
+        .combinedClickable(
+          role = Role.Button,
+          interactionSource = remember { MutableInteractionSource() },
+          indication = rememberRipple(bounded = false, radius = 24.dp),
+          onClick = {
+            if (account.zapAmountChoices.isEmpty()) {
+              scope.launch {
+                Toast
+                  .makeText(
+                    context,
+                    "No Zap Amount Setup. Long Press to change",
+                    Toast.LENGTH_SHORT
+                  )
+                  .show()
+              }
+            } else if (!account.isWriteable()) {
+              scope.launch {
+                Toast
+                  .makeText(
+                    context,
+                    "Login with a Private key to be able to send Zaps",
+                    Toast.LENGTH_SHORT
+                  )
+                  .show()
+              }
+            } else if (account.zapAmountChoices.size == 1) {
+              accountViewModel.zap(baseNote, account.zapAmountChoices.first() * 1000, "", context) {
+                scope.launch {
+                  Toast
+                    .makeText(context, it, Toast.LENGTH_SHORT)
+                    .show()
+                }
+              }
+            } else if (account.zapAmountChoices.size > 1) {
+              wantsToZap = true
             }
+          },
+          onLongClick = {
+            wantsToChangeZapAmount = true
           }
-        } else {
-          scope.launch {
-            Toast.makeText(
-              context,
-              "Login with a Private key to be able to send Zaps",
-              Toast.LENGTH_SHORT
-            ).show()
-          }
-        }
-      }
+        )
     ) {
+      if (wantsToZap) {
+        ZapAmountChoicePopup(
+          baseNote,
+          accountViewModel,
+          onDismiss = {
+            wantsToZap = false
+          },
+          onChangeAmount = {
+            wantsToZap = false
+            wantsToChangeZapAmount = true
+          }
+        )
+      }
+      if (wantsToChangeZapAmount) {
+        UpdateZapAmountDialog({ wantsToChangeZapAmount = false }, account = account)
+      }
+
       if (zappedNote?.isZappedBy(account.userProfile()) == true) {
         Icon(
           imageVector = Icons.Default.Bolt,
@@ -236,7 +340,6 @@ fun ReactionsRow(baseNote: Note, accountViewModel: AccountViewModel) {
       modifier = Modifier.weight(1f)
     )
 
-
     IconButton(
       modifier = Modifier.then(Modifier.size(20.dp)),
       onClick = { uri.openUri("https://counter.amethyst.social/${baseNote.idHex}/") }
@@ -265,6 +368,218 @@ fun ReactionsRow(baseNote: Note, accountViewModel: AccountViewModel) {
   }
 }
 
+
+
+@OptIn(ExperimentalLayoutApi::class)
+@Composable
+private fun BoostTypeChoicePopup(baseNote: Note, accountViewModel: AccountViewModel, onDismiss: () -> Unit, onQuote: () -> Unit) {
+  val scope = rememberCoroutineScope()
+
+  val accountState by accountViewModel.accountLiveData.observeAsState()
+  val account = accountState?.account ?: return
+
+  Popup(
+    alignment = Alignment.BottomCenter,
+    offset = IntOffset(0, -50),
+    onDismissRequest = { onDismiss() }
+  ) {
+    FlowRow() {
+      Button(
+        modifier = Modifier.padding(horizontal = 3.dp),
+        onClick = {
+          accountViewModel.boost(baseNote)
+          onDismiss()
+        },
+        shape = RoundedCornerShape(20.dp),
+        colors = ButtonDefaults
+          .buttonColors(
+            backgroundColor = MaterialTheme.colors.primary
+          )
+      ) {
+        Text("Boost", color = Color.White, textAlign = TextAlign.Center)
+      }
+
+      Button(
+        modifier = Modifier.padding(horizontal = 3.dp),
+        onClick = onQuote,
+        shape = RoundedCornerShape(20.dp),
+        colors = ButtonDefaults
+          .buttonColors(
+            backgroundColor = MaterialTheme.colors.primary
+          )
+      ) {
+        Text("Quote", color = Color.White, textAlign = TextAlign.Center)
+      }
+    }
+  }
+}
+
+@OptIn(ExperimentalFoundationApi::class, ExperimentalLayoutApi::class)
+@Composable
+private fun ZapAmountChoicePopup(baseNote: Note, accountViewModel: AccountViewModel, onDismiss: () -> Unit, onChangeAmount: () -> Unit) {
+  val context = LocalContext.current
+  val scope = rememberCoroutineScope()
+
+  val accountState by accountViewModel.accountLiveData.observeAsState()
+  val account = accountState?.account ?: return
+
+  Popup(
+    alignment = Alignment.BottomCenter,
+    offset = IntOffset(0, -50),
+    onDismissRequest = { onDismiss() }
+  ) {
+
+    FlowRow() {
+
+      account.zapAmountChoices.forEach { amountInSats ->
+        Button(
+          modifier = Modifier.padding(horizontal = 3.dp),
+          onClick = {
+            accountViewModel.zap(baseNote, amountInSats * 1000, "", context) {
+              scope.launch {
+                Toast.makeText(context, it, Toast.LENGTH_SHORT).show()
+              }
+            }
+            onDismiss()
+          },
+          shape = RoundedCornerShape(20.dp),
+          colors = ButtonDefaults
+            .buttonColors(
+              backgroundColor = MaterialTheme.colors.primary
+            )
+        ) {
+          Text("⚡ ${showAmount(amountInSats.toBigDecimal())}",
+            color = Color.White,
+            textAlign = TextAlign.Center,
+            modifier = Modifier.combinedClickable(
+              onClick = {
+                accountViewModel.zap(baseNote, amountInSats * 1000, "", context) {
+                  scope.launch {
+                    Toast.makeText(context, it, Toast.LENGTH_SHORT).show()
+                  }
+                }
+                onDismiss()
+              },
+              onLongClick = {
+                onChangeAmount()
+              },
+            )
+          )
+        }
+      }
+
+    }
+  }
+}
+
+class UpdateZapAmountViewModel: ViewModel() {
+  private var account: Account? = null
+
+  var amounts by mutableStateOf(TextFieldValue(""))
+
+  fun load(account: Account) {
+    this.account = account
+    this.amounts = TextFieldValue(account.zapAmountChoices.joinToString(", "))
+  }
+
+  fun toListOfAmounts(commaSeparatedAmounts: String): List<Long> {
+    return commaSeparatedAmounts.split(",").map { it.trim().toLongOrNull() ?: 0 }
+  }
+
+  fun updateAmounts(commaSeparatedAmounts: TextFieldValue) {
+    val correctedText = toListOfAmounts(commaSeparatedAmounts.text).joinToString(", ")
+    amounts = TextFieldValue(correctedText, commaSeparatedAmounts.selection, commaSeparatedAmounts.composition)
+  }
+
+  fun sendPost() {
+    account?.changeZapAmounts(toListOfAmounts(amounts.text))
+    amounts = TextFieldValue("")
+  }
+
+  fun cancel() {
+    amounts = TextFieldValue("")
+  }
+}
+
+
+@OptIn(ExperimentalComposeUiApi::class)
+@Composable
+fun UpdateZapAmountDialog(onClose: () -> Unit, account: Account) {
+  val postViewModel: UpdateZapAmountViewModel = viewModel()
+
+  val ctx = LocalContext.current.applicationContext
+
+  // initialize focus reference to be able to request focus programmatically
+  val focusRequester = remember { FocusRequester() }
+  val keyboardController = LocalSoftwareKeyboardController.current
+
+  LaunchedEffect(account) {
+    postViewModel.load(account)
+    delay(100)
+    focusRequester.requestFocus()
+  }
+
+  Dialog(
+    onDismissRequest = { onClose() },
+    properties = DialogProperties(
+      dismissOnClickOutside = false
+    )
+  ) {
+    Surface() {
+      Column(modifier = Modifier.padding(10.dp)) {
+        Row(
+          modifier = Modifier.fillMaxWidth(),
+          horizontalArrangement = Arrangement.SpaceBetween,
+          verticalAlignment = Alignment.CenterVertically
+        ) {
+          CloseButton(onCancel = {
+            postViewModel.cancel()
+            onClose()
+          })
+
+          SaveButton(
+            onPost = {
+              postViewModel.sendPost()
+              LocalPreferences(ctx).saveToEncryptedStorage(account)
+              onClose()
+            },
+            isActive = postViewModel.amounts.text.isNotBlank()
+          )
+        }
+
+        Row(modifier = Modifier.fillMaxWidth()) {
+          OutlinedTextField(
+            label = { Text(text = "Comma-separated Zap amounts in sats") },
+            value = postViewModel.amounts,
+            onValueChange = {
+              postViewModel.updateAmounts(it)
+            },
+            keyboardOptions = KeyboardOptions.Default.copy(
+              capitalization = KeyboardCapitalization.None,
+              keyboardType = KeyboardType.Decimal
+            ),
+            placeholder = {
+              Text(
+                text = "100, 1000, 5000",
+                color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+              )
+            },
+            singleLine = true,
+            modifier = Modifier
+              .fillMaxWidth()
+              .focusRequester(focusRequester)
+              .onFocusChanged {
+                if (it.isFocused) {
+                  keyboardController?.show()
+                }
+              }
+          )
+        }
+      }
+    }
+  }
+}
+
 fun showCount(count: Int?): String {
   if (count == null) return " "
   if (count == 0) return " "

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

@@ -1,6 +1,8 @@
 package com.vitorpamplona.amethyst.ui.note
 
+import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.background
+import androidx.compose.foundation.combinedClickable
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
@@ -25,10 +27,12 @@ import androidx.compose.ui.unit.dp
 import androidx.navigation.NavController
 import com.google.accompanist.flowlayout.FlowRow
 import com.vitorpamplona.amethyst.NotificationCache
+import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
 import com.vitorpamplona.amethyst.ui.screen.ZapSetCard
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.theme.BitcoinOrange
 
+@OptIn(ExperimentalFoundationApi::class)
 @Composable
 fun ZapSetCompose(zapSetCard: ZapSetCard, modifier: Modifier = Modifier, isInnerNote: Boolean = false, routeForLastRead: String, accountViewModel: AccountViewModel, navController: NavController) {
     val noteState by zapSetCard.note.live().metadata.observeAsState()
@@ -39,6 +43,9 @@ fun ZapSetCompose(zapSetCard: ZapSetCard, modifier: Modifier = Modifier, isInner
 
     val context = LocalContext.current.applicationContext
 
+    val noteEvent = note?.event
+    var popupExpanded by remember { mutableStateOf(false) }
+
     if (note == null) {
         BlankNote(Modifier, isInnerNote)
     } else {
@@ -55,6 +62,19 @@ fun ZapSetCompose(zapSetCard: ZapSetCard, modifier: Modifier = Modifier, isInner
         Column(
             modifier = Modifier.background(
                 if (isNew) MaterialTheme.colors.primary.copy(0.12f) else MaterialTheme.colors.background
+            ).combinedClickable(
+                onClick = {
+                  if (noteEvent !is ChannelMessageEvent) {
+                      navController.navigate("Note/${note.idHex}"){
+                          launchSingleTop = true
+                      }
+                  } else {
+                      note.channel?.let {
+                          navController.navigate("Channel/${it.idHex}")
+                      }
+                  }
+                },
+                onLongClick = { popupExpanded = true }
             )
         ) {
             Row(modifier = Modifier
@@ -90,7 +110,16 @@ fun ZapSetCompose(zapSetCard: ZapSetCard, modifier: Modifier = Modifier, isInner
                         }
                     }
 
-                    NoteCompose(note, null, Modifier.padding(top = 5.dp), true, accountViewModel, navController)
+                    NoteCompose(
+                        baseNote = note,
+                        routeForLastRead = null,
+                        modifier = Modifier.padding(top = 5.dp),
+                        isBoostedNote = true,
+                        accountViewModel = accountViewModel,
+                        navController = navController
+                    )
+
+                    NoteDropDownMenu(note, popupExpanded, { popupExpanded = false }, accountViewModel)
                 }
             }
         }

app/src/main/java/com/vitorpamplona/amethyst/ui/screen/CardFeedView.kt

@@ -5,7 +5,6 @@ import androidx.compose.animation.core.tween
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.runtime.Composable
@@ -16,7 +15,6 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.unit.dp
-import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.navigation.NavController
 import com.google.accompanist.swiperefresh.SwipeRefresh
 import com.google.accompanist.swiperefresh.rememberSwipeRefreshState
@@ -96,7 +94,7 @@ private fun FeedLoaded(
             when (item) {
                 is NoteCard -> NoteCompose(
                     item.note,
-                    isInnerNote = false,
+                    isBoostedNote = false,
                     accountViewModel = accountViewModel,
                     navController = navController,
                     routeForLastRead = routeForLastRead

app/src/main/java/com/vitorpamplona/amethyst/ui/screen/CardFeedViewModel.kt

@@ -38,6 +38,8 @@ open class CardFeedViewModel(val dataSource: FeedFilter<Note>): ViewModel() {
             refreshSuspended()
         }
     }
+
+    @Synchronized
     private fun refreshSuspended() {
         val notes = dataSource.loadTop()
 
@@ -126,14 +128,13 @@ open class CardFeedViewModel(val dataSource: FeedFilter<Note>): ViewModel() {
         val scope = CoroutineScope(Job() + Dispatchers.Default)
         scope.launch {
             try {
-                delay(50)
+                delay(150)
                 refresh()
             } finally {
                 withContext(NonCancellable) {
                     handlerWaiting.set(false)
                 }
             }
-            handlerWaiting.set(false)
         }
     }
 

app/src/main/java/com/vitorpamplona/amethyst/ui/screen/FeedView.kt

@@ -8,7 +8,6 @@ import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.material.Button
@@ -23,15 +22,10 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.unit.dp
-import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.navigation.NavController
 import com.google.accompanist.swiperefresh.SwipeRefresh
 import com.google.accompanist.swiperefresh.rememberSwipeRefreshState
-import com.vitorpamplona.amethyst.NotificationCache
-import com.vitorpamplona.amethyst.model.Note
-import com.vitorpamplona.amethyst.ui.navigation.Route
 import com.vitorpamplona.amethyst.ui.note.NoteCompose
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 
@@ -110,7 +104,7 @@ private fun FeedLoaded(
         itemsIndexed(state.feed.value, key = { _, item -> item.idHex }) { index, item ->
             NoteCompose(
                 item,
-                isInnerNote = false,
+                isBoostedNote = false,
                 routeForLastRead = routeForLastRead,
                 accountViewModel = accountViewModel,
                 navController = navController

app/src/main/java/com/vitorpamplona/amethyst/ui/screen/ThreadFeedView.kt

@@ -105,7 +105,7 @@ fun ThreadFeedView(noteId: String, viewModel: FeedViewModel, accountViewModel: A
                                             NoteCompose(
                                                 item,
                                                 modifier = Modifier.drawReplyLevel(item.replyLevel(), MaterialTheme.colors.onSurface.copy(alpha = 0.32f)),
-                                                isInnerNote = false,
+                                                isBoostedNote = false,
                                                 accountViewModel = accountViewModel,
                                                 navController = navController,
                                             )
@@ -163,7 +163,7 @@ fun NoteMaster(baseNote: Note, accountViewModel: AccountViewModel, navController
 
     if (note?.event == null) {
         BlankNote()
-    } else if (!account.isAcceptable(noteForReports)) {
+    } else if (!account.isAcceptable(noteForReports) && !showHiddenNote) {
         HiddenNote(
             account.getRelevantReports(noteForReports),
             account.userProfile(),
@@ -218,6 +218,7 @@ fun NoteMaster(baseNote: Note, accountViewModel: AccountViewModel, navController
                         TranslateableRichTextViewer(
                             eventContent,
                             canPreview,
+                            Modifier.fillMaxWidth(),
                             note.event?.tags,
                             accountViewModel,
                             navController

app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/AccountViewModel.kt

@@ -25,7 +25,7 @@ class AccountViewModel(private val account: Account): ViewModel() {
   }
 
   fun zap(note: Note, amount: Long, message: String, context: Context, onError: (String) -> Unit) {
-    val lud16 = note.author?.info?.lud16?.trim()
+    val lud16 = note.author?.info?.lud16?.trim() ?: note.author?.info?.lud06?.trim()
 
     if (lud16.isNullOrBlank()) {
       onError("User does not have a lightning address setup to receive sats")

app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ProfileScreen.kt

@@ -385,7 +385,7 @@ private fun DrawAdditionalInfo(baseUser: User, account: Account) {
 
     var ZapExpanded by remember { mutableStateOf(false) }
 
-    val lud16 = user.info?.lud16?.trim()
+    val lud16 = user.info?.lud16?.trim() ?: user.info?.lud06?.trim()
 
     if (!lud16.isNullOrEmpty()) {
         Row(verticalAlignment = Alignment.CenterVertically) {
@@ -781,7 +781,7 @@ fun UserProfileDropDownMenu(user: User, popupExpanded: Boolean, onDismiss: () ->
                 }
             } else {
                 DropdownMenuItem(onClick = { user.let { accountViewModel.hide(it, context) }; onDismiss() }) {
-                    Text("Hide User")
+                    Text("Block & Hide User")
                 }
             }
             Divider()

app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/SearchScreen.kt

@@ -223,6 +223,7 @@ private fun SearchBar(accountViewModel: AccountViewModel, navController: NavCont
                     }
                 }
             },
+            singleLine = true,
             colors = TextFieldDefaults.textFieldColors(
                 focusedIndicatorColor = Color.Transparent,
                 unfocusedIndicatorColor = Color.Transparent

app/src/test/java/com/vitorpamplona/amethyst/ExampleUnitTest.kt

@@ -1,16 +0,0 @@
-package com.vitorpamplona.amethyst
-
-import org.junit.Assert.assertEquals
-import org.junit.Test
-
-/**
- * Example local unit test, which will execute on the development machine (host).
- *
- * See [testing documentation](http://d.android.com/tools/testing).
- */
-class ExampleUnitTest {
-  @Test
-  fun addition_isCorrect() {
-    assertEquals(4, 2 + 2)
-  }
-}

app/src/test/java/com/vitorpamplona/amethyst/KeyParseTest.kt

@@ -0,0 +1,93 @@
+package com.vitorpamplona.amethyst
+
+import com.vitorpamplona.amethyst.model.parseDirtyWordForKey
+import org.junit.Assert.assertEquals
+import org.junit.Test
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+class KeyParseTest {
+  @Test
+  fun keyParseTestNote() {
+    val result = parseDirtyWordForKey("note1z5e2m0smx6d7e2d0zaq8d3rnd7httm6j0uf8tf90yqqjrs842czshwtkmn")
+    assertEquals("note", result?.type)
+    assertEquals("1532adbe1b369beca9af174076c4736faeb5ef527f1275a4af200121c0f55605", result?.keyHex)
+    assertEquals("", result?.restOfWord)
+  }
+
+  @Test
+  fun keyParseTestPub() {
+    val result = parseDirtyWordForKey("npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z")
+    assertEquals("npub", result?.type)
+    assertEquals("460c25e682fda7832b52d1f22d3d22b3176d972f60dcdc3212ed8c92ef85065c", result?.keyHex)
+    assertEquals("", result?.restOfWord)
+  }
+
+  @Test
+  fun keyParseTestNoteWithExtraChars() {
+    val result = parseDirtyWordForKey("note1z5e2m0smx6d7e2d0zaq8d3rnd7httm6j0uf8tf90yqqjrs842czshwtkmn,")
+    assertEquals("note", result?.type)
+    assertEquals("1532adbe1b369beca9af174076c4736faeb5ef527f1275a4af200121c0f55605", result?.keyHex)
+    assertEquals(",", result?.restOfWord)
+  }
+
+  @Test
+  fun keyParseTestPubWithExtraChars() {
+    val result = parseDirtyWordForKey("npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z,")
+    assertEquals("npub", result?.type)
+    assertEquals("460c25e682fda7832b52d1f22d3d22b3176d972f60dcdc3212ed8c92ef85065c", result?.keyHex)
+    assertEquals(",", result?.restOfWord)
+  }
+
+  @Test
+  fun keyParseTestNoteWithExtraCharsAndAt() {
+    val result = parseDirtyWordForKey("@note1z5e2m0smx6d7e2d0zaq8d3rnd7httm6j0uf8tf90yqqjrs842czshwtkmn,")
+    assertEquals("note", result?.type)
+    assertEquals("1532adbe1b369beca9af174076c4736faeb5ef527f1275a4af200121c0f55605", result?.keyHex)
+    assertEquals(",", result?.restOfWord)
+  }
+
+  @Test
+  fun keyParseTestPubWithExtraCharsAndAt() {
+    val result = parseDirtyWordForKey("@npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z,")
+    assertEquals("npub", result?.type)
+    assertEquals("460c25e682fda7832b52d1f22d3d22b3176d972f60dcdc3212ed8c92ef85065c", result?.keyHex)
+    assertEquals(",", result?.restOfWord)
+  }
+
+  @Test
+  fun keyParseTestNoteWithExtraCharsAndNostrPrefix() {
+    val result = parseDirtyWordForKey("nostr:note1z5e2m0smx6d7e2d0zaq8d3rnd7httm6j0uf8tf90yqqjrs842czshwtkmn,")
+    assertEquals("note", result?.type)
+    assertEquals("1532adbe1b369beca9af174076c4736faeb5ef527f1275a4af200121c0f55605", result?.keyHex)
+    assertEquals(",", result?.restOfWord)
+  }
+
+  @Test
+  fun keyParseTestPubWithExtraCharsAndNostrPrefix() {
+    val result = parseDirtyWordForKey("nostr:npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z,")
+    assertEquals("npub", result?.type)
+    assertEquals("460c25e682fda7832b52d1f22d3d22b3176d972f60dcdc3212ed8c92ef85065c", result?.keyHex)
+    assertEquals(",", result?.restOfWord)
+  }
+
+
+  @Test
+  fun keyParseTestUppercaseNoteWithExtraCharsAndNostrPrefix() {
+    val result = parseDirtyWordForKey("Nostr:note1z5e2m0smx6d7e2d0zaq8d3rnd7httm6j0uf8tf90yqqjrs842czshwtkmn,")
+    assertEquals("note", result?.type)
+    assertEquals("1532adbe1b369beca9af174076c4736faeb5ef527f1275a4af200121c0f55605", result?.keyHex)
+    assertEquals(",", result?.restOfWord)
+  }
+
+  @Test
+  fun keyParseTestUppercasePubWithExtraCharsAndNostrPrefix() {
+    val result = parseDirtyWordForKey("nOstr:npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z,")
+    assertEquals("npub", result?.type)
+    assertEquals("460c25e682fda7832b52d1f22d3d22b3176d972f60dcdc3212ed8c92ef85065c", result?.keyHex)
+    assertEquals(",", result?.restOfWord)
+  }
+}

build.gradle

@@ -7,8 +7,8 @@ buildscript {
     }
 }// Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id 'com.android.application' version '7.4.0' apply false
-    id 'com.android.library' version '7.4.0' apply false
+    id 'com.android.application' version '7.4.1' apply false
+    id 'com.android.library' version '7.4.1' apply false
     id 'org.jetbrains.kotlin.android' version '1.8.0' apply false
     id 'org.jetbrains.kotlin.jvm' version '1.8.0' apply false
 }