Merge pull request #902 from DimensionDev/dependabot/gradle/sh.christian.ozone-bluesky-0.3.3

Bump sh.christian.ozone:bluesky from 0.3.2 to 0.3.3

Author: github-actions[bot]

gradle/libs.versions.toml

@@ -36,7 +36,7 @@ okio = "3.11.0"
 skie = "0.10.2-preview.2.1.20"
 ksoup = "0.2.0"
 versionUpdate = "0.52.0"
-bluesky = "0.3.2"
+bluesky = "0.3.3"
 kotlinx-coroutines = "1.10.2"
 koin = "4.0.4"
 composeIcons = "1.3.0"

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

@@ -5,8 +5,10 @@ import app.bsky.actor.ProfileViewBasic
 import app.bsky.actor.ProfileViewDetailed
 import app.bsky.feed.FeedViewPost
 import app.bsky.feed.FeedViewPostReasonUnion
+import app.bsky.feed.Like
 import app.bsky.feed.PostView
 import app.bsky.feed.ReplyRefParentUnion
+import app.bsky.feed.Repost
 import app.bsky.notification.ListNotificationsNotification
 import app.bsky.notification.ListNotificationsReason
 import chat.bsky.convo.ConvoView
@@ -23,6 +25,8 @@ import dev.dimension.flare.data.database.cache.model.DbStatusWithUser
 import dev.dimension.flare.data.database.cache.model.DbUser
 import dev.dimension.flare.data.database.cache.model.MessageContent
 import dev.dimension.flare.data.database.cache.model.StatusContent
+import dev.dimension.flare.data.database.cache.model.StatusContent.BlueskyNotification.Post
+import dev.dimension.flare.data.database.cache.model.StatusContent.BlueskyNotification.UserList
 import dev.dimension.flare.data.database.cache.model.UserContent
 import dev.dimension.flare.model.MicroBlogKey
 import dev.dimension.flare.model.PlatformType
@@ -194,7 +198,11 @@ internal fun List<ListNotificationsNotification>.toDb(
     val grouped = this.groupBy { it.reason }.filter { it.value.any() }
     return grouped.flatMap { (reason, items) ->
         when (reason) {
-            is ListNotificationsReason.Unknown, ListNotificationsReason.StarterpackJoined ->
+            is ListNotificationsReason.Unknown,
+            ListNotificationsReason.StarterpackJoined,
+            ListNotificationsReason.Verified,
+            ListNotificationsReason.Unverified,
+            ->
                 items.map {
                     createDbPagingTimelineWithStatus(
                         accountKey = accountKey,
@@ -212,16 +220,16 @@ internal fun List<ListNotificationsNotification>.toDb(
                         .record
                         .let {
                             when (reason) {
-                                ListNotificationsReason.Repost -> it.decodeAs<app.bsky.feed.Repost>().subject
-                                ListNotificationsReason.Like -> it.decodeAs<app.bsky.feed.Like>().subject
+                                ListNotificationsReason.Repost -> it.decodeAs<Repost>().subject
+                                ListNotificationsReason.Like -> it.decodeAs<Like>().subject
                                 else -> null
                             }
                         }?.uri
                         .let {
                             references[it]
                         }
                 val content =
-                    StatusContent.BlueskyNotification.UserList(
+                    UserList(
                         data = items,
                         post = post,
                     )
@@ -264,7 +272,7 @@ internal fun List<ListNotificationsNotification>.toDb(
             }
 
             ListNotificationsReason.Follow -> {
-                val content = StatusContent.BlueskyNotification.UserList(data = items, post = null)
+                val content = UserList(data = items, post = null)
                 val data =
                     DbStatusWithUser(
                         user = null,
@@ -295,7 +303,7 @@ internal fun List<ListNotificationsNotification>.toDb(
             ListNotificationsReason.Mention, ListNotificationsReason.Reply, ListNotificationsReason.Quote -> {
                 items.mapNotNull {
                     val post = references[it.uri] ?: return@mapNotNull null
-                    val content = StatusContent.BlueskyNotification.Post(post = post)
+                    val content = Post(post = post)
                     val user = post.author.toDbUser(accountKey.host)
                     val data =
                         DbStatusWithUser(

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

@@ -2075,11 +2075,7 @@ internal class BlueskyDataSource(
                         is LogDeleteMessageMessageUnion.Unknown -> Unit
                     }
                 }
-
-                is GetLogResponseLogUnion.BeginConvo -> Unit
-                is GetLogResponseLogUnion.LeaveConvo -> Unit
-                is GetLogResponseLogUnion.Unknown -> Unit
-                is GetLogResponseLogUnion.AcceptConvo -> Unit
+                else -> Unit
             }
         }
     }

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

@@ -4,6 +4,8 @@ import androidx.paging.ExperimentalPagingApi
 import androidx.paging.LoadType
 import androidx.paging.PagingState
 import app.bsky.feed.GetPostsQueryParams
+import app.bsky.feed.Like
+import app.bsky.feed.Repost
 import app.bsky.notification.ListNotificationsQueryParams
 import app.bsky.notification.ListNotificationsReason
 import app.bsky.notification.UpdateSeenRequest
@@ -72,17 +74,19 @@ internal class NotificationRemoteMediator(
                         is ListNotificationsReason.Unknown -> null
                         ListNotificationsReason.Like ->
                             it.record
-                                .decodeAs<app.bsky.feed.Like>()
+                                .decodeAs<Like>()
                                 .subject.uri
                         ListNotificationsReason.Repost ->
                             it.record
-                                .decodeAs<app.bsky.feed.Repost>()
+                                .decodeAs<Repost>()
                                 .subject.uri
                         ListNotificationsReason.Follow -> null
                         ListNotificationsReason.Mention -> it.uri
                         ListNotificationsReason.Reply -> it.uri
                         ListNotificationsReason.Quote -> it.uri
                         ListNotificationsReason.StarterpackJoined -> null
+                        ListNotificationsReason.Unverified -> null
+                        ListNotificationsReason.Verified -> null
                     }
                 }.distinct()
                 .toImmutableList()

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

@@ -327,6 +327,8 @@ private val ListNotificationsReason.icon: UiTimeline.TopMessage.Icon
             ListNotificationsReason.Quote -> UiTimeline.TopMessage.Icon.Reply
             is ListNotificationsReason.Unknown -> UiTimeline.TopMessage.Icon.Info
             ListNotificationsReason.StarterpackJoined -> UiTimeline.TopMessage.Icon.Info
+            ListNotificationsReason.Unverified -> UiTimeline.TopMessage.Icon.Info
+            ListNotificationsReason.Verified -> UiTimeline.TopMessage.Icon.Info
         }
 
 private val ListNotificationsReason.type: UiTimeline.TopMessage.MessageType
@@ -340,6 +342,8 @@ private val ListNotificationsReason.type: UiTimeline.TopMessage.MessageType
             ListNotificationsReason.Quote -> UiTimeline.TopMessage.MessageType.Bluesky.Quote
             is ListNotificationsReason.Unknown -> UiTimeline.TopMessage.MessageType.Bluesky.UnKnown
             ListNotificationsReason.StarterpackJoined -> UiTimeline.TopMessage.MessageType.Bluesky.StarterpackJoined
+            ListNotificationsReason.Unverified -> UiTimeline.TopMessage.MessageType.Bluesky.UnKnown
+            ListNotificationsReason.Verified -> UiTimeline.TopMessage.MessageType.Bluesky.UnKnown
         }
 
 internal fun PostView.render(