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

Fix remote community posts appearing in local listing (fixes #4180) (#4181)

Browse source 
* Fix remote community posts appearing in local listing (fixes #4180)

* fmt

* fix typo
This commit is contained in:
Nutomic 2023-11-22 15:41:52 +01:00 committed by GitHub
parent 375e232217
commit e58a167d64
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
api_tests/src/shared.ts
View file

@ -290,6 +290,7 @@ export async function searchPostLocal(
q: post.name, q: post.name,
type_: "Posts", type_: "Posts",
sort: "TopAll", sort: "TopAll",
listing_type: "All",
}; };
return api.search(form); return api.search(form);
} }

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

@ -344,7 +344,7 @@ fn queries<'a>() -> Queries<
query = query.filter(post_aggregates::creator_id.eq(creator_id)); query = query.filter(post_aggregates::creator_id.eq(creator_id));
} }
if let (Some(listing_type), Some(person_id)) = (options.listing_type, person_id) { if let Some(person_id) = person_id {
let is_subscribed = exists( let is_subscribed = exists(
community_follower::table.filter( community_follower::table.filter(
post_aggregates::community_id post_aggregates::community_id
@ -352,7 +352,7 @@ fn queries<'a>() -> Queries<
.and(community_follower::person_id.eq(person_id)), .and(community_follower::person_id.eq(person_id)),
), ),
); );
match listing_type { match options.listing_type.unwrap_or_default() {
ListingType::Subscribed => query = query.filter(is_subscribed), ListingType::Subscribed => query = query.filter(is_subscribed),
ListingType::Local => { ListingType::Local => {
query = query query = query
@ -370,6 +370,15 @@ fn queries<'a>() -> Queries<
)); ));
} }
} }
} else {
match options.listing_type.unwrap_or_default() {
ListingType::Local => {
query = query
.filter(community::local.eq(true))
.filter(community::hidden.eq(false));
}
_ => query = query.filter(community::hidden.eq(false)),
}
} }
if let Some(url_search) = &options.url_search { if let Some(url_search) = &options.url_search {