From a3e2d0fdd40c4515c88a39c07816e80a93200dd5 Mon Sep 17 00:00:00 2001 From: Aaron Leopold <36278431+aaronleopold@users.noreply.github.com> Date: Tue, 7 Jan 2025 12:09:00 -0700 Subject: [PATCH] :bug: Fix unordered OPDS entries Fixes #551 --- apps/server/src/routers/opds/v1_2.rs | 3 ++- apps/server/src/routers/opds/v2_0.rs | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/apps/server/src/routers/opds/v1_2.rs b/apps/server/src/routers/opds/v1_2.rs index cf74d8109..87d731627 100644 --- a/apps/server/src/routers/opds/v1_2.rs +++ b/apps/server/src/routers/opds/v1_2.rs @@ -283,6 +283,7 @@ async fn get_libraries( let libraries = db .library() .find_many(vec![library_not_hidden_from_user_filter(user)]) + .order_by(library::name::order(Direction::Asc)) .exec() .await?; let entries = libraries @@ -424,6 +425,7 @@ async fn get_series( .find_many(chain_optional_iter([], [age_restrictions.clone()])) .skip(skip) .take(take) + .order_by(series::name::order(Direction::Asc)) .exec() .await?; @@ -516,7 +518,6 @@ async fn get_series_by_id( params: OPDSIDURLParams { id }, .. }): Path>, - // Path((id, _)): Path<(String, String)>, State(ctx): State, pagination: Query, Extension(req): Extension, diff --git a/apps/server/src/routers/opds/v2_0.rs b/apps/server/src/routers/opds/v2_0.rs index 26d7ab742..fa3854915 100644 --- a/apps/server/src/routers/opds/v2_0.rs +++ b/apps/server/src/routers/opds/v2_0.rs @@ -278,6 +278,7 @@ async fn browse_libraries( .find_many(library_conditions.clone()) .take(take) .skip(skip) + .order_by(library::name::order(Direction::Asc)) .exec() .await?; let library_count = client.library().count(library_conditions).exec().await?;