Bugfix for saving Replaceable notes in Bookmarks.

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

@@ -593,7 +593,21 @@ class Account(
 
         val bookmarks = userProfile().latestBookmarkList
 
-        val event = BookmarkListEvent.create(
+        val event = if (note is AddressableNote) {
+            BookmarkListEvent.create(
+                "bookmark",
+                bookmarks?.taggedEvents() ?: emptyList(),
+                bookmarks?.taggedUsers() ?: emptyList(),
+                bookmarks?.taggedAddresses() ?: emptyList(),
+
+                bookmarks?.privateTaggedEvents(privKey = loggedIn.privKey!!) ?: emptyList(),
+                bookmarks?.privateTaggedUsers(privKey = loggedIn.privKey!!) ?: emptyList(),
+                bookmarks?.privateTaggedAddresses(privKey = loggedIn.privKey!!)?.plus(note.address) ?: listOf(note.address),
+
+                loggedIn.privKey!!
+            )
+        } else {
+            BookmarkListEvent.create(
                 "bookmark",
                 bookmarks?.taggedEvents() ?: emptyList(),
                 bookmarks?.taggedUsers() ?: emptyList(),
@@ -605,6 +619,7 @@ class Account(
 
                 loggedIn.privKey!!
             )
+        }
 
         Client.send(event)
         LocalCache.consume(event)
@@ -615,7 +630,21 @@ class Account(
 
         val bookmarks = userProfile().latestBookmarkList
 
-        val event = BookmarkListEvent.create(
+        val event = if (note is AddressableNote) {
+            BookmarkListEvent.create(
+                "bookmark",
+                bookmarks?.taggedEvents() ?: emptyList(),
+                bookmarks?.taggedUsers() ?: emptyList(),
+                bookmarks?.taggedAddresses()?.plus(note.address) ?: listOf(note.address),
+
+                bookmarks?.privateTaggedEvents(privKey = loggedIn.privKey!!) ?: emptyList(),
+                bookmarks?.privateTaggedUsers(privKey = loggedIn.privKey!!) ?: emptyList(),
+                bookmarks?.privateTaggedAddresses(privKey = loggedIn.privKey!!) ?: emptyList(),
+
+                loggedIn.privKey!!
+            )
+        } else {
+            BookmarkListEvent.create(
                 "bookmark",
                 bookmarks?.taggedEvents()?.plus(note.idHex) ?: listOf(note.idHex),
                 bookmarks?.taggedUsers() ?: emptyList(),
@@ -627,6 +656,7 @@ class Account(
 
                 loggedIn.privKey!!
             )
+        }
 
         Client.send(event)
         LocalCache.consume(event)
@@ -637,7 +667,21 @@ class Account(
 
         val bookmarks = userProfile().latestBookmarkList
 
-        val event = BookmarkListEvent.create(
+        val event = if (note is AddressableNote) {
+            BookmarkListEvent.create(
+                "bookmark",
+                bookmarks?.taggedEvents() ?: emptyList(),
+                bookmarks?.taggedUsers() ?: emptyList(),
+                bookmarks?.taggedAddresses() ?: emptyList(),
+
+                bookmarks?.privateTaggedEvents(privKey = loggedIn.privKey!!) ?: emptyList(),
+                bookmarks?.privateTaggedUsers(privKey = loggedIn.privKey!!) ?: emptyList(),
+                bookmarks?.privateTaggedAddresses(privKey = loggedIn.privKey!!)?.minus(note.address) ?: listOf(),
+
+                loggedIn.privKey!!
+            )
+        } else {
+            BookmarkListEvent.create(
                 "bookmark",
                 bookmarks?.taggedEvents() ?: emptyList(),
                 bookmarks?.taggedUsers() ?: emptyList(),
@@ -649,6 +693,7 @@ class Account(
 
                 loggedIn.privKey!!
             )
+        }
 
         Client.send(event)
         LocalCache.consume(event)
@@ -665,7 +710,21 @@ class Account(
 
         val bookmarks = userProfile().latestBookmarkList
 
-        val event = BookmarkListEvent.create(
+        val event = if (note is AddressableNote) {
+            BookmarkListEvent.create(
+                "bookmark",
+                bookmarks?.taggedEvents() ?: emptyList(),
+                bookmarks?.taggedUsers() ?: emptyList(),
+                bookmarks?.taggedAddresses()?.minus(note.address),
+
+                bookmarks?.privateTaggedEvents(privKey = loggedIn.privKey!!) ?: emptyList(),
+                bookmarks?.privateTaggedUsers(privKey = loggedIn.privKey!!) ?: emptyList(),
+                bookmarks?.privateTaggedAddresses(privKey = loggedIn.privKey!!) ?: emptyList(),
+
+                loggedIn.privKey!!
+            )
+        } else {
+            BookmarkListEvent.create(
                 "bookmark",
                 bookmarks?.taggedEvents()?.minus(note.idHex),
                 bookmarks?.taggedUsers() ?: emptyList(),
@@ -677,6 +736,7 @@ class Account(
 
                 loggedIn.privKey!!
             )
+        }
 
         Client.send(event)
         LocalCache.consume(event)

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

@@ -2183,13 +2183,15 @@ fun NoteDropDownMenu(note: Note, popupExpanded: Boolean, onDismiss: () -> Unit,
     val actContext = LocalContext.current
     var reportDialogShowing by remember { mutableStateOf(false) }
 
+    val bookmarkState by accountViewModel.userProfile().live().bookmarks.observeAsState()
+
     var state by remember {
         mutableStateOf<DropDownParams>(
             DropDownParams(false, false, false, false)
         )
     }
 
-    LaunchedEffect(key1 = note) {
+    LaunchedEffect(key1 = note, key2 = bookmarkState) {
         withContext(Dispatchers.IO) {
             state = DropDownParams(
                 accountViewModel.isFollowing(note.author),