Adapt model implementation for TachiyomiX 1.6 (#3412)

domain/src/main/java/mihon/domain/extension/interactor/GetExtensionStoreCountAsFlow.kt

@@ -1,5 +1,6 @@
 package mihon.domain.extension.interactor
 
+import kotlinx.serialization.json.Json
 import mihon.domain.extension.repository.ExtensionStoreRepository
 
 class GetExtensionStoreCountAsFlow(

domain/src/main/java/tachiyomi/domain/chapter/model/Chapter.kt

@@ -1,5 +1,8 @@
 package tachiyomi.domain.chapter.model
 
+import kotlinx.serialization.json.JsonObject
+import mihon.core.common.extensions.EMPTY
+
 data class Chapter(
     val id: Long,
     val mangaId: Long,
@@ -15,6 +18,7 @@ data class Chapter(
     val scanlator: String?,
     val lastModifiedAt: Long,
     val version: Long,
+    val memo: JsonObject,
 ) {
     val isRecognizedNumber: Boolean
         get() = chapterNumber >= 0f
@@ -45,6 +49,7 @@ data class Chapter(
             scanlator = null,
             lastModifiedAt = 0,
             version = 1,
+            memo = JsonObject.EMPTY,
         )
     }
 }

domain/src/main/java/tachiyomi/domain/chapter/model/ChapterUpdate.kt

@@ -1,5 +1,7 @@
 package tachiyomi.domain.chapter.model
 
+import kotlinx.serialization.json.JsonObject
+
 data class ChapterUpdate(
     val id: Long,
     val mangaId: Long? = null,
@@ -14,6 +16,7 @@ data class ChapterUpdate(
     val chapterNumber: Double? = null,
     val scanlator: String? = null,
     val version: Long? = null,
+    val memo: JsonObject? = null,
 )
 
 fun Chapter.toChapterUpdate(): ChapterUpdate {
@@ -31,5 +34,6 @@ fun Chapter.toChapterUpdate(): ChapterUpdate {
         chapterNumber,
         scanlator,
         version,
+        memo,
     )
 }

domain/src/main/java/tachiyomi/domain/manga/model/Manga.kt

@@ -3,6 +3,8 @@ package tachiyomi.domain.manga.model
 import androidx.compose.runtime.Immutable
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.model.UpdateStrategy
+import kotlinx.serialization.json.JsonObject
+import mihon.core.common.extensions.EMPTY
 import tachiyomi.core.common.preference.TriState
 import java.io.Serializable
 import java.time.Instant
@@ -33,6 +35,7 @@ data class Manga(
     val favoriteModifiedAt: Long?,
     val version: Long,
     val notes: String,
+    val memo: JsonObject,
 ) : Serializable {
 
     val expectedNextUpdate: Instant?
@@ -128,6 +131,7 @@ data class Manga(
             favoriteModifiedAt = null,
             version = 0L,
             notes = "",
+            memo = JsonObject.EMPTY,
         )
     }
 }

domain/src/main/java/tachiyomi/domain/manga/model/MangaUpdate.kt

@@ -1,6 +1,7 @@
 package tachiyomi.domain.manga.model
 
 import eu.kanade.tachiyomi.source.model.UpdateStrategy
+import kotlinx.serialization.json.JsonObject
 
 data class MangaUpdate(
     val id: Long,
@@ -25,6 +26,7 @@ data class MangaUpdate(
     val initialized: Boolean? = null,
     val version: Long? = null,
     val notes: String? = null,
+    val memo: JsonObject? = null,
 )
 
 fun Manga.toMangaUpdate(): MangaUpdate {
@@ -51,5 +53,6 @@ fun Manga.toMangaUpdate(): MangaUpdate {
         initialized = initialized,
         version = version,
         notes = notes,
+        memo = memo,
     )
 }