Skip to content

update the way to load status #1282

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
Sep 26, 2025
Merged

update the way to load status #1282

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
4 changes: 2 additions & 2 deletions shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/mapper/Misskey.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,10 +79,10 @@ private fun Notification.toDbStatus(accountKey: MicroBlogKey): DbStatus {
)
}

internal fun List<Note>.toDbPagingTimeline(
internal suspend fun List<Note>.toDbPagingTimeline(
accountKey: MicroBlogKey,
pagingKey: String,
sortIdProvider: (Note) -> Long = { Instant.parse(it.createdAt).toEpochMilliseconds() },
sortIdProvider: suspend (Note) -> Long = { Instant.parse(it.createdAt).toEpochMilliseconds() },
): List<DbPagingTimelineWithStatus> =
this.map {
createDbPagingTimelineWithStatus(
Expand Down
191 changes: 102 additions & 89 deletions ...mmonMain/kotlin/dev/dimension/flare/data/datasource/bluesky/StatusDetailRemoteMediator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,119 +47,132 @@ internal class StatusDetailRemoteMediator(
pageSize: Int,
request: Request,
): Result {
if (request != Request.Refresh) {
return Result(
endOfPaginationReached = true,
)
}
if (!database.pagingTimelineDao().existsPaging(accountKey, pagingKey)) {
database.statusDao().get(statusKey, AccountType.Specific(accountKey)).firstOrNull()?.let {
database
.pagingTimelineDao()
.insertAll(
listOf(
DbPagingTimeline(
accountType = AccountType.Specific(accountKey),
statusKey = statusKey,
pagingKey = pagingKey,
sortId = 0,
),
),
)
}
}
val result =
if (statusOnly) {
val current =
service
.getPosts(
GetPostsQueryParams(
persistentListOf(AtUri(statusKey.id)),
),
).requireResponse()
.posts
.firstOrNull()
listOfNotNull(current).map(::FeedViewPost)
} else {
val context =
service
.getPostThread(
GetPostThreadQueryParams(
AtUri(statusKey.id),
),
).requireResponse()
when (val thread = context.thread) {
is GetPostThreadResponseThreadUnion.ThreadViewPost -> {
val parents = mutableListOf<ThreadViewPost>()
var current: ThreadViewPost? = thread.value
while (current != null) {
parents.add(current)
current =
when (val parent = current.parent) {
is ThreadViewPostParentUnion.ThreadViewPost -> parent.value
else -> null
when (request) {
is Request.Append -> {
if (statusOnly) {
return Result(
endOfPaginationReached = true,
)
} else {
val context =
service
.getPostThread(
GetPostThreadQueryParams(
AtUri(statusKey.id),
),
).requireResponse()
when (val thread = context.thread) {
is GetPostThreadResponseThreadUnion.ThreadViewPost -> {
val parents = mutableListOf<ThreadViewPost>()
var current: ThreadViewPost? = thread.value
while (current != null) {
parents.add(current)
current =
when (val parent = current.parent) {
is ThreadViewPostParentUnion.ThreadViewPost -> parent.value
else -> null
}
}
}
val replies =
thread.value.replies.mapNotNull {
when (it) {
is ThreadViewPostReplieUnion.ThreadViewPost -> {
if (it.value.replies.any()) {
val last =
it.value.replies.last().let {
when (it) {
is ThreadViewPostReplieUnion.ThreadViewPost -> it.value.post
else -> null
}
}
if (last != null) {
val parents =
listOfNotNull(it.value.post) +
it.value.replies.toList().dropLast(1).mapNotNull {
val replies =
thread.value.replies.mapNotNull {
when (it) {
is ThreadViewPostReplieUnion.ThreadViewPost -> {
if (it.value.replies.any()) {
val last =
it.value.replies.last().let {
when (it) {
is ThreadViewPostReplieUnion.ThreadViewPost -> it.value.post
else -> null
}
}
val currentRef =
ReplyRef(
root = ReplyRefRootUnion.PostView(parents.last()),
parent = ReplyRefParentUnion.PostView(parents.last()),
)
if (last != null) {
val parents =
listOfNotNull(it.value.post) +
it.value.replies.toList().dropLast(1).mapNotNull {
when (it) {
is ThreadViewPostReplieUnion.ThreadViewPost -> it.value.post
else -> null
}
}
val currentRef =
ReplyRef(
root = ReplyRefRootUnion.PostView(parents.last()),
parent = ReplyRefParentUnion.PostView(parents.last()),
)

FeedViewPost(
post = last,
reply = currentRef,
)
} else {
FeedViewPost(
it.value.post,
)
FeedViewPost(
post = last,
reply = currentRef,
)
} else {
FeedViewPost(
it.value.post,
)
}
} else {
FeedViewPost(
it.value.post,
)
}
}
} else {
FeedViewPost(
it.value.post,
)
else -> null
}
}
else -> null
}
parents.map { FeedViewPost(it.post) }.reversed() + FeedViewPost(thread.value.post) + replies
}
parents.map { FeedViewPost(it.post) }.reversed() + FeedViewPost(thread.value.post) + replies

else -> emptyList()
}
}
}
is Request.Prepend -> {
return Result(
endOfPaginationReached = true,
)
}
Request.Refresh -> {
if (!database.pagingTimelineDao().existsPaging(accountKey, pagingKey)) {
database.statusDao().get(statusKey, AccountType.Specific(accountKey)).firstOrNull()?.let {
database
.pagingTimelineDao()
.insertAll(
listOf(
DbPagingTimeline(
accountType = AccountType.Specific(accountKey),
statusKey = statusKey,
pagingKey = pagingKey,
sortId = 0,
),
),
)
}
}

else -> emptyList()
val current =
service
.getPosts(
GetPostsQueryParams(
persistentListOf(AtUri(statusKey.id)),
),
).requireResponse()
.posts
.firstOrNull()
listOfNotNull(current).map(::FeedViewPost)
}
}

val shouldLoadMore = !(request is Request.Append || statusOnly)
return Result(
endOfPaginationReached = true,
endOfPaginationReached = !shouldLoadMore,
data =
result.toDbPagingTimeline(
accountKey,
pagingKey,
) {
-result.indexOf(it).toLong()
},
nextKey = if (shouldLoadMore) pagingKey else null,
)
}
}
90 changes: 50 additions & 40 deletions ...monMain/kotlin/dev/dimension/flare/data/datasource/mastodon/StatusDetailRemoteMediator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,59 +36,69 @@ internal class StatusDetailRemoteMediator(
pageSize: Int,
request: Request,
): Result {
if (request != Request.Refresh) {
return Result(
endOfPaginationReached = true,
)
}
val exists = database.pagingTimelineDao().existsPaging(accountKey, pagingKey)
if (!exists) {
val status = database.statusDao().get(statusKey, AccountType.Specific(accountKey)).firstOrNull()
status?.let {
database.connect {
database
.pagingTimelineDao()
.insertAll(
listOf(
DbPagingTimeline(
accountType = AccountType.Specific(accountKey),
statusKey = statusKey,
pagingKey = pagingKey,
sortId = 0,
),
),
val result =
when (request) {
is Request.Append -> {
if (statusOnly) {
return Result(
endOfPaginationReached = true,
)
} else {
val context =
service.context(
statusKey.id,
)
val current =
service.lookupStatus(
statusKey.id,
)
context.ancestors.orEmpty() + listOf(current) + context.descendants.orEmpty()
}
}
}
}
val result =
if (statusOnly) {
val current =
service.lookupStatus(
statusKey.id,
)
listOf(current)
} else {
val context =
service.context(
statusKey.id,
)
val current =
service.lookupStatus(
statusKey.id,
is Request.Prepend ->
return Result(
endOfPaginationReached = true,
)
context.ancestors.orEmpty() + listOf(current) + context.descendants.orEmpty()
Request.Refresh -> {
val exists = database.pagingTimelineDao().existsPaging(accountKey, pagingKey)
if (!exists) {
val status = database.statusDao().get(statusKey, AccountType.Specific(accountKey)).firstOrNull()
status?.let {
database.connect {
database
.pagingTimelineDao()
.insertAll(
listOf(
DbPagingTimeline(
accountType = AccountType.Specific(accountKey),
statusKey = statusKey,
pagingKey = pagingKey,
sortId = 0,
),
),
)
}
}
}
val current =
service.lookupStatus(
statusKey.id,
)
listOf(current)
}
}
val shouldLoadMore = !(request is Request.Append || statusOnly)

return Result(
endOfPaginationReached = true,
endOfPaginationReached = !shouldLoadMore,
data =
result.toDbPagingTimeline(
accountKey = accountKey,
pagingKey = pagingKey,
) {
-result.indexOf(it).toLong()
},
nextKey = if (shouldLoadMore) pagingKey else null,
)
}
}
Loading