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

Fixing community search. Fixes #1084 (#1089)

Browse source
This commit is contained in:
Dessalines 2020-08-16 11:05:21 -04:00 committed by GitHub
parent dd0418af18
commit 7f97279c48
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
server/lemmy_db/src/community_view.rs
View file

@ -232,12 +232,6 @@ impl<'a> CommunityQueryBuilder<'a> {
// The view lets you pass a null user_id, if you're not logged in // The view lets you pass a null user_id, if you're not logged in
match self.sort { match self.sort {
SortType::Hot => {
query = query
.order_by(hot_rank.desc())
.then_order_by(number_of_subscribers.desc())
.filter(user_id.is_null())
}
SortType::New => query = query.order_by(published.desc()).filter(user_id.is_null()), SortType::New => query = query.order_by(published.desc()).filter(user_id.is_null()),
SortType::TopAll => match self.from_user_id { SortType::TopAll => match self.from_user_id {
Some(from_user_id) => { Some(from_user_id) => {
@ -251,7 +245,12 @@ impl<'a> CommunityQueryBuilder<'a> {
.filter(user_id.is_null()) .filter(user_id.is_null())
} }
}, },
_ => (), SortType::Hot | _ => {
query = query
.order_by(hot_rank.desc())
.then_order_by(number_of_subscribers.desc())
.filter(user_id.is_null())
},
}; };
if !self.show_nsfw { if !self.show_nsfw {