From: Dessalines <dessalines@users.noreply.github.com>
Date: Tue, 14 Feb 2023 14:19:37 +0000 (-0500)
Subject: Sort community search by active_monthly by default. (#2728)
X-Git-Url: http://these/git/%24%7Bsubmission.url%7D?a=commitdiff_plain;h=166854b37e0929bbbaf076b44470a132b539f50b;p=lemmy.git

Sort community search by active_monthly by default. (#2728)

- Fixes #2678
---

diff --git a/crates/apub/src/http/mod.rs b/crates/apub/src/http/mod.rs
index 83272d12..8b539919 100644
--- a/crates/apub/src/http/mod.rs
+++ b/crates/apub/src/http/mod.rs
@@ -128,7 +128,7 @@ pub(crate) async fn get_activity(
 
   let sensitive = activity.sensitive.unwrap_or(true);
   if !activity.local {
-    return Err(err_object_not_local());
+    Err(err_object_not_local())
   } else if sensitive {
     Ok(HttpResponse::Forbidden().finish())
   } else {
diff --git a/crates/db_views_actor/src/community_view.rs b/crates/db_views_actor/src/community_view.rs
index a4b64a28..e59025a5 100644
--- a/crates/db_views_actor/src/community_view.rs
+++ b/crates/db_views_actor/src/community_view.rs
@@ -19,7 +19,7 @@ use lemmy_db_schema::{
     local_user::LocalUser,
   },
   traits::{ToSafe, ViewToVec},
-  utils::{functions::hot_rank, fuzzy_search, get_conn, limit_and_offset, DbPool},
+  utils::{fuzzy_search, get_conn, limit_and_offset, DbPool},
   ListingType,
   SortType,
 };
@@ -164,15 +164,7 @@ impl<'a> CommunityQuery<'a> {
       SortType::TopAll => query = query.order_by(community_aggregates::subscribers.desc()),
       SortType::TopMonth => query = query.order_by(community_aggregates::users_active_month.desc()),
       SortType::Hot => {
-        query = query
-          .order_by(
-            hot_rank(
-              community_aggregates::subscribers,
-              community_aggregates::published,
-            )
-            .desc(),
-          )
-          .then_order_by(community_aggregates::published.desc());
+        query = query.order_by(community_aggregates::users_active_month.desc());
         // Don't show hidden communities in Hot (trending)
         query = query.filter(
           community::hidden
@@ -181,17 +173,7 @@ impl<'a> CommunityQuery<'a> {
         );
       }
       // Covers all other sorts
-      _ => {
-        query = query
-          .order_by(
-            hot_rank(
-              community_aggregates::subscribers,
-              community_aggregates::published,
-            )
-            .desc(),
-          )
-          .then_order_by(community_aggregates::published.desc())
-      }
+      _ => query = query.order_by(community_aggregates::users_active_month.desc()),
     };
 
     if let Some(listing_type) = self.listing_type {