Skip to content

fix xqt mapping #1614

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
Dec 10, 2025
Merged

fix xqt mapping #1614

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
25 changes: 3 additions & 22 deletions shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/mapper/XQT.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ import dev.dimension.flare.model.ReferenceType
import dev.dimension.flare.ui.model.mapper.name
import dev.dimension.flare.ui.model.mapper.parseXQTCustomDateTime
import dev.dimension.flare.ui.model.mapper.screenName
import kotlin.collections.toMap
import kotlin.time.Clock

internal object XQT {
Expand Down Expand Up @@ -267,21 +266,21 @@ private fun TweetUnion.toDbStatusWithUser(accountKey: MicroBlogKey): DbStatusWit
private fun toDbStatusWithUser(
tweet: Tweet,
accountKey: MicroBlogKey,
): DbStatusWithUser {
): DbStatusWithUser? {
val user =
tweet.core
?.userResults
?.result
?.let {
it as? User
}?.toDbUser(accountKey) ?: throw IllegalStateException("Tweet.user should not be null")
}?.toDbUser(accountKey) ?: return null
return DbStatusWithUser(
data =
DbStatus(
statusKey =
MicroBlogKey(
id = tweet.restId,
host = user.userKey.host,
host = accountKey.host,
),
content = StatusContent.XQT(tweet),
userKey = user.userKey,
Expand All @@ -295,24 +294,6 @@ private fun toDbStatusWithUser(
)
}

private fun TimelineTweet.toDbUser(accountKey: MicroBlogKey): DbUser {
val tweet =
when (tweetResults.result) {
is Tweet -> tweetResults.result
null, is TweetTombstone -> throw IllegalStateException("Tweet tombstone should not be saved")
is TweetWithVisibilityResults -> tweetResults.result.tweet
}
val user =
tweet.core
?.userResults
?.result
?.let {
it as? User
}
?: throw IllegalStateException("Tweet.user should not be null")
return user.toDbUser(accountKey = accountKey)
}

internal fun User.toDbUser(accountKey: MicroBlogKey) =
DbUser(
userKey =
Expand Down
Loading