grishka/lemmy
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Make sure hot rank sorts for post and community filter by positive hot ranks. (#3497)

Browse source 
* Make sure hot rank sorts for post and community filter by positive hot ranks.

- Context #2994

* Adding a comment.
This commit is contained in:
Dessalines 2023-07-06 07:22:48 -04:00 committed by GitHub
parent ef11a6ca37
commit 6840fd64f9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
crates/db_views/src/post_view.rs
View file

@ -391,8 +391,14 @@ impl<'a> PostQuery<'a> {
} }
query = match self.sort.unwrap_or(SortType::Hot) { query = match self.sort.unwrap_or(SortType::Hot) {
SortType::Active => query.then_order_by(post_aggregates::hot_rank_active.desc()), SortType::Active => query
SortType::Hot => query.then_order_by(post_aggregates::hot_rank.desc()), // Hot ranks fade to zero after a few days, and this filter drastically reduces
// the number of rows needed to be joined to.
.filter(post_aggregates::hot_rank_active.gt(1))
.then_order_by(post_aggregates::hot_rank_active.desc()),
SortType::Hot => query
.filter(post_aggregates::hot_rank.gt(1))
.then_order_by(post_aggregates::hot_rank.desc()),
SortType::New => query.then_order_by(post_aggregates::published.desc()), SortType::New => query.then_order_by(post_aggregates::published.desc()),
SortType::Old => query.then_order_by(post_aggregates::published.asc()), SortType::Old => query.then_order_by(post_aggregates::published.asc()),
SortType::NewComments => query.then_order_by(post_aggregates::newest_comment_time.desc()), SortType::NewComments => query.then_order_by(post_aggregates::newest_comment_time.desc()),

6
crates/db_views_actor/src/community_view.rs
View file

@ -184,7 +184,11 @@ impl<'a> CommunityQuery<'a> {
); );
} }
match self.sort.unwrap_or(Hot) { match self.sort.unwrap_or(Hot) {
Hot | Active => query = query.order_by(community_aggregates::hot_rank.desc()), Hot | Active => {
query = query
.filter(community_aggregates::hot_rank.gt(1))
.order_by(community_aggregates::hot_rank.desc())
}
NewComments | TopDay | TopTwelveHour | TopSixHour | TopHour => { NewComments | TopDay | TopTwelveHour | TopSixHour | TopHour => {
query = query.order_by(community_aggregates::users_active_day.desc()) query = query.order_by(community_aggregates::users_active_day.desc())
} }