Merge pull request #76 from akiomik/fix-lex

Fix lex
akiomik · Apr 2, 2023 · 5c7715a · 5c7715a
2 parents 0512d49 + e56d083
commit 5c7715a
Show file tree

Hide file tree

Showing 19 changed files with 77 additions and 45 deletions.
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
@@ -4,5 +4,5 @@ import com.squareup.moshi.JsonClass
 
 @JsonClass(generateAdapter = true)
 data class External(
-    val external: ExternalExternal
+    val external: ExternalExternal? = null
 )
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
@@ -0,0 +1,12 @@
+package io.github.akiomik.seiun.model.app.bsky.feed
+
+import com.squareup.moshi.Json
+import io.github.akiomik.seiun.model.app.bsky.embed.External
+import io.github.akiomik.seiun.model.app.bsky.embed.ImagesImage
+
+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
+)
diff --git a/...app/bsky/feed/ImagesOrExternalOrRecord.kt → ...ernalOrRecordOrRecordOrRecordWithMedia.kt b/...app/bsky/feed/ImagesOrExternalOrRecord.kt → ...ernalOrRecordOrRecordOrRecordWithMedia.kt
@@ -4,13 +4,13 @@ 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.ImagesImage
-import io.github.akiomik.seiun.model.com.atproto.repo.StrongRef
 
 @JsonClass(generateAdapter = true)
-data class ImagesOrExternalOrRecord(
+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 record: StrongRef? = null // from app.bsky.embed.record
+    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/ImagesViewOrExternalView.kt b/app/src/main/java/io/github/akiomik/seiun/model/app/bsky/feed/ImagesViewOrExternalView.kt
@@ -0,0 +1,12 @@
+package io.github.akiomik.seiun.model.app.bsky.feed
+
+import com.squareup.moshi.Json
+import io.github.akiomik.seiun.model.app.bsky.embed.ExternalViewExternal
+import io.github.akiomik.seiun.model.app.bsky.embed.ImagesViewImage
+
+data class ImagesViewOrExternalView(
+    @Json(name = "\$type")
+    val type: String,
+    val images: List<ImagesViewImage>? = null, // from app.bsky.embed.images#view
+    val external: ExternalViewExternal? = null // from app.bsky.embed.external#view
+)
diff --git a/...d/ImagesViewOrExternalViewOrRecordView.kt → ...lViewOrRecordViewOrRecordWithMediaView.kt b/...d/ImagesViewOrExternalViewOrRecordView.kt → ...lViewOrRecordViewOrRecordWithMediaView.kt
@@ -6,10 +6,11 @@ import io.github.akiomik.seiun.model.app.bsky.embed.ExternalViewExternal
 import io.github.akiomik.seiun.model.app.bsky.embed.ImagesViewImage
 
 @JsonClass(generateAdapter = true)
-data class ImagesViewOrExternalViewOrRecordView(
+data class ImagesViewOrExternalViewOrRecordViewOrRecordWithMediaView(
     @Json(name = "\$type")
     val type: String,
     val images: List<ImagesViewImage>? = null, // from app.bsky.embed.images#view
     val external: ExternalViewExternal? = null, // from app.bsky.embed.external#view
-    val record: RecordViewRecordOrRecordViewNotFound? = null // from app.bsky.embed.record#view
+    val record: RecordViewRecordOrRecordViewNotFound? = null, // from app.bsky.embed.record#view
+    val media: ImagesViewOrExternalView? = null // from app.bsky.embed.recordWithMedia#view
 )
diff --git a/app/src/main/java/io/github/akiomik/seiun/model/app/bsky/feed/Post.kt b/app/src/main/java/io/github/akiomik/seiun/model/app/bsky/feed/Post.kt
@@ -11,5 +11,5 @@ data class Post(
     val entities: List<PostEntity>? = null,
     val facets: List<Facet>? = null,
     val reply: PostReplyRef? = null,
-    val embed: ImagesOrExternalOrRecord? = null // TODO: union type
+    val embed: ImagesOrExternalOrRecordOrRecordOrRecordWithMedia? = null // TODO: union type
 )
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
@@ -16,7 +16,7 @@ data class PostView(
     val repostCount: Int? = null,
     val likeCount: Int? = null,
     val viewer: ViewerState? = null,
-    val embed: ImagesViewOrExternalViewOrRecordView? = null // TODO: union type
+    val embed: ImagesViewOrExternalViewOrRecordViewOrRecordWithMediaView? = null // TODO: union type
 ) {
     fun reposted(uri: String): PostView {
         return copy(

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,17 +1,16 @@
 package io.github.akiomik.seiun.model.app.bsky.feed
 
-import com.squareup.moshi.Json
 import io.github.akiomik.seiun.model.app.bsky.actor.WithInfo
 import java.util.*
 
 data class RecordViewRecordOrRecordViewNotFound(
-    @Json(name = "\$type")
-    val type: String,
+//    @Json(name = "\$type")
+//    val type: String,
     // from app.bsky.embed.record#viewRecord
-    val uri: String, // is used by app.bsky.embed.record#viewNotFound too
-    val cid: String,
-    val author: WithInfo,
+    val uri: String? = null, // is used by app.bsky.embed.record#viewNotFound too
+    val cid: String? = null,
+    val author: WithInfo? = null,
     // val record: Record, // TODO unknown
-    val indexedAt: Date,
-    val embeds: List<ImagesViewOrExternalViewOrRecordView>? = null
+    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
@@ -0,0 +1,9 @@
+package io.github.akiomik.seiun.model.app.bsky.feed
+
+import io.github.akiomik.seiun.model.com.atproto.repo.StrongRef
+
+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
+)
diff --git a/app/src/main/java/io/github/akiomik/seiun/model/app/bsky/notification/NotificationRecord.kt b/app/src/main/java/io/github/akiomik/seiun/model/app/bsky/notification/NotificationRecord.kt
@@ -3,7 +3,6 @@ package io.github.akiomik.seiun.model.app.bsky.notification
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
 import io.github.akiomik.seiun.model.app.bsky.feed.PostReplyRef
-import io.github.akiomik.seiun.model.com.atproto.repo.StrongRef
 import java.util.*
 
 // app.bsky.graph.follow (subject, createdAt) or
@@ -16,6 +15,6 @@ data class NotificationRecord(
     val type: String,
     val createdAt: Date,
     val text: String? = null,
-    val reply: PostReplyRef? = null,
-    val subject: StrongRef? = null
+    val reply: PostReplyRef? = null
+//    val subject: StrongRef? = null // TODO: support union of StrongRef or String
 )
diff --git a/app/src/main/java/io/github/akiomik/seiun/model/app/bsky/richtext/Facet.kt b/app/src/main/java/io/github/akiomik/seiun/model/app/bsky/richtext/Facet.kt
@@ -1,6 +1,6 @@
 package io.github.akiomik.seiun.model.app.bsky.richtext
 
 data class Facet(
-    val index: FacetTextSlice,
-    val value: FacetMentionOrFacetLink // TODO: union
+    val index: FacetByteSlice,
+    val features: List<FacetMentionOrFacetLink> // TODO: union
 )
diff --git a/app/src/main/java/io/github/akiomik/seiun/model/app/bsky/richtext/FacetByteSlice.kt b/app/src/main/java/io/github/akiomik/seiun/model/app/bsky/richtext/FacetByteSlice.kt
@@ -0,0 +1,6 @@
+package io.github.akiomik.seiun.model.app.bsky.richtext
+
+class FacetByteSlice(
+    val byteStart: Int,
+    val byteEnd: Int
+)
diff --git a/app/src/main/java/io/github/akiomik/seiun/model/app/bsky/richtext/FacetTextSlice.kt b/app/src/main/java/io/github/akiomik/seiun/model/app/bsky/richtext/FacetTextSlice.kt
diff --git a/app/src/main/java/io/github/akiomik/seiun/model/com/atproto/repo/CreateRecordInput.kt b/app/src/main/java/io/github/akiomik/seiun/model/com/atproto/repo/CreateRecordInput.kt
@@ -4,7 +4,7 @@ import com.squareup.moshi.JsonClass
 
 @JsonClass(generateAdapter = true)
 data class CreateRecordInput<A>(
-    val did: String,
+    val repo: String,
     val record: A,
     val collection: String,
     val rkey: String? = null,

diff --git a/app/src/main/java/io/github/akiomik/seiun/model/com/atproto/repo/DeleteRecordInput.kt b/app/src/main/java/io/github/akiomik/seiun/model/com/atproto/repo/DeleteRecordInput.kt
@@ -4,7 +4,7 @@ import com.squareup.moshi.JsonClass
 
 @JsonClass(generateAdapter = true)
 data class DeleteRecordInput(
-    val did: String,
+    val repo: String,
     val collection: String,
     val rkey: String,
     val swapRecord: String? = null,

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
@@ -5,9 +5,9 @@ import com.squareup.moshi.JsonClass
 
 @JsonClass(generateAdapter = true)
 data class Blob(
-    val ref: Ref,
+    val ref: Ref?,
     val mimeType: String,
-    val size: Int,
+    val size: Int?,
     @Json(name = "\$type")
     val type: String? = "blob"
 )
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
@@ -7,7 +7,7 @@ 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.feed.AuthorFeed
 import io.github.akiomik.seiun.model.app.bsky.feed.FeedViewPost
-import io.github.akiomik.seiun.model.app.bsky.feed.ImagesOrExternalOrRecord
+import io.github.akiomik.seiun.model.app.bsky.feed.ImagesOrExternalOrRecordOrRecordOrRecordWithMedia
 import io.github.akiomik.seiun.model.app.bsky.feed.Like
 import io.github.akiomik.seiun.model.app.bsky.feed.Post
 import io.github.akiomik.seiun.model.app.bsky.feed.PostReplyRef
@@ -63,7 +63,7 @@ class PostFeedRepository(private val authRepository: AuthRepository) : Applicati
 
         val res = RequestHelper.executeWithRetry(authRepository) {
             val body = CreateRecordInput(
-                did = it.did,
+                repo = it.did,
                 record = Like(subject = subject, createdAt = Date()),
                 collection = "app.bsky.feed.like"
             )
@@ -82,7 +82,7 @@ class PostFeedRepository(private val authRepository: AuthRepository) : Applicati
         val rkey = UriConverter.toRkey(uri)
         RequestHelper.executeWithRetry(authRepository) {
             val body = DeleteRecordInput(
-                did = it.did,
+                repo = it.did,
                 collection = "app.bsky.feed.like",
                 rkey = rkey
             )
@@ -99,7 +99,7 @@ class PostFeedRepository(private val authRepository: AuthRepository) : Applicati
         val res = RequestHelper.executeWithRetry(authRepository) {
             val record = Repost(subject = subject, Date())
             val body = CreateRecordInput(
-                did = it.did,
+                repo = it.did,
                 record = record,
                 collection = "app.bsky.feed.repost"
             )
@@ -119,7 +119,7 @@ class PostFeedRepository(private val authRepository: AuthRepository) : Applicati
         val rkey = UriConverter.toRkey(uri)
         RequestHelper.executeWithRetry(authRepository) {
             val body =
-                DeleteRecordInput(did = it.did, rkey = rkey, collection = "app.bsky.feed.repost")
+                DeleteRecordInput(repo = it.did, rkey = rkey, collection = "app.bsky.feed.repost")
             getAtpClient().deleteRecord("Bearer ${it.accessJwt}", body = body)
         }
 
@@ -134,7 +134,7 @@ class PostFeedRepository(private val authRepository: AuthRepository) : Applicati
                 image = imageBlob,
                 alt = ""
             )
-            ImagesOrExternalOrRecord(images = listOf(image), type = "app.bsky.embed.images")
+            ImagesOrExternalOrRecordOrRecordOrRecordWithMedia(images = listOf(image), type = "app.bsky.embed.images")
         } else {
             null
         }
@@ -143,7 +143,7 @@ class PostFeedRepository(private val authRepository: AuthRepository) : Applicati
 
         val res = RequestHelper.executeWithRetry(authRepository) {
             val body =
-                CreateRecordInput(did = it.did, record = record, collection = "app.bsky.feed.post")
+                CreateRecordInput(repo = it.did, record = record, collection = "app.bsky.feed.post")
             getAtpClient().createPost(authorization = "Bearer ${it.accessJwt}", body = body)
         }
 
@@ -165,15 +165,15 @@ class PostFeedRepository(private val authRepository: AuthRepository) : Applicati
                     image = imageBlob,
                     alt = "app.bsky.feed.post"
                 )
-            ImagesOrExternalOrRecord(images = listOf(image), type = "app.bsky.embed.images")
+            ImagesOrExternalOrRecordOrRecordOrRecordWithMedia(images = listOf(image), type = "app.bsky.embed.images")
         } else {
             null
         }
         val record = Post(text = content, createdAt = Date(), reply = to, embed = embed)
 
         val res = RequestHelper.executeWithRetry(authRepository) {
             val body =
-                CreateRecordInput(did = it.did, record = record, collection = "app.bsky.feed.post")
+                CreateRecordInput(repo = it.did, record = record, collection = "app.bsky.feed.post")
             getAtpClient().createPost(authorization = "Bearer ${it.accessJwt}", body = body)
         }
 
@@ -188,7 +188,7 @@ class PostFeedRepository(private val authRepository: AuthRepository) : Applicati
         val rkey = UriConverter.toRkey(feedViewPost.post.uri)
         RequestHelper.executeWithRetry(authRepository) {
             val body =
-                DeleteRecordInput(did = it.did, collection = "app.bsky.feed.post", rkey = rkey)
+                DeleteRecordInput(repo = it.did, collection = "app.bsky.feed.post", rkey = rkey)
             getAtpClient().deleteRecord("Bearer ${it.accessJwt}", body)
         }
 

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
@@ -75,7 +75,7 @@ class UserRepository(private val authRepository: AuthRepository) : ApplicationRe
 
         return RequestHelper.executeWithRetry(authRepository) {
             val body = CreateRecordInput(
-                did = it.did,
+                repo = it.did,
                 record = Follow(subject = did, Date()),
                 collection = "app.bsky.graph.follow"
             )
@@ -88,7 +88,7 @@ class UserRepository(private val authRepository: AuthRepository) : ApplicationRe
 
         return RequestHelper.executeWithRetry(authRepository) {
             val body = DeleteRecordInput(
-                did = it.did,
+                repo = it.did,
                 collection = "app.bsky.graph.follow",
                 rkey = UriConverter.toRkey(uri)
             )

diff --git a/app/src/main/java/io/github/akiomik/seiun/viewmodels/NotificationViewModel.kt b/app/src/main/java/io/github/akiomik/seiun/viewmodels/NotificationViewModel.kt
@@ -68,7 +68,7 @@ class NotificationViewModel : ApplicationViewModel() {
 
             // NOTE: Update always for updating isRead
             val newNotifications =
-                mergeNotifications(_notifications.value.orEmpty(), notifications.notifications)
+                mergeNotifications(_notifications.value, notifications.notifications)
             _notifications.value = newNotifications
             Log.d(SeiunApplication.TAG, "Notifications are merged")
         }, onComplete = {
@@ -85,7 +85,7 @@ class NotificationViewModel : ApplicationViewModel() {
 
             if (res.cursor != _cursor.value) {
                 if (res.notifications.isNotEmpty()) {
-                    val newNotifications = notifications.value.orEmpty() + res.notifications
+                    val newNotifications = notifications.value + res.notifications
                     _notifications.value = newNotifications
                     _cursor.value = res.cursor
                     _state.value = State.Loaded