Merge pull request #80 from akiomik/fix-embed

Fix embed
akiomik · Apr 3, 2023 · f506cb0 · f506cb0
2 parents fdc4211 + 9f41ca0
commit f506cb0
Show file tree

Hide file tree

Showing 28 changed files with 77 additions and 76 deletions.
diff --git a/app/src/main/java/io/github/akiomik/seiun/api/AtpService.kt b/app/src/main/java/io/github/akiomik/seiun/api/AtpService.kt
@@ -7,7 +7,7 @@ import com.squareup.moshi.Moshi
 import com.squareup.moshi.adapters.Rfc3339DateJsonAdapter
 import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
 import io.github.akiomik.seiun.model.AtpError
-import io.github.akiomik.seiun.model.app.bsky.actor.ProfileView
+import io.github.akiomik.seiun.model.app.bsky.actor.ProfileViewDetailed
 import io.github.akiomik.seiun.model.app.bsky.feed.AuthorFeed
 import io.github.akiomik.seiun.model.app.bsky.feed.Like
 import io.github.akiomik.seiun.model.app.bsky.feed.Post
@@ -87,7 +87,7 @@ interface AtpService {
     suspend fun getProfile(
         @Header("Authorization") authorization: String,
         @Query("actor") actor: String
-    ): ApiResult<ProfileView, AtpError>
+    ): ApiResult<ProfileViewDetailed, AtpError>
 
 //    @DecodeErrorBody
 //    @POST("com.atproto.repo.putRecord")

diff --git a/...ik/seiun/model/app/bsky/actor/WithInfo.kt → .../model/app/bsky/actor/ProfileViewBasic.kt b/...ik/seiun/model/app/bsky/actor/WithInfo.kt → .../model/app/bsky/actor/ProfileViewBasic.kt
@@ -3,7 +3,7 @@ package io.github.akiomik.seiun.model.app.bsky.actor
 import com.squareup.moshi.JsonClass
 
 @JsonClass(generateAdapter = true)
-data class WithInfo(
+data class ProfileViewBasic(
     val did: String,
     val handle: String,
     val displayName: String? = null,

diff --git a/...seiun/model/app/bsky/actor/ProfileView.kt → ...del/app/bsky/actor/ProfileViewDetailed.kt b/...seiun/model/app/bsky/actor/ProfileView.kt → ...del/app/bsky/actor/ProfileViewDetailed.kt
@@ -4,7 +4,7 @@ import com.squareup.moshi.JsonClass
 import java.util.*
 
 @JsonClass(generateAdapter = true)
-data class ProfileView(
+data class ProfileViewDetailed(
     val did: String,
     val handle: String,
     val displayName: String? = null,

diff --git a/app/src/main/java/io/github/akiomik/seiun/model/app/bsky/embed/External.kt b/app/src/main/java/io/github/akiomik/seiun/model/app/bsky/embed/External.kt
diff --git a/app/src/main/java/io/github/akiomik/seiun/model/app/bsky/feed/ImagesOrExternal.kt b/app/src/main/java/io/github/akiomik/seiun/model/app/bsky/feed/ImagesOrExternal.kt
@@ -2,13 +2,13 @@ package io.github.akiomik.seiun.model.app.bsky.feed
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
-import io.github.akiomik.seiun.model.app.bsky.embed.External
+import io.github.akiomik.seiun.model.app.bsky.embed.ExternalExternal
 import io.github.akiomik.seiun.model.app.bsky.embed.ImagesImage
 
 @JsonClass(generateAdapter = true)
 data class ImagesOrExternal(
     @Json(name = "\$type")
     val type: String,
     val images: List<ImagesImage>? = null, // from app.bsky.embed.images
-    val external: External? = null // from app.bsky.embed.external
+    val external: ExternalExternal? = null // from app.bsky.embed.external
 )
diff --git a/...ub/akiomik/seiun/model/app/bsky/feed/ImagesOrExternalOrRecordOrRecordOrRecordWithMedia.kt b/...ub/akiomik/seiun/model/app/bsky/feed/ImagesOrExternalOrRecordOrRecordOrRecordWithMedia.kt
@@ -2,15 +2,15 @@ package io.github.akiomik.seiun.model.app.bsky.feed
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
-import io.github.akiomik.seiun.model.app.bsky.embed.External
+import io.github.akiomik.seiun.model.app.bsky.embed.ExternalExternal
 import io.github.akiomik.seiun.model.app.bsky.embed.ImagesImage
 
 @JsonClass(generateAdapter = true)
 data class ImagesOrExternalOrRecordOrRecordOrRecordWithMedia(
     @Json(name = "\$type")
     val type: String,
     val images: List<ImagesImage>? = null, // from app.bsky.embed.images
-    val external: External? = null, // from app.bsky.embed.external
+    val external: ExternalExternal? = null, // from app.bsky.embed.external
     val record: StrongRefOrRecord? = null, // from app.bsky.embed.record and app.bsky.embed.recordWithMedia // TODO: union
     val media: ImagesOrExternal? = null // from app.bsky.embed.recordWithMedia // TODO: union
 )
diff --git a/app/src/main/java/io/github/akiomik/seiun/model/app/bsky/feed/PostView.kt b/app/src/main/java/io/github/akiomik/seiun/model/app/bsky/feed/PostView.kt
@@ -1,15 +1,15 @@
 package io.github.akiomik.seiun.model.app.bsky.feed
 
 import com.squareup.moshi.JsonClass
-import io.github.akiomik.seiun.model.app.bsky.actor.WithInfo
+import io.github.akiomik.seiun.model.app.bsky.actor.ProfileViewBasic
 import io.github.akiomik.seiun.model.com.atproto.repo.StrongRef
 import java.util.*
 
 @JsonClass(generateAdapter = true)
 data class PostView(
     val uri: String,
     val cid: String,
-    val author: WithInfo,
+    val author: ProfileViewBasic,
     val record: Post, // TODO: unknown
     val indexedAt: Date,
     val replyCount: Int? = null,

diff --git a/app/src/main/java/io/github/akiomik/seiun/model/app/bsky/feed/ReasonRepost.kt b/app/src/main/java/io/github/akiomik/seiun/model/app/bsky/feed/ReasonRepost.kt
@@ -2,14 +2,14 @@ package io.github.akiomik.seiun.model.app.bsky.feed
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
-import io.github.akiomik.seiun.model.app.bsky.actor.WithInfo
+import io.github.akiomik.seiun.model.app.bsky.actor.ProfileViewBasic
 import java.util.*
 
 @JsonClass(generateAdapter = true)
 data class ReasonRepost(
     @Json(name = "\$type")
     val type: String,
-    val by: WithInfo,
+    val by: ProfileViewBasic,
     val indexedAt: Date
 ) {
     fun id(): String = "$type-${by.did}-${indexedAt.time}"

diff --git a/.../java/io/github/akiomik/seiun/model/app/bsky/feed/RecordViewRecordOrRecordViewNotFound.kt b/.../java/io/github/akiomik/seiun/model/app/bsky/feed/RecordViewRecordOrRecordViewNotFound.kt
@@ -1,7 +1,7 @@
 package io.github.akiomik.seiun.model.app.bsky.feed
 
 import com.squareup.moshi.JsonClass
-import io.github.akiomik.seiun.model.app.bsky.actor.WithInfo
+import io.github.akiomik.seiun.model.app.bsky.actor.ProfileViewBasic
 import java.util.*
 
 @JsonClass(generateAdapter = true)
@@ -11,7 +11,7 @@ data class RecordViewRecordOrRecordViewNotFound(
     // from app.bsky.embed.record#viewRecord
     val uri: String? = null, // is used by app.bsky.embed.record#viewNotFound too
     val cid: String? = null,
-    val author: WithInfo? = null,
+    val author: ProfileViewBasic? = null,
     // val record: Record, // TODO unknown
     val indexedAt: Date? = null,
     val embeds: List<ImagesViewOrExternalViewOrRecordViewOrRecordWithMediaView>? = null

diff --git a/app/src/main/java/io/github/akiomik/seiun/model/app/bsky/feed/StrongRefOrRecord.kt b/app/src/main/java/io/github/akiomik/seiun/model/app/bsky/feed/StrongRefOrRecord.kt
@@ -1,11 +1,12 @@
 package io.github.akiomik.seiun.model.app.bsky.feed
 
 import com.squareup.moshi.JsonClass
-import io.github.akiomik.seiun.model.com.atproto.repo.StrongRef
 
+// FIXME: May have embed, author, record, viewer, indexedAt, likeCount, replyCount, repostCount?
 @JsonClass(generateAdapter = true)
 data class StrongRefOrRecord(
     val uri: String? = null, // from com.atproto.repo.strongRef
-    val cid: String? = null, // from com.atproto.repo.strongRef
-    val record: StrongRef? = null // from app.bsky.embed.record
+    val cid: String? = null // from com.atproto.repo.strongRef
+    // FIXME: record may app.bsky.feed.post?
+//    val record: StrongRef? = null // from app.bsky.embed.record
 )
diff --git a/app/src/main/java/io/github/akiomik/seiun/model/app/bsky/graph/Followers.kt b/app/src/main/java/io/github/akiomik/seiun/model/app/bsky/graph/Followers.kt
@@ -1,11 +1,11 @@
 package io.github.akiomik.seiun.model.app.bsky.graph
 
 import com.squareup.moshi.JsonClass
-import io.github.akiomik.seiun.model.app.bsky.actor.WithInfo
+import io.github.akiomik.seiun.model.app.bsky.actor.ProfileViewBasic
 
 @JsonClass(generateAdapter = true)
 data class Followers(
-    val subject: WithInfo,
-    val followers: List<WithInfo>,
+    val subject: ProfileViewBasic,
+    val followers: List<ProfileViewBasic>,
     val cursor: String? = null
 )
diff --git a/app/src/main/java/io/github/akiomik/seiun/model/app/bsky/graph/Follows.kt b/app/src/main/java/io/github/akiomik/seiun/model/app/bsky/graph/Follows.kt
@@ -1,11 +1,11 @@
 package io.github.akiomik.seiun.model.app.bsky.graph
 
 import com.squareup.moshi.JsonClass
-import io.github.akiomik.seiun.model.app.bsky.actor.WithInfo
+import io.github.akiomik.seiun.model.app.bsky.actor.ProfileViewBasic
 
 @JsonClass(generateAdapter = true)
 data class Follows(
-    val subject: WithInfo,
-    val follows: List<WithInfo>,
+    val subject: ProfileViewBasic,
+    val follows: List<ProfileViewBasic>,
     val cursor: String? = null
 )
diff --git a/app/src/main/java/io/github/akiomik/seiun/model/app/bsky/notification/Notification.kt b/app/src/main/java/io/github/akiomik/seiun/model/app/bsky/notification/Notification.kt
@@ -1,14 +1,14 @@
 package io.github.akiomik.seiun.model.app.bsky.notification
 
 import com.squareup.moshi.JsonClass
-import io.github.akiomik.seiun.model.app.bsky.actor.WithInfo
+import io.github.akiomik.seiun.model.app.bsky.actor.ProfileViewBasic
 import java.util.*
 
 @JsonClass(generateAdapter = true)
 data class Notification(
     val uri: String,
     val cid: String,
-    val author: WithInfo,
+    val author: ProfileViewBasic,
     val reason: String,
     val record: NotificationRecord, // TODO unknown
     val isRead: Boolean,

diff --git a/app/src/main/java/io/github/akiomik/seiun/model/type/Blob.kt b/app/src/main/java/io/github/akiomik/seiun/model/type/Blob.kt
@@ -3,11 +3,13 @@ package io.github.akiomik.seiun.model.type
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
 
+// NOTE: The old blob formats don't have ref and size
 @JsonClass(generateAdapter = true)
 data class Blob(
-    val ref: Ref?,
+    val ref: Ref? = null,
     val mimeType: String,
-    val size: Int?,
+    val size: Int? = null,
+    val original: BlobOriginal? = null,
     @Json(name = "\$type")
     val type: String? = "blob"
 )
diff --git a/app/src/main/java/io/github/akiomik/seiun/model/type/BlobOriginal.kt b/app/src/main/java/io/github/akiomik/seiun/model/type/BlobOriginal.kt
@@ -0,0 +1,6 @@
+package io.github.akiomik.seiun.model.type
+
+data class BlobOriginal(
+    val cid: String,
+    val mimeType: String
+)
diff --git a/app/src/main/java/io/github/akiomik/seiun/repository/PostFeedRepository.kt b/app/src/main/java/io/github/akiomik/seiun/repository/PostFeedRepository.kt
@@ -4,7 +4,7 @@ import android.util.Log
 import io.github.akiomik.seiun.SeiunApplication
 import io.github.akiomik.seiun.api.RequestHelper
 import io.github.akiomik.seiun.datasources.PostFeedCacheDataSource
-import io.github.akiomik.seiun.model.app.bsky.actor.ProfileView
+import io.github.akiomik.seiun.model.app.bsky.actor.ProfileViewDetailed
 import io.github.akiomik.seiun.model.app.bsky.feed.AuthorFeed
 import io.github.akiomik.seiun.model.app.bsky.feed.FeedViewPost
 import io.github.akiomik.seiun.model.app.bsky.feed.ImagesOrExternalOrRecordOrRecordOrRecordWithMedia
@@ -41,7 +41,7 @@ class PostFeedRepository(private val authRepository: AuthRepository) : Applicati
         return timeline
     }
 
-    suspend fun getAuthorFeed(author: ProfileView, cursor: String? = null): AuthorFeed {
+    suspend fun getAuthorFeed(author: ProfileViewDetailed, cursor: String? = null): AuthorFeed {
         Log.d(SeiunApplication.TAG, "Get author feed: cursor = $cursor")
 
         val feed = RequestHelper.executeWithRetry(authRepository) {

diff --git a/app/src/main/java/io/github/akiomik/seiun/repository/UserRepository.kt b/app/src/main/java/io/github/akiomik/seiun/repository/UserRepository.kt
@@ -3,7 +3,7 @@ package io.github.akiomik.seiun.repository
 import android.util.Log
 import io.github.akiomik.seiun.SeiunApplication
 import io.github.akiomik.seiun.api.RequestHelper
-import io.github.akiomik.seiun.model.app.bsky.actor.ProfileView
+import io.github.akiomik.seiun.model.app.bsky.actor.ProfileViewDetailed
 import io.github.akiomik.seiun.model.app.bsky.graph.Follow
 import io.github.akiomik.seiun.model.app.bsky.graph.Followers
 import io.github.akiomik.seiun.model.app.bsky.graph.Follows
@@ -16,15 +16,15 @@ import io.github.akiomik.seiun.utilities.UriConverter
 import java.util.*
 
 class UserRepository(private val authRepository: AuthRepository) : ApplicationRepository() {
-    suspend fun getProfile(): ProfileView {
+    suspend fun getProfile(): ProfileViewDetailed {
         Log.d(SeiunApplication.TAG, "Get profile")
 
         return RequestHelper.executeWithRetry(authRepository) {
             getAtpClient().getProfile("Bearer ${it.accessJwt}", it.did)
         }
     }
 
-    suspend fun getProfileOf(did: String): ProfileView {
+    suspend fun getProfileOf(did: String): ProfileViewDetailed {
         Log.d(SeiunApplication.TAG, "Get profile of $did")
 
         return RequestHelper.executeWithRetry(authRepository) {

diff --git a/app/src/main/java/io/github/akiomik/seiun/ui/app/AppDrawer.kt b/app/src/main/java/io/github/akiomik/seiun/ui/app/AppDrawer.kt
@@ -33,12 +33,12 @@ import androidx.lifecycle.viewmodel.compose.viewModel
 import coil.compose.AsyncImage
 import com.google.android.gms.oss.licenses.OssLicensesMenuActivity
 import io.github.akiomik.seiun.R
-import io.github.akiomik.seiun.model.app.bsky.actor.ProfileView
+import io.github.akiomik.seiun.model.app.bsky.actor.ProfileViewDetailed
 import io.github.akiomik.seiun.viewmodels.AppViewModel
 import kotlinx.coroutines.launch
 
 @Composable
-private fun Profile(onClicked: (ProfileView) -> Unit) {
+private fun Profile(onClicked: (ProfileViewDetailed) -> Unit) {
     val viewModel: AppViewModel = viewModel()
     val profile by viewModel.profile.collectAsState()
 
@@ -55,7 +55,7 @@ private fun Profile(onClicked: (ProfileView) -> Unit) {
 }
 
 @Composable
-private fun Avatar(profile: ProfileView?) {
+private fun Avatar(profile: ProfileViewDetailed?) {
     AsyncImage(
         model = profile?.avatar,
         contentDescription = null,
@@ -67,7 +67,7 @@ private fun Avatar(profile: ProfileView?) {
 }
 
 @Composable
-private fun NameAndHandle(profile: ProfileView?) {
+private fun NameAndHandle(profile: ProfileViewDetailed?) {
     Column {
         Text(
             text = profile?.displayName.orEmpty(),
@@ -85,7 +85,7 @@ private fun NameAndHandle(profile: ProfileView?) {
 fun AppDrawer(
     state: DrawerState,
     enabled: Boolean,
-    onProfileClick: (ProfileView) -> Unit,
+    onProfileClick: (ProfileViewDetailed) -> Unit,
     content: @Composable () -> Unit
 ) {
 //    var selected by remember { mutableStateOf("") }

diff --git a/app/src/main/java/io/github/akiomik/seiun/ui/dialog/MuteDialog.kt b/app/src/main/java/io/github/akiomik/seiun/ui/dialog/MuteDialog.kt
@@ -10,11 +10,11 @@ import androidx.compose.ui.res.stringResource
 import androidx.lifecycle.viewmodel.compose.viewModel
 import io.github.akiomik.seiun.R
 import io.github.akiomik.seiun.SeiunApplication
-import io.github.akiomik.seiun.model.app.bsky.actor.WithInfo
+import io.github.akiomik.seiun.model.app.bsky.actor.ProfileViewBasic
 import io.github.akiomik.seiun.viewmodels.PostViewModel
 
 @Composable
-fun MuteDialog(actor: WithInfo, onDismissRequest: () -> Unit) {
+fun MuteDialog(actor: ProfileViewBasic, onDismissRequest: () -> Unit) {
     val viewModel: PostViewModel = viewModel()
     val context = LocalContext.current
     val mutedMessage = stringResource(id = R.string.dialog_muted)

diff --git a/app/src/main/java/io/github/akiomik/seiun/ui/user/FollowersListModal.kt b/app/src/main/java/io/github/akiomik/seiun/ui/user/FollowersListModal.kt
@@ -21,12 +21,12 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import coil.compose.AsyncImage
 import io.github.akiomik.seiun.R
-import io.github.akiomik.seiun.model.app.bsky.actor.WithInfo
+import io.github.akiomik.seiun.model.app.bsky.actor.ProfileViewBasic
 import io.github.akiomik.seiun.ui.dialog.FullScreenDialog
 import io.github.akiomik.seiun.viewmodels.FollowersViewModel
 
 @Composable
-private fun Avatar(user: WithInfo, onClicked: (String) -> Unit) {
+private fun Avatar(user: ProfileViewBasic, onClicked: (String) -> Unit) {
     AsyncImage(
         model = user.avatar,
         contentDescription = null,
@@ -39,7 +39,7 @@ private fun Avatar(user: WithInfo, onClicked: (String) -> Unit) {
 }
 
 @Composable
-private fun FollowersListItem(user: WithInfo, onProfileClick: (String) -> Unit) {
+private fun FollowersListItem(user: ProfileViewBasic, onProfileClick: (String) -> Unit) {
     ListItem(
         leadingContent = { Avatar(user = user, onClicked = onProfileClick) },
         headlineContent = { Text(text = user.displayName ?: "@${user.handle}") },
@@ -67,7 +67,7 @@ private fun FollowersListItem(user: WithInfo, onProfileClick: (String) -> Unit)
 
 @Composable
 private fun FollowersListContent(
-    followers: List<WithInfo>,
+    followers: List<ProfileViewBasic>,
     viewModel: FollowersViewModel,
     onProfileClick: (String) -> Unit
 ) {

diff --git a/app/src/main/java/io/github/akiomik/seiun/ui/user/FollowsListModal.kt b/app/src/main/java/io/github/akiomik/seiun/ui/user/FollowsListModal.kt
@@ -21,12 +21,12 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import coil.compose.AsyncImage
 import io.github.akiomik.seiun.R
-import io.github.akiomik.seiun.model.app.bsky.actor.WithInfo
+import io.github.akiomik.seiun.model.app.bsky.actor.ProfileViewBasic
 import io.github.akiomik.seiun.ui.dialog.FullScreenDialog
 import io.github.akiomik.seiun.viewmodels.FollowsViewModel
 
 @Composable
-private fun Avatar(user: WithInfo, onClicked: (String) -> Unit) {
+private fun Avatar(user: ProfileViewBasic, onClicked: (String) -> Unit) {
     AsyncImage(
         model = user.avatar,
         contentDescription = null,
@@ -39,7 +39,7 @@ private fun Avatar(user: WithInfo, onClicked: (String) -> Unit) {
 }
 
 @Composable
-private fun FollowsListItem(user: WithInfo, onProfileClick: (String) -> Unit) {
+private fun FollowsListItem(user: ProfileViewBasic, onProfileClick: (String) -> Unit) {
     ListItem(
         leadingContent = { Avatar(user = user, onClicked = onProfileClick) },
         headlineContent = { Text(text = user.displayName ?: "@${user.handle}") },
@@ -67,7 +67,7 @@ private fun FollowsListItem(user: WithInfo, onProfileClick: (String) -> Unit) {
 
 @Composable
 private fun FollowsListContent(
-    follows: List<WithInfo>,
+    follows: List<ProfileViewBasic>,
     viewModel: FollowsViewModel,
     onProfileClick: (String) -> Unit
 ) {