diff --git a/lib-multisrc/libgroup/build.gradle.kts b/lib-multisrc/libgroup/build.gradle.kts index 79e1d69b6..516ffede3 100644 --- a/lib-multisrc/libgroup/build.gradle.kts +++ b/lib-multisrc/libgroup/build.gradle.kts @@ -2,4 +2,4 @@ plugins { id("lib-multisrc") } -baseVersionCode = 28 +baseVersionCode = 29 diff --git a/lib-multisrc/libgroup/src/eu/kanade/tachiyomi/multisrc/libgroup/LibGroup.kt b/lib-multisrc/libgroup/src/eu/kanade/tachiyomi/multisrc/libgroup/LibGroup.kt index 688215108..0266b1ca3 100644 --- a/lib-multisrc/libgroup/src/eu/kanade/tachiyomi/multisrc/libgroup/LibGroup.kt +++ b/lib-multisrc/libgroup/src/eu/kanade/tachiyomi/multisrc/libgroup/LibGroup.kt @@ -324,7 +324,7 @@ abstract class LibGroup( if (currentBranch.value.branchId == defaultBranchId && sortingList == "ms_mixing") { // ms_mixing with default branch from api chapters.add(it.value.toSChapter(slugUrl, defaultBranchId, isScanUser())) } else if (defaultBranchId == null && sortingList == "ms_mixing") { // ms_mixing with first branch in chapter - if (chapters.any { chpIt -> chpIt.chapter_number == it.value.itemNumber }) { + if (chapters.any { chpIt -> chpIt.chapter_number == it.value.number.toFloat() }) { chapters.add(it.value.toSChapter(slugUrl, currentBranch.value.branchId, isScanUser())) } } else if (sortingList == "ms_combining") { // ms_combining diff --git a/lib-multisrc/libgroup/src/eu/kanade/tachiyomi/multisrc/libgroup/LibGroupDto.kt b/lib-multisrc/libgroup/src/eu/kanade/tachiyomi/multisrc/libgroup/LibGroupDto.kt index 494e66bc6..18cd1c34d 100644 --- a/lib-multisrc/libgroup/src/eu/kanade/tachiyomi/multisrc/libgroup/LibGroupDto.kt +++ b/lib-multisrc/libgroup/src/eu/kanade/tachiyomi/multisrc/libgroup/LibGroupDto.kt @@ -202,7 +202,6 @@ class Chapter( val name: String?, val number: String, val volume: String, - @SerialName("item_number") val itemNumber: Float?, ) { @Serializable class Branch( @@ -241,7 +240,7 @@ class Chapter( url = "/$slugUrl/chapter?$branchStr&volume=$volume&number=$number" scanlator = getTeamName(branchId) ?: if (isScanUser) getUserName(branchId) else null date_upload = runCatching { LibGroup.simpleDateFormat.parse(first(branchId)!!.createdAt)!!.time }.getOrDefault(0L) - chapter_number = itemNumber ?: -1f + chapter_number = number.toFloat() } }