Merge pull request #1204 from DimensionDev/bugfix/reference_status

Tlaster · web-flow · commit b07a1925b110 · 2025-09-01T16:32:42.000+09:00
fix reference status not being deleted
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/mapper/Microblog.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/mapper/Microblog.kt
@@ -90,6 +90,10 @@ internal suspend fun saveToDatabase(
     ).let {
         database.statusDao().insertAll(it)
     }
+    items.map { it.status.status.data.statusKey }.let {
+        // in case of timeline change, remove old references
+        database.statusReferenceDao().delete(it)
+    }
     items.flatMap { it.status.references }.map { it.reference }.let {
         database.statusReferenceDao().delete(it.map { it.statusKey })
         database.statusReferenceDao().insertAll(it)
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/bluesky/BlueskyDataSource.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/bluesky/BlueskyDataSource.kt
@@ -67,6 +67,7 @@ import dev.dimension.flare.common.MemCacheable
 import dev.dimension.flare.common.encodeJson
 import dev.dimension.flare.data.database.app.AppDatabase
 import dev.dimension.flare.data.database.cache.CacheDatabase
+import dev.dimension.flare.data.database.cache.connect
 import dev.dimension.flare.data.database.cache.mapper.Bluesky
 import dev.dimension.flare.data.database.cache.mapper.toDbUser
 import dev.dimension.flare.data.database.cache.model.MessageContent
@@ -121,7 +122,6 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.distinctUntilChanged
-import kotlinx.coroutines.flow.filterIsInstance
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.mapNotNull
@@ -862,14 +862,17 @@ internal class BlueskyDataSource(
                 ),
             )
             // delete status from cache
-            database.statusDao().delete(
-                statusKey = statusKey,
-                accountType = AccountType.Specific(accountKey),
-            )
-            database.pagingTimelineDao().deleteStatus(
-                accountKey = accountKey,
-                statusKey = statusKey,
-            )
+            database.connect {
+                database.statusDao().delete(
+                    statusKey = statusKey,
+                    accountType = AccountType.Specific(accountKey),
+                )
+                database.statusReferenceDao().delete(statusKey)
+                database.pagingTimelineDao().deleteStatus(
+                    accountKey = accountKey,
+                    statusKey = statusKey,
+                )
+            }
         }
     }
 
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/MastodonDataSource.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/mastodon/MastodonDataSource.kt
@@ -12,6 +12,7 @@ import dev.dimension.flare.common.CacheData
 import dev.dimension.flare.common.Cacheable
 import dev.dimension.flare.common.MemCacheable
 import dev.dimension.flare.data.database.cache.CacheDatabase
+import dev.dimension.flare.data.database.cache.connect
 import dev.dimension.flare.data.database.cache.mapper.Mastodon
 import dev.dimension.flare.data.database.cache.mapper.toDb
 import dev.dimension.flare.data.database.cache.mapper.toDbUser
@@ -533,14 +534,17 @@ internal open class MastodonDataSource(
         tryRun {
             service.delete(statusKey.id)
             // delete status from cache
-            database.statusDao().delete(
-                statusKey = statusKey,
-                accountType = AccountType.Specific(accountKey),
-            )
-            database.pagingTimelineDao().deleteStatus(
-                accountKey = accountKey,
-                statusKey = statusKey,
-            )
+            database.connect {
+                database.statusDao().delete(
+                    statusKey = statusKey,
+                    accountType = AccountType.Specific(accountKey),
+                )
+                database.statusReferenceDao().delete(statusKey)
+                database.pagingTimelineDao().deleteStatus(
+                    accountKey = accountKey,
+                    statusKey = statusKey,
+                )
+            }
         }
     }
 
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/MisskeyDataSource.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/misskey/MisskeyDataSource.kt
@@ -12,6 +12,7 @@ import dev.dimension.flare.common.CacheData
 import dev.dimension.flare.common.Cacheable
 import dev.dimension.flare.common.MemCacheable
 import dev.dimension.flare.data.database.cache.CacheDatabase
+import dev.dimension.flare.data.database.cache.connect
 import dev.dimension.flare.data.database.cache.mapper.Misskey
 import dev.dimension.flare.data.database.cache.mapper.toDb
 import dev.dimension.flare.data.database.cache.mapper.toDbUser
@@ -446,14 +447,17 @@ internal class MisskeyDataSource(
             )
 
             // delete status from cache
-            database.statusDao().delete(
-                statusKey = statusKey,
-                accountType = AccountType.Specific(accountKey),
-            )
-            database.pagingTimelineDao().deleteStatus(
-                accountKey = accountKey,
-                statusKey = statusKey,
-            )
+            database.connect {
+                database.statusDao().delete(
+                    statusKey = statusKey,
+                    accountType = AccountType.Specific(accountKey),
+                )
+                database.statusReferenceDao().delete(statusKey)
+                database.pagingTimelineDao().deleteStatus(
+                    accountKey = accountKey,
+                    statusKey = statusKey,
+                )
+            }
         }
     }
 
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/vvo/VVODataSource.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/vvo/VVODataSource.kt
@@ -13,6 +13,7 @@ import dev.dimension.flare.common.InAppNotification
 import dev.dimension.flare.common.MemCacheable
 import dev.dimension.flare.common.decodeJson
 import dev.dimension.flare.data.database.cache.CacheDatabase
+import dev.dimension.flare.data.database.cache.connect
 import dev.dimension.flare.data.database.cache.mapper.VVO
 import dev.dimension.flare.data.database.cache.mapper.toDbUser
 import dev.dimension.flare.data.database.cache.model.StatusContent
@@ -394,6 +395,17 @@ internal class VVODataSource(
             mid = statusKey.id,
             st = st,
         )
+        database.connect {
+            database.statusDao().delete(
+                statusKey = statusKey,
+                accountType = AccountType.Specific(accountKey),
+            )
+            database.statusReferenceDao().delete(statusKey)
+            database.pagingTimelineDao().deleteStatus(
+                accountKey = accountKey,
+                statusKey = statusKey,
+            )
+        }
     }
 
     override fun searchStatus(query: String) =
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/XQTDataSource.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/xqt/XQTDataSource.kt
@@ -16,6 +16,7 @@ import dev.dimension.flare.common.MemCacheable
 import dev.dimension.flare.common.decodeJson
 import dev.dimension.flare.common.encodeJson
 import dev.dimension.flare.data.database.cache.CacheDatabase
+import dev.dimension.flare.data.database.cache.connect
 import dev.dimension.flare.data.database.cache.mapper.XQT
 import dev.dimension.flare.data.database.cache.mapper.cursor
 import dev.dimension.flare.data.database.cache.mapper.toDbUser
@@ -563,14 +564,17 @@ internal class XQTDataSource(
                     ),
             )
             // delete status from cache
-            database.statusDao().delete(
-                statusKey = statusKey,
-                accountType = AccountType.Specific(accountKey),
-            )
-            database.pagingTimelineDao().deleteStatus(
-                accountKey = accountKey,
-                statusKey = statusKey,
-            )
+            database.connect {
+                database.statusDao().delete(
+                    statusKey = statusKey,
+                    accountType = AccountType.Specific(accountKey),
+                )
+                database.statusReferenceDao().delete(statusKey)
+                database.pagingTimelineDao().deleteStatus(
+                    accountKey = accountKey,
+                    statusKey = statusKey,
+                )
+            }
         }
     }
 
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiProfile.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiProfile.kt
@@ -16,15 +16,27 @@ public data class UiProfile internal constructor(
     override val key: MicroBlogKey,
     override val handle: String,
     override val avatar: String,
-    override val name: UiRichText,
+    private val nameInternal: UiRichText,
     override val platformType: PlatformType,
     override val onClicked: ClickContext.() -> Unit,
-    val banner: String?,
-    val description: UiRichText?,
-    val matrices: Matrices,
-    val mark: ImmutableList<Mark>,
-    val bottomContent: BottomContent?,
+    public val banner: String?,
+    public val description: UiRichText?,
+    public val matrices: Matrices,
+    public val mark: ImmutableList<Mark>,
+    public val bottomContent: BottomContent?,
 ) : UiUserV2 {
+    // If name is blank, use handle without @ as display name
+    override val name: UiRichText by lazy {
+        if (nameInternal.raw.isEmpty() || nameInternal.raw.isBlank()) {
+            Element("span")
+                .apply {
+                    appendText(handleWithoutAtAndHost)
+                }.toUi()
+        } else {
+            nameInternal
+        }
+    }
+
     @Immutable
     public data class Matrices internal constructor(
         val fansCount: Long,
@@ -86,7 +98,7 @@ public fun createSampleUser(): UiProfile =
         key = MicroBlogKey("sampleKey", "sampleHost"),
         handle = "@sampleUser",
         avatar = "https://example.com/avatar.jpg",
-        name = Element("span").toUi(),
+        nameInternal = Element("span").toUi(),
         platformType = PlatformType.Mastodon,
         onClicked = { /* Handle click */ },
         banner = "https://example.com/banner.jpg",
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
@@ -574,7 +574,7 @@ internal fun ProfileViewBasic.render(accountKey: MicroBlogKey): UiProfile {
         )
     return UiProfile(
         avatar = avatar?.uri.orEmpty(),
-        name =
+        nameInternal =
             Element("span")
                 .apply {
                     addChildren(TextNode(displayName.orEmpty()))
@@ -613,7 +613,7 @@ internal fun ProfileView.render(accountKey: MicroBlogKey): UiProfile {
         )
     return UiProfile(
         avatar = avatar?.uri.orEmpty(),
-        name =
+        nameInternal =
             Element("span")
                 .apply {
                     addChildren(TextNode(displayName.orEmpty()))
@@ -645,7 +645,7 @@ internal fun ProfileViewDetailed.render(accountKey: MicroBlogKey): UiProfile {
         )
     return UiProfile(
         avatar = avatar?.uri.orEmpty(),
-        name =
+        nameInternal =
             Element("span")
                 .apply {
                     addChildren(TextNode(displayName.orEmpty()))
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
@@ -549,7 +549,7 @@ internal fun Account.render(
         )
     return UiProfile(
         avatar = avatar.orEmpty(),
-        name = parseName(this).toUi(),
+        nameInternal = parseName(this).toUi(),
         handle = "@$username@$remoteHost",
         key = userKey,
         banner = header,
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
@@ -298,7 +298,7 @@ internal fun Note.render(
                 onClicked = {},
                 statusKey = currentStatus.statusKey,
             )
-        } else if (renote == null || !text.isNullOrEmpty()) {
+        } else if ((renote == null && renoteId == null) || !text.isNullOrEmpty()) {
             null
         } else {
             UiTimeline.TopMessage(
@@ -320,20 +320,23 @@ internal fun Note.render(
         }
     return UiTimeline(
         topMessage = topMessage,
-        content = actualStatus.renderStatus(accountKey, event),
+        // TODO: show deleted placeholder when renote is deleted
+        content = actualStatus.renderStatus(accountKey, event, references),
     )
 }
 
 private fun Note.renderStatus(
     accountKey: MicroBlogKey,
     event: StatusEvent.Misskey,
+    references: Map<ReferenceType, List<StatusContent>> = mapOf(),
 ): UiTimeline.ItemContent.Status {
     val remoteHost =
         if (user.host.isNullOrEmpty()) {
             accountKey.host
         } else {
             user.host
         }
+    val parent = references[ReferenceType.Reply]?.firstOrNull() as? StatusContent.Misskey
     val user = user.render(accountKey)
     val isFromMe = user.key == accountKey
     val canReblog = visibility in listOf(Visibility.Public, Visibility.Home) || (isFromMe && visibility != Visibility.Specified)
@@ -369,6 +372,13 @@ private fun Note.renderStatus(
             }.sortedByDescending { it.count }
             .toPersistentList()
     return UiTimeline.ItemContent.Status(
+        parents =
+            listOfNotNull(
+                parent?.data?.renderStatus(
+                    accountKey,
+                    event,
+                ),
+            ).toPersistentList(),
         images =
             files
                 ?.mapNotNull { file ->
@@ -635,7 +645,7 @@ internal fun UserLite.render(accountKey: MicroBlogKey): UiProfile {
         )
     return UiProfile(
         avatar = avatarUrl.orEmpty(),
-        name = parseName(name.orEmpty(), accountKey, emojis).toUi(),
+        nameInternal = parseName(name.orEmpty(), accountKey, emojis).toUi(),
         handle = "@$username@$remoteHost",
         key = userKey,
         banner = null,
@@ -669,7 +679,7 @@ internal fun User.render(accountKey: MicroBlogKey): UiProfile {
         )
     return UiProfile(
         avatar = avatarUrl.orEmpty(),
-        name = parseName(name.orEmpty(), accountKey, emojis).toUi(),
+        nameInternal = parseName(name.orEmpty(), accountKey, emojis).toUi(),
         handle = "@$username@$remoteHost",
         key = userKey,
         banner = bannerUrl,
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
@@ -275,7 +275,7 @@ internal fun User.render(accountKey: MicroBlogKey): UiProfile {
         key = userKey,
         avatar = avatarHD ?: profileImageURL ?: "",
         handle = "@$screenName@${vvoHost.removePrefix("m.")}",
-        name =
+        nameInternal =
             Element("span")
                 .apply {
                     appendChild(TextNode(screenName))
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
@@ -644,7 +644,7 @@ internal fun User.render(accountKey: MicroBlogKey): UiProfile {
     return UiProfile(
         key = userKey,
         avatar = avatarUrl,
-        name =
+        nameInternal =
             Element("span")
                 .apply {
                     addChildren(TextNode(name))
@@ -1080,7 +1080,7 @@ private fun Admin.render(accountKey: MicroBlogKey): UiUserV2 {
     return UiProfile(
         key = key,
         avatar = avatarURL?.replaceWithOriginImageUrl().orEmpty(),
-        name =
+        nameInternal =
             Element("span")
                 .apply {
                     addChildren(TextNode(displayName.orEmpty()))

Original file line number	Diff line number	Diff line change
`@@ -549,7 +549,7 @@ internal fun Account.render(`
`549`	`549`	`)`
`550`	`550`	`return UiProfile(`
`551`	`551`	`avatar = avatar.orEmpty(),`
`552`		`- name = parseName(this).toUi(),`
	`552`	`+ nameInternal = parseName(this).toUi(),`
`553`	`553`	`handle = "@$username@$remoteHost",`
`554`	`554`	`key = userKey,`
`555`	`555`	`banner = header,`