Skip to content

Commit

Permalink
Sort community search by active_monthly by default. (#2728)
Browse files Browse the repository at this point in the history
- Fixes #2678
  • Loading branch information
dessalines authored and Nutomic committed Feb 20, 2023
1 parent 16e8f42 commit df1e8a5
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 22 deletions.
2 changes: 1 addition & 1 deletion crates/apub/src/http/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
24 changes: 3 additions & 21 deletions crates/db_views_actor/src/community_view.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
};
Expand Down Expand Up @@ -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
Expand All @@ -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 {
Expand Down

0 comments on commit df1e8a5

Please sign in to comment.