v0.9.2:

- Fixes bug when tagging new users on reply
- Fixes bug on likes not being shown.
- Fixes alignment of the time in the home feed.

app/build.gradle

@@ -11,8 +11,8 @@ android {
         applicationId "com.vitorpamplona.amethyst"
         minSdk 26
         targetSdk 33
-        versionCode 12
-        versionName "0.9.1"
+        versionCode 13
+        versionName "0.9.2"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {

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

@@ -95,36 +95,20 @@ class Account(val loggedIn: Persona, val followingChannels: MutableSet<String> =
     }
   }
 
-  fun sendPost(message: String, originalNote: Note?, modifiedMentions: List<User>?) {
+  fun sendPost(message: String, replyTo: List<Note>?, mentions: List<User>?) {
     if (!isWriteable()) return
 
-    val replyToEvent = originalNote?.event
-    if (replyToEvent is TextNoteEvent) {
-      val modifiedMentionsHex = modifiedMentions?.map { it.pubkeyHex }?.toSet() ?: emptySet()
+    val repliesToHex = replyTo?.map { it.idHex }
+    val mentionsHex = mentions?.map { it.pubkeyHex }
 
-      val repliesTo = replyToEvent.replyTos.plus(replyToEvent.id.toHex())
-      val mentions = replyToEvent.mentions.plus(replyToEvent.pubKey.toHex()).plus(modifiedMentionsHex).filter {
-        it in modifiedMentionsHex
-      }
-
-      val signedEvent = TextNoteEvent.create(
-        msg = message,
-        replyTos = repliesTo,
-        mentions = mentions,
-        privateKey = loggedIn.privKey!!
-      )
-      Client.send(signedEvent)
-      LocalCache.consume(signedEvent)
-    } else {
-      val signedEvent = TextNoteEvent.create(
-        msg = message,
-        replyTos = null,
-        mentions = modifiedMentions?.map { it.pubkeyHex } ?: emptyList(),
-        privateKey = loggedIn.privKey!!
-      )
-      Client.send(signedEvent)
-      LocalCache.consume(signedEvent)
-    }
+    val signedEvent = TextNoteEvent.create(
+      msg = message,
+      replyTos = repliesToHex,
+      mentions = mentionsHex,
+      privateKey = loggedIn.privKey!!
+    )
+    Client.send(signedEvent)
+    LocalCache.consume(signedEvent)
   }
 
   fun sendChannelMeesage(message: String, toChannel: String, replyingTo: Note? = null) {

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

@@ -12,7 +12,7 @@ object NostrSingleEventDataSource: NostrDataSource<Note>("SingleEventFeed") {
   private var eventsToWatch = setOf<String>()
 
   private fun createRepliesAndReactionsFilter(): JsonFilter? {
-    val reactionsToWatch = eventsToWatch.map { it.substring(0, 8) }
+    val reactionsToWatch = eventsToWatch.map { it }
 
     if (reactionsToWatch.isEmpty()) {
       return null
@@ -38,7 +38,7 @@ object NostrSingleEventDataSource: NostrDataSource<Note>("SingleEventFeed") {
 
     val interestedEvents =
       (directEventsToLoad + threadingEventsToLoad)
-      .map { it.idHex.substring(0, 8) }
+      .map { it.idHex }
 
     if (interestedEvents.isEmpty()) {
       return null

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

@@ -16,7 +16,7 @@ object NostrSingleUserDataSource: NostrDataSource<Note>("SingleUserFeed") {
       JsonFilter(
         kinds = listOf(MetadataEvent.kind),
         authors = listOf(it.substring(0, 8)),
-        limit = 10
+        limit = 1
       )
     }
   }

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

@@ -12,7 +12,7 @@ object NostrThreadDataSource: NostrDataSource<Note>("SingleThreadFeed") {
   val eventsToWatch = Collections.synchronizedList(mutableListOf<String>())
 
   fun createRepliesAndReactionsFilter(): JsonFilter? {
-    val reactionsToWatch = eventsToWatch.map { it.substring(0, 8) }
+    val reactionsToWatch = eventsToWatch.map { it }
 
     if (reactionsToWatch.isEmpty()) {
       return null

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

@@ -38,7 +38,13 @@ class NewPostViewModel: ViewModel() {
         replyingTo?.let { replyNote ->
             this.replyTos = (replyNote.replyTo ?: mutableListOf()).plus(replyNote).toMutableList()
             replyNote.author?.let { replyUser ->
-                this.mentions = (replyNote.mentions ?: emptyList()).plus(replyUser)
+                val currentMentions = replyNote.mentions ?: emptyList()
+                if (currentMentions.contains(replyUser)) {
+                    this.mentions = currentMentions
+                } else {
+                    this.mentions = currentMentions.plus(replyUser)
+                }
+
             }
         }
         this.account = account
@@ -89,7 +95,7 @@ class NewPostViewModel: ViewModel() {
             }.joinToString(" ")
         }.joinToString("\n")
 
-        account?.sendPost(newMessage, originalNote, mentions)
+        account?.sendPost(newMessage, replyTos, mentions)
         message = TextFieldValue("")
         urlPreview = null
     }

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

@@ -15,6 +15,9 @@ fun UsernameDisplay(user: User, weight: Modifier = Modifier) {
         Text(
           "@${(user.bestUsername() ?: "")}",
           fontWeight = FontWeight.Bold,
+          maxLines = 1,
+          overflow = TextOverflow.Ellipsis,
+          modifier = weight
         )
       } else {
         Text(
@@ -33,6 +36,9 @@ fun UsernameDisplay(user: User, weight: Modifier = Modifier) {
       Text(
         user.pubkeyDisplayHex,
         fontWeight = FontWeight.Bold,
+        maxLines = 1,
+        overflow = TextOverflow.Ellipsis,
+        modifier = weight
       )
     }
 }