From 47710852531f874fd0bfade2498d5cc5ef621223 Mon Sep 17 00:00:00 2001 From: Freek van Zee Date: Tue, 16 Apr 2024 22:03:06 +0200 Subject: [PATCH] Update custom_emoji_view Only keep get_all als helper function calling list with paging ignored Only order on category when filtering on category --- crates/db_views/src/custom_emoji_view.rs | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/crates/db_views/src/custom_emoji_view.rs b/crates/db_views/src/custom_emoji_view.rs index 1ee40fac3..0f1b9e0de 100644 --- a/crates/db_views/src/custom_emoji_view.rs +++ b/crates/db_views/src/custom_emoji_view.rs @@ -36,21 +36,7 @@ impl CustomEmojiView { } pub async fn get_all(pool: &mut DbPool<'_>) -> Result, Error> { - let conn = &mut get_conn(pool).await?; - let emojis = custom_emoji::table - .left_join( - custom_emoji_keyword::table.on(custom_emoji_keyword::custom_emoji_id.eq(custom_emoji::id)), - ) - .order(custom_emoji::category) - .then_order_by(custom_emoji::id) - .select(( - custom_emoji::all_columns, - custom_emoji_keyword::all_columns.nullable(), // (or all the columns if you want) - )) - .load::(conn) - .await?; - - Ok(CustomEmojiView::from_tuple_to_vec(emojis)) + Self::list(pool, &None, None, None, true).await } pub async fn list( @@ -74,12 +60,14 @@ impl CustomEmojiView { } if let Some(category) = category { - query = query.filter(custom_emoji::category.eq(category)) + query = query + .filter(custom_emoji::category.eq(category)) + .order(custom_emoji::category) } + query = query.then_order_by(custom_emoji::id); + let emojis = query - .order(custom_emoji::category) - .then_order_by(custom_emoji::id) .select(( custom_emoji::all_columns, custom_emoji_keyword::all_columns.nullable(), // (or all the columns if you want)