From 4c77c84b601cd10b09079e34fe9a6fbbe7d8525b Mon Sep 17 00:00:00 2001 From: Dessalines Date: Thu, 23 Feb 2023 23:33:54 -0500 Subject: [PATCH] Cleaning up person_view sorts (#2760) --- crates/db_views_actor/src/person_view.rs | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/crates/db_views_actor/src/person_view.rs b/crates/db_views_actor/src/person_view.rs index 6dc618f77..14c413c84 100644 --- a/crates/db_views_actor/src/person_view.rs +++ b/crates/db_views_actor/src/person_view.rs @@ -95,17 +95,12 @@ impl<'a> PersonQuery<'a> { } query = match self.sort.unwrap_or(SortType::Hot) { - SortType::Hot => query - .order_by(person_aggregates::comment_score.desc()) - .then_order_by(person::published.desc()), - SortType::Active => query - .order_by(person_aggregates::comment_score.desc()) - .then_order_by(person::published.desc()), - SortType::New | SortType::MostComments | SortType::NewComments => { - query.order_by(person::published.desc()) - } + SortType::New | SortType::NewComments => query.order_by(person::published.desc()), SortType::Old => query.order_by(person::published.asc()), - SortType::TopAll => query.order_by(person_aggregates::comment_score.desc()), + SortType::Hot | SortType::Active | SortType::TopAll => { + query.order_by(person_aggregates::comment_score.desc()) + } + SortType::MostComments => query.order_by(person_aggregates::comment_count.desc()), SortType::TopYear => query .filter(person::published.gt(now - 1.years())) .order_by(person_aggregates::comment_score.desc()),