Skip to content

fix timeline dup keys #1911

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Tlaster merged 1 commit into from
Mar 21, 2026
Merged

fix timeline dup keys #1911

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions ...rc/commonMain/kotlin/dev/dimension/flare/data/datasource/microblog/MixedRemoteMediator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,11 @@ internal class MixedRemoteMediator(
timelineResult
.sortedByDescending {
it.createdAt.value.toEpochMilliseconds()
}.distinctBy { item ->
// A mixed timeline can receive the same logical item from multiple
// sub timelines (for example home + list). Keep one copy so Compose
// never receives duplicate lazy keys for the same item.
item.itemKey
}

database.connect {
Expand Down
10 changes: 10 additions & 0 deletions shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiTimelineV2.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,8 @@ public sealed class UiTimelineV2 {
override val itemKey: String =
buildString {
append("Message_")
append(accountType)
append("_")
append(statusKey)
if (extraKey != null) {
append("_")
Expand Down Expand Up @@ -162,6 +164,8 @@ public sealed class UiTimelineV2 {
override val itemKey: String =
buildString {
append("Feed_")
append(accountType)
append("_")
append(url)
if (extraKey != null) {
append("_")
Expand Down Expand Up @@ -237,6 +241,8 @@ public sealed class UiTimelineV2 {
buildString {
append(platformType.name)
append("_")
append(accountType)
append("_")
append(statusKey)
message?.let {
append("_")
Expand Down Expand Up @@ -311,6 +317,8 @@ public sealed class UiTimelineV2 {
override val itemKey: String =
buildString {
append("User_")
append(accountType)
append("_")
append(value.key)
message?.let {
append("_")
Expand Down Expand Up @@ -340,6 +348,8 @@ public sealed class UiTimelineV2 {
override val itemKey: String =
buildString {
append("UserList_")
append(accountType)
append("_")
append(users.hashCode())
post?.let {
append("_")
Expand Down
107 changes: 107 additions & 0 deletions ...ommonTest/kotlin/dev/dimension/flare/data/datasource/microblog/MixedRemoteMediatorTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,6 +336,113 @@ class MixedRemoteMediatorTest : RobolectricTest() {
assertEquals(listOf(postA.statusKey, postB.statusKey), post.parents.map { it.statusKey })
}

@Test
fun refreshDeduplicatesSamePostReturnedByMultipleSubTimelines() =
runTest {
val accountKey = MicroBlogKey("timeline", "mastodon.example")
val accountType = AccountType.Specific(accountKey)
val user = profile(MicroBlogKey("user", "mastodon.example"), "User")
val duplicatedPost =
createPost(
accountType = accountType,
user = user,
statusKey = MicroBlogKey("same", "mastodon.example"),
text = "duplicate",
)

val first =
FakeLoader("home") { request ->
when (request) {
PagingRequest.Refresh ->
PagingResult(
data = listOf(duplicatedPost),
nextKey = null,
)

is PagingRequest.Append -> error("No append expected")
is PagingRequest.Prepend -> error("No prepend expected")
}
}
val second =
FakeLoader("list") { request ->
when (request) {
PagingRequest.Refresh ->
PagingResult(
data = listOf(duplicatedPost),
nextKey = null,
)

is PagingRequest.Append -> error("No append expected")
is PagingRequest.Prepend -> error("No prepend expected")
}
}

val mediator = MixedRemoteMediator(db, listOf(first, second))
val result = mediator.load(pageSize = 20, request = PagingRequest.Refresh)

assertEquals(1, result.data.size)
assertEquals(duplicatedPost.itemKey, result.data.single().itemKey)
}

@Test
fun refreshKeepsSamePostFromDifferentAccountsAsSeparateItems() =
runTest {
val firstAccount = AccountType.Specific(MicroBlogKey("timeline-a", "mastodon.example"))
val secondAccount = AccountType.Specific(MicroBlogKey("timeline-b", "mastodon.example"))
val sharedStatusKey = MicroBlogKey("same", "mastodon.example")

val firstPost =
createPost(
accountType = firstAccount,
user = profile(MicroBlogKey("user-a", "mastodon.example"), "User A"),
statusKey = sharedStatusKey,
text = "duplicate",
)
val secondPost =
createPost(
accountType = secondAccount,
user = profile(MicroBlogKey("user-b", "mastodon.example"), "User B"),
statusKey = sharedStatusKey,
text = "duplicate",
)

val first =
FakeLoader("home_a") { request ->
when (request) {
PagingRequest.Refresh ->
PagingResult(
data = listOf(firstPost),
nextKey = null,
)

is PagingRequest.Append -> error("No append expected")
is PagingRequest.Prepend -> error("No prepend expected")
}
}
val second =
FakeLoader("home_b") { request ->
when (request) {
PagingRequest.Refresh ->
PagingResult(
data = listOf(secondPost),
nextKey = null,
)

is PagingRequest.Append -> error("No append expected")
is PagingRequest.Prepend -> error("No prepend expected")
}
}

val mediator = MixedRemoteMediator(db, listOf(first, second))
val result = mediator.load(pageSize = 20, request = PagingRequest.Refresh)

assertEquals(2, result.data.size)
assertEquals(
setOf(firstPost.itemKey, secondPost.itemKey),
result.data.map { it.itemKey }.toSet(),
)
}

private class FakeLoader(
override val pagingKey: String,
private val onLoad: suspend (PagingRequest) -> PagingResult<UiTimelineV2>,
Expand Down
Loading