Skip to content

Commit b5bab95

Browse files
committed
fix build
1 parent e7c57d0 commit b5bab95

File tree

4 files changed

+25
-13
lines changed

4 files changed

+25
-13
lines changed

shared/src/commonMain/kotlin/dev/dimension/flare/data/database/cache/mapper/Bluesky.kt

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,10 @@ import app.bsky.actor.ProfileViewBasic
55
import app.bsky.actor.ProfileViewDetailed
66
import app.bsky.feed.FeedViewPost
77
import app.bsky.feed.FeedViewPostReasonUnion
8+
import app.bsky.feed.Like
89
import app.bsky.feed.PostView
910
import app.bsky.feed.ReplyRefParentUnion
11+
import app.bsky.feed.Repost
1012
import app.bsky.notification.ListNotificationsNotification
1113
import app.bsky.notification.ListNotificationsReason
1214
import chat.bsky.convo.ConvoView
@@ -23,6 +25,8 @@ import dev.dimension.flare.data.database.cache.model.DbStatusWithUser
2325
import dev.dimension.flare.data.database.cache.model.DbUser
2426
import dev.dimension.flare.data.database.cache.model.MessageContent
2527
import dev.dimension.flare.data.database.cache.model.StatusContent
28+
import dev.dimension.flare.data.database.cache.model.StatusContent.BlueskyNotification.Post
29+
import dev.dimension.flare.data.database.cache.model.StatusContent.BlueskyNotification.UserList
2630
import dev.dimension.flare.data.database.cache.model.UserContent
2731
import dev.dimension.flare.model.MicroBlogKey
2832
import dev.dimension.flare.model.PlatformType
@@ -194,7 +198,11 @@ internal fun List<ListNotificationsNotification>.toDb(
194198
val grouped = this.groupBy { it.reason }.filter { it.value.any() }
195199
return grouped.flatMap { (reason, items) ->
196200
when (reason) {
197-
is ListNotificationsReason.Unknown, ListNotificationsReason.StarterpackJoined ->
201+
is ListNotificationsReason.Unknown,
202+
ListNotificationsReason.StarterpackJoined,
203+
ListNotificationsReason.Verified,
204+
ListNotificationsReason.Unverified,
205+
->
198206
items.map {
199207
createDbPagingTimelineWithStatus(
200208
accountKey = accountKey,
@@ -212,16 +220,16 @@ internal fun List<ListNotificationsNotification>.toDb(
212220
.record
213221
.let {
214222
when (reason) {
215-
ListNotificationsReason.Repost -> it.decodeAs<app.bsky.feed.Repost>().subject
216-
ListNotificationsReason.Like -> it.decodeAs<app.bsky.feed.Like>().subject
223+
ListNotificationsReason.Repost -> it.decodeAs<Repost>().subject
224+
ListNotificationsReason.Like -> it.decodeAs<Like>().subject
217225
else -> null
218226
}
219227
}?.uri
220228
.let {
221229
references[it]
222230
}
223231
val content =
224-
StatusContent.BlueskyNotification.UserList(
232+
UserList(
225233
data = items,
226234
post = post,
227235
)
@@ -264,7 +272,7 @@ internal fun List<ListNotificationsNotification>.toDb(
264272
}
265273

266274
ListNotificationsReason.Follow -> {
267-
val content = StatusContent.BlueskyNotification.UserList(data = items, post = null)
275+
val content = UserList(data = items, post = null)
268276
val data =
269277
DbStatusWithUser(
270278
user = null,
@@ -295,7 +303,7 @@ internal fun List<ListNotificationsNotification>.toDb(
295303
ListNotificationsReason.Mention, ListNotificationsReason.Reply, ListNotificationsReason.Quote -> {
296304
items.mapNotNull {
297305
val post = references[it.uri] ?: return@mapNotNull null
298-
val content = StatusContent.BlueskyNotification.Post(post = post)
306+
val content = Post(post = post)
299307
val user = post.author.toDbUser(accountKey.host)
300308
val data =
301309
DbStatusWithUser(

shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/bluesky/BlueskyDataSource.kt

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2075,11 +2075,7 @@ internal class BlueskyDataSource(
20752075
is LogDeleteMessageMessageUnion.Unknown -> Unit
20762076
}
20772077
}
2078-
2079-
is GetLogResponseLogUnion.BeginConvo -> Unit
2080-
is GetLogResponseLogUnion.LeaveConvo -> Unit
2081-
is GetLogResponseLogUnion.Unknown -> Unit
2082-
is GetLogResponseLogUnion.AcceptConvo -> Unit
2078+
else -> Unit
20832079
}
20842080
}
20852081
}

shared/src/commonMain/kotlin/dev/dimension/flare/data/datasource/bluesky/NotificationRemoteMediator.kt

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ import androidx.paging.ExperimentalPagingApi
44
import androidx.paging.LoadType
55
import androidx.paging.PagingState
66
import app.bsky.feed.GetPostsQueryParams
7+
import app.bsky.feed.Like
8+
import app.bsky.feed.Repost
79
import app.bsky.notification.ListNotificationsQueryParams
810
import app.bsky.notification.ListNotificationsReason
911
import app.bsky.notification.UpdateSeenRequest
@@ -72,17 +74,19 @@ internal class NotificationRemoteMediator(
7274
is ListNotificationsReason.Unknown -> null
7375
ListNotificationsReason.Like ->
7476
it.record
75-
.decodeAs<app.bsky.feed.Like>()
77+
.decodeAs<Like>()
7678
.subject.uri
7779
ListNotificationsReason.Repost ->
7880
it.record
79-
.decodeAs<app.bsky.feed.Repost>()
81+
.decodeAs<Repost>()
8082
.subject.uri
8183
ListNotificationsReason.Follow -> null
8284
ListNotificationsReason.Mention -> it.uri
8385
ListNotificationsReason.Reply -> it.uri
8486
ListNotificationsReason.Quote -> it.uri
8587
ListNotificationsReason.StarterpackJoined -> null
88+
ListNotificationsReason.Unverified -> null
89+
ListNotificationsReason.Verified -> null
8690
}
8791
}.distinct()
8892
.toImmutableList()

shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/Bluesky.kt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -327,6 +327,8 @@ private val ListNotificationsReason.icon: UiTimeline.TopMessage.Icon
327327
ListNotificationsReason.Quote -> UiTimeline.TopMessage.Icon.Reply
328328
is ListNotificationsReason.Unknown -> UiTimeline.TopMessage.Icon.Info
329329
ListNotificationsReason.StarterpackJoined -> UiTimeline.TopMessage.Icon.Info
330+
ListNotificationsReason.Unverified -> UiTimeline.TopMessage.Icon.Info
331+
ListNotificationsReason.Verified -> UiTimeline.TopMessage.Icon.Info
330332
}
331333

332334
private val ListNotificationsReason.type: UiTimeline.TopMessage.MessageType
@@ -340,6 +342,8 @@ private val ListNotificationsReason.type: UiTimeline.TopMessage.MessageType
340342
ListNotificationsReason.Quote -> UiTimeline.TopMessage.MessageType.Bluesky.Quote
341343
is ListNotificationsReason.Unknown -> UiTimeline.TopMessage.MessageType.Bluesky.UnKnown
342344
ListNotificationsReason.StarterpackJoined -> UiTimeline.TopMessage.MessageType.Bluesky.StarterpackJoined
345+
ListNotificationsReason.Unverified -> UiTimeline.TopMessage.MessageType.Bluesky.UnKnown
346+
ListNotificationsReason.Verified -> UiTimeline.TopMessage.MessageType.Bluesky.UnKnown
343347
}
344348

345349
internal fun PostView.render(

0 commit comments

Comments
 (0)