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

This reverts commit 6840fd64f9.
pull/3538/head
Dessalines 2023-07-07 05:29:07 -04:00 committed by GitHub
parent aa70325c11
commit c208faf276
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 13 deletions

View File

@ -391,14 +391,8 @@ impl<'a> PostQuery<'a> {
}
query = match self.sort.unwrap_or(SortType::Hot) {
SortType::Active => query
// 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::Active => query.then_order_by(post_aggregates::hot_rank_active.desc()),
SortType::Hot => query.then_order_by(post_aggregates::hot_rank.desc()),
SortType::New => query.then_order_by(post_aggregates::published.desc()),
SortType::Old => query.then_order_by(post_aggregates::published.asc()),
SortType::NewComments => query.then_order_by(post_aggregates::newest_comment_time.desc()),

View File

@ -168,11 +168,7 @@ impl<'a> CommunityQuery<'a> {
);
}
match self.sort.unwrap_or(Hot) {
Hot | Active => {
query = query
.filter(community_aggregates::hot_rank.gt(1))
.order_by(community_aggregates::hot_rank.desc())
}
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())
}