]> Untitled Git - lemmy.git/commitdiff
Fixing community search. Fixes #1084 (#1089)
authorDessalines <dessalines@users.noreply.github.com>
Sun, 16 Aug 2020 15:05:21 +0000 (11:05 -0400)
committerGitHub <noreply@github.com>
Sun, 16 Aug 2020 15:05:21 +0000 (11:05 -0400)
server/lemmy_db/src/community_view.rs

index e68dbd5e2f247342ea003a57613d925bfb5b9ffb..7445cc4630cc39e0fdcf5a63e8843a636c821487 100644 (file)
@@ -232,12 +232,6 @@ impl<'a> CommunityQueryBuilder<'a> {
 
     // The view lets you pass a null user_id, if you're not logged in
     match self.sort {
-      SortType::Hot => {
-        query = query
-          .order_by(hot_rank.desc())
-          .then_order_by(number_of_subscribers.desc())
-          .filter(user_id.is_null())
-      }
       SortType::New => query = query.order_by(published.desc()).filter(user_id.is_null()),
       SortType::TopAll => match self.from_user_id {
         Some(from_user_id) => {
@@ -251,7 +245,12 @@ impl<'a> CommunityQueryBuilder<'a> {
             .filter(user_id.is_null())
         }
       },
-      _ => (),
+      SortType::Hot | _ => {
+        query = query
+          .order_by(hot_rank.desc())
+          .then_order_by(number_of_subscribers.desc())
+          .filter(user_id.is_null())
+      },
     };
 
     if !self.show_nsfw {