mirrors/Tachidesk
1
0
Fork 0
mirror of https://github.com/Suwayomi/Tachidesk.git synced 2026-02-02 17:10:45 +01:00
Code Issues Projects Releases Wiki Activity

Handle deprecated gql sort again (#983)

Browse Source
This commit is contained in:
schroda
2024-06-28 15:21:32 +02:00
committed by GitHub
parent af9ad61174
commit e0fcae2ae3
7 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/CategoryQuery.kt
View File

@@ -149,7 +149,7 @@ class CategoryQuery {
res.applyOps(condition, filter)
if (order != null || (last != null || before != null)) {
if (order != null || orderBy != null || (last != null || before != null)) {
val baseSort = listOf(CategoryOrder(CategoryOrderBy.ID, SortOrder.ASC))
val deprecatedSort = listOfNotNull(orderBy?.let { CategoryOrder(orderBy, orderByType) })
val actualSort = (order.orEmpty() + deprecatedSort + baseSort)

2
server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/ChapterQuery.kt
View File

@@ -233,7 +233,7 @@ class ChapterQuery {
res.applyOps(condition, filter)
if (order != null || (last != null || before != null)) {
if (order != null || orderBy != null || (last != null || before != null)) {
val baseSort = listOf(ChapterOrder(ChapterOrderBy.ID, SortOrder.ASC))
val deprecatedSort = listOfNotNull(orderBy?.let { ChapterOrder(orderBy, orderByType) })
val actualSort = (order.orEmpty() + deprecatedSort + baseSort)

2
server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/ExtensionQuery.kt
View File

@@ -183,7 +183,7 @@ class ExtensionQuery {
res.applyOps(condition, filter)
if (order != null || (last != null || before != null)) {
if (order != null || orderBy != null || (last != null || before != null)) {
val baseSort = listOf(ExtensionOrder(ExtensionOrderBy.PKG_NAME, SortOrder.ASC))
val deprecatedSort = listOfNotNull(orderBy?.let { ExtensionOrder(orderBy, orderByType) })
val actualSort = (order.orEmpty() + deprecatedSort + baseSort)

2
server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/MangaQuery.kt
View File

@@ -251,7 +251,7 @@ class MangaQuery {
res.applyOps(condition, filter)
if (order != null || (last != null || before != null)) {
if (order != null || orderBy != null || (last != null || before != null)) {
val baseSort = listOf(MangaOrder(MangaOrderBy.ID, SortOrder.ASC))
val deprecatedSort = listOfNotNull(orderBy?.let { MangaOrder(orderBy, orderByType) })
val actualSort = (order.orEmpty() + deprecatedSort + baseSort)

2
server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/MetaQuery.kt
View File

@@ -133,7 +133,7 @@ class MetaQuery {
res.applyOps(condition, filter)
if (order != null || (last != null || before != null)) {
if (order != null || orderBy != null || (last != null || before != null)) {
val baseSort = listOf(MetaOrder(MetaOrderBy.KEY, SortOrder.ASC))
val deprecatedSort = listOfNotNull(orderBy?.let { MetaOrder(orderBy, orderByType) })
val actualSort = (order.orEmpty() + deprecatedSort + baseSort)

2
server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/SourceQuery.kt
View File

@@ -149,7 +149,7 @@ class SourceQuery {
res.applyOps(condition, filter)
if (order != null || (last != null || before != null)) {
if (order != null || orderBy != null || (last != null || before != null)) {
val baseSort = listOf(SourceOrder(SourceOrderBy.ID, SortOrder.ASC))
val deprecatedSort = listOfNotNull(orderBy?.let { SourceOrder(orderBy, orderByType) })
val actualSort = (order.orEmpty() + deprecatedSort + baseSort)

4
server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/TrackQuery.kt
View File

@@ -151,7 +151,7 @@ class TrackQuery {
}
}
if (order != null || (last != null || before != null)) {
if (order != null || orderBy != null || (last != null || before != null)) {
val baseSort = listOf(TrackerOrder(TrackerOrderBy.ID, SortOrder.ASC))
val deprecatedSort = listOfNotNull(orderBy?.let { TrackerOrder(orderBy, orderByType) })
val actualSort = (order.orEmpty() + deprecatedSort + baseSort)
@@ -412,7 +412,7 @@ class TrackQuery {
res.applyOps(condition, filter)
if (order != null || (last != null || before != null)) {
if (order != null || orderBy != null || (last != null || before != null)) {
val baseSort = listOf(TrackRecordOrder(TrackRecordOrderBy.ID, SortOrder.ASC))
val deprecatedSort = listOfNotNull(orderBy?.let { TrackRecordOrder(orderBy, orderByType) })
val actualSort = (order.orEmpty() + deprecatedSort + baseSort)