From e0fcae2ae35c3d6d4702041b6f489f208f6533ef Mon Sep 17 00:00:00 2001 From: schroda <50052685+schroda@users.noreply.github.com> Date: Fri, 28 Jun 2024 15:21:32 +0200 Subject: [PATCH] Handle deprecated gql sort again (#983) --- .../suwayomi/tachidesk/graphql/queries/CategoryQuery.kt | 2 +- .../kotlin/suwayomi/tachidesk/graphql/queries/ChapterQuery.kt | 2 +- .../suwayomi/tachidesk/graphql/queries/ExtensionQuery.kt | 2 +- .../kotlin/suwayomi/tachidesk/graphql/queries/MangaQuery.kt | 2 +- .../kotlin/suwayomi/tachidesk/graphql/queries/MetaQuery.kt | 2 +- .../kotlin/suwayomi/tachidesk/graphql/queries/SourceQuery.kt | 2 +- .../kotlin/suwayomi/tachidesk/graphql/queries/TrackQuery.kt | 4 ++-- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/CategoryQuery.kt b/server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/CategoryQuery.kt index 94a148f1..6243261c 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/CategoryQuery.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/CategoryQuery.kt @@ -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) diff --git a/server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/ChapterQuery.kt b/server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/ChapterQuery.kt index 832e81f2..28ead837 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/ChapterQuery.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/ChapterQuery.kt @@ -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) diff --git a/server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/ExtensionQuery.kt b/server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/ExtensionQuery.kt index caec1b3f..7d7c2c97 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/ExtensionQuery.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/ExtensionQuery.kt @@ -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) diff --git a/server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/MangaQuery.kt b/server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/MangaQuery.kt index 68dc9515..a35dcd68 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/MangaQuery.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/MangaQuery.kt @@ -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) diff --git a/server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/MetaQuery.kt b/server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/MetaQuery.kt index 94798544..1c1dd61d 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/MetaQuery.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/MetaQuery.kt @@ -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) diff --git a/server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/SourceQuery.kt b/server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/SourceQuery.kt index 6c8099f3..aa09a905 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/SourceQuery.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/SourceQuery.kt @@ -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) diff --git a/server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/TrackQuery.kt b/server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/TrackQuery.kt index 59aabb7e..9e386ecd 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/TrackQuery.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/TrackQuery.kt @@ -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)