post::{Post, PostRead, PostSaved},
},
traits::JoinView,
- utils::{functions::hot_rank, fuzzy_search, get_conn, limit_and_offset, DbPool},
+ utils::{fuzzy_search, get_conn, limit_and_offset, DbPool},
ListingType,
SortType,
};
}
query = match self.sort.unwrap_or(SortType::Hot) {
- SortType::Active => query
- .then_order_by(
- hot_rank(
- post_aggregates::score,
- post_aggregates::newest_comment_time_necro,
- )
- .desc(),
- )
- .then_order_by(post_aggregates::newest_comment_time_necro.desc()),
- SortType::Hot => query
- .then_order_by(hot_rank(post_aggregates::score, post_aggregates::published).desc())
- .then_order_by(post_aggregates::published.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()),
.await
.unwrap();
- // only one french language post should be returned
- assert_eq!(1, post_listing_french.len());
- assert_eq!(french_id, post_listing_french[0].post.language_id);
+ // only one post in french and one undetermined should be returned
+ assert_eq!(2, post_listing_french.len());
+ assert!(post_listing_french
+ .iter()
+ .any(|p| p.post.language_id == french_id));
LocalUserLanguage::update(
pool,
newest_comment_time: inserted_post.published,
featured_community: false,
featured_local: false,
+ hot_rank: 1728,
+ hot_rank_active: 1728,
},
subscribed: SubscribedType::NotSubscribed,
read: false,