Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Adding rest of community sorts. Fixes #3374 #3376

Merged
merged 7 commits into from
Jul 3, 2023
Merged

Adding rest of community sorts. Fixes #3374 #3376

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f73d1cd
Adding rest of community sorts. Fixes #3374
dessalines Jun 27, 2023
c276426
Addressing PR comments.
dessalines Jun 28, 2023
a6386f5
Adding rest of community sorts. Fixes #3374
dessalines Jun 27, 2023
bf8110c
Addressing PR comments.
dessalines Jun 28, 2023
e5c9fdb
Merge branch 'main' into add_missing_community_sorts
dessalines Jul 3, 2023
85e8ec0
Merge branch 'add_missing_community_sorts' of https://github.com/Lemm…
dessalines Jul 3, 2023
436fd93
Moving use up.
dessalines Jul 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 18 additions & 8 deletions crates/db_views_actor/src/community_view.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,8 @@ pub struct CommunityQuery<'a> {

impl<'a> CommunityQuery<'a> {
pub async fn list(self) -> Result<Vec<CommunityView>, Error> {
use SortType::*;

let conn = &mut get_conn(self.pool).await?;

// The left join below will return None in this case
Expand Down Expand Up @@ -181,14 +183,22 @@ impl<'a> CommunityQuery<'a> {
.or(community_follower::person_id.eq(person_id_join)),
);
}

match self.sort.unwrap_or(SortType::Hot) {
SortType::New => query = query.order_by(community::published.desc()),
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(community_aggregates::hot_rank.desc()),
// Covers all other sorts
_ => query = query.order_by(community_aggregates::users_active_month.desc()),
match self.sort.unwrap_or(Hot) {
Hot | Active => query = query.order_by(community_aggregates::hot_rank.desc()),
NewComments | TopDay | TopTwelveHour | TopSixHour | TopHour => {
query = query.order_by(community_aggregates::users_active_day.desc())
}
New => query = query.order_by(community::published.desc()),
Old => query = query.order_by(community::published.asc()),
MostComments => query = query.order_by(community_aggregates::comments.desc()),
TopAll | TopYear | TopNineMonths => {
query = query.order_by(community_aggregates::subscribers.desc())
}
TopSixMonths | TopThreeMonths => {
query = query.order_by(community_aggregates::users_active_half_year.desc())
}
TopMonth => query = query.order_by(community_aggregates::users_active_month.desc()),
TopWeek => query = query.order_by(community_aggregates::users_active_week.desc()),
};

if let Some(listing_type) = self.listing_type {
Expand Down