bugfix for status key in timeline

DimensionDev · Sep 26, 2024 · 8429714 · 8429714
1 parent 21cbf3f
commit 8429714
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 7 deletions.
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiTimeline.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiTimeline.kt
@@ -149,6 +149,7 @@ data class UiTimeline internal constructor(
         val icon: Icon,
         val type: MessageType,
         val onClicked: ClickContext.() -> Unit,
+        val statusKey: MicroBlogKey,
     ) {
         val itemKey: String
             get() =
@@ -158,6 +159,7 @@ data class UiTimeline internal constructor(
                     if (user != null) {
                         append(user.key)
                     }
+                    append(statusKey.toString())
                 }
 
         enum class Icon {

diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/Bluesky.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/Bluesky.kt
@@ -160,6 +160,7 @@ internal fun FeedViewPostReasonUnion.render(
                             ),
                         )
                     },
+                    statusKey = MicroBlogKey(id = data?.uri?.atUri.orEmpty(), host = accountKey.host),
                 )
             },
         content = data?.renderStatus(accountKey, event),
@@ -198,6 +199,7 @@ internal fun ListNotificationsNotification.render(accountKey: MicroBlogKey): UiT
                 onClicked = {
                     launcher.launch(AppDeepLink.Profile(accountKey = accountKey, userKey = user.key))
                 },
+                statusKey = MicroBlogKey(id = uri.atUri, host = accountKey.host),
             ),
         content = UiTimeline.ItemContent.User(author.render(accountKey)),
         platformType = PlatformType.Bluesky,

diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/Mastodon.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/Mastodon.kt
@@ -85,6 +85,7 @@ internal fun Notification.render(
                         ),
                     )
                 },
+                statusKey = MicroBlogKey(id ?: "", accountKey.host),
             )
         }
     return UiTimeline(
@@ -107,6 +108,8 @@ internal fun Status.render(
 ): UiTimeline {
     requireNotNull(account) { "account is null" }
     val user = account.render(accountKey)
+    val currentStatus = this.renderStatus(accountKey, event)
+    val actualStatus = (references[ReferenceType.Retweet] as? StatusContent.Mastodon)?.data ?: this
     val topMessage =
         if (reblog == null) {
             null
@@ -123,10 +126,9 @@ internal fun Status.render(
                         ),
                     )
                 },
+                statusKey = currentStatus.statusKey,
             )
         }
-    val currentStatus = this.renderStatus(accountKey, event)
-    val actualStatus = (references[ReferenceType.Retweet] as? StatusContent.Mastodon)?.data ?: this
     return UiTimeline(
         topMessage = topMessage,
         content =
@@ -139,7 +141,6 @@ internal fun Status.render(
                         ),
                     )
                 },
-                statusKey = currentStatus.statusKey,
             ),
         platformType = PlatformType.Mastodon,
     )

diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/Misskey.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/Misskey.kt
@@ -124,6 +124,7 @@ internal fun Notification.render(
                     launcher.launch(AppDeepLink.Profile(accountKey = accountKey, userKey = user.key))
                 }
             },
+            statusKey = MicroBlogKey(id, accountKey.host),
         )
     return UiTimeline(
         topMessage = topMessage,
@@ -241,6 +242,8 @@ internal fun Note.render(
 ): UiTimeline {
     val user = user.render(accountKey)
     val renote = (references[ReferenceType.Retweet] as? StatusContent.Misskey)?.data
+    val currentStatus = this.renderStatus(accountKey, event)
+    val actualStatus = renote ?: this
     val topMessage =
         if (renote == null || !text.isNullOrEmpty()) {
             null
@@ -257,10 +260,9 @@ internal fun Note.render(
                         ),
                     )
                 },
+                statusKey = currentStatus.statusKey,
             )
         }
-    val currentStatus = this.renderStatus(accountKey, event)
-    val actualStatus = renote ?: this
     return UiTimeline(
         topMessage = topMessage,
         content =
@@ -273,7 +275,6 @@ internal fun Note.render(
                         ),
                     )
                 },
-                statusKey = currentStatus.statusKey,
             ),
         platformType = PlatformType.Misskey,
     )

diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/VVO.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/VVO.kt
@@ -42,6 +42,7 @@ internal fun Status.render(
                             .Custom(it),
                     onClicked = {
                     },
+                    statusKey = MicroBlogKey(id, vvoHost),
                 )
             },
         content = renderStatus(accountKey, event),
@@ -454,6 +455,7 @@ internal fun Attitude.render(
                         )
                     }
                 },
+                statusKey = MicroBlogKey(id.toString(), vvoHost),
             ),
         content = content,
         platformType = PlatformType.VVo,

diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/XQT.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/XQT.kt
@@ -143,6 +143,7 @@ internal fun TopLevel.renderNotifications(
                                     launcher.launch(url)
                                 }
                             },
+                            statusKey = MicroBlogKey(id = notification.id.orEmpty(), host = accountKey.host),
                         ),
                     content = itemContent,
                     platformType = PlatformType.xQt,
@@ -188,6 +189,7 @@ internal fun TopLevel.renderNotifications(
                             onClicked = {
                                 launcher.launch(AppDeepLink.Profile(accountKey = accountKey, userKey = renderedUser.key))
                             },
+                            statusKey = MicroBlogKey(id = notification?.id.orEmpty(), host = accountKey.host),
                         ),
                     content = data,
                     platformType = PlatformType.xQt,
@@ -220,6 +222,7 @@ internal fun Tweet.render(
                 onClicked = {
                     launcher.launch(AppDeepLink.Profile(accountKey = accountKey, userKey = user.key))
                 },
+                statusKey = currentTweet.statusKey,
             )
         } else {
             null
@@ -235,7 +238,6 @@ internal fun Tweet.render(
                         ),
                     )
                 },
-                statusKey = currentTweet.statusKey,
             ),
         topMessage = topMessage,
         platformType = PlatformType.xQt,