LemmyNet/lemmy
2
0
Fork 0
mirror of https://github.com/LemmyNet/lemmy.git synced 2024-11-25 22:01:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Address PR comments.

Browse source
This commit is contained in:
Dessalines 2024-09-20 12:17:45 -04:00
parent 57045bb552
commit 7e07ea952e
1 changed files with 22 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
crates/apub/src/api/search.rs
View file

@ -37,29 +37,36 @@ pub async fn search(
// TODO no clean / non-nsfw searching rn // TODO no clean / non-nsfw searching rn
let q = data.q.clone(); let Query(Search {
let page = data.page; q,
let limit = data.limit; community_id,
let sort = data.sort; community_name,
let listing_type = data.listing_type; creator_id,
let search_type = data.type_.unwrap_or(SearchType::All); type_,
let community_id = if let Some(name) = &data.community_name { sort,
listing_type,
page,
limit,
post_title_only,
post_url_only,
saved_only,
liked_only,
disliked_only,
}) = data;
let q = q.clone();
let search_type = type_.unwrap_or(SearchType::All);
let community_id = if let Some(name) = &community_name {
Some( Some(
resolve_actor_identifier::<ApubCommunity, Community>(name, &context, &local_user_view, false) resolve_actor_identifier::<ApubCommunity, Community>(name, &context, &local_user_view, false)
.await?, .await?,
) )
.map(|c| c.id) .map(|c| c.id)
} else { } else {
data.community_id community_id
}; };
let creator_id = data.creator_id;
let local_user = local_user_view.as_ref().map(|l| &l.local_user); let local_user = local_user_view.as_ref().map(|l| &l.local_user);
let post_title_only = data.post_title_only;
let post_url_only = data.post_url_only;
let saved_only = data.saved_only;
let liked_only = data.liked_only;
let disliked_only = data.disliked_only;
check_conflicting_like_filters(liked_only, disliked_only)?; check_conflicting_like_filters(liked_only, disliked_only)?;
let posts_query = PostQuery { let posts_query = PostQuery {
@ -133,7 +140,7 @@ pub async fn search(
SearchType::All => { SearchType::All => {
// If the community or creator is included, dont search communities or users // If the community or creator is included, dont search communities or users
let community_or_creator_included = let community_or_creator_included =
data.community_id.is_some() || data.community_name.is_some() || data.creator_id.is_some(); community_id.is_some() || community_name.is_some() || creator_id.is_some();
posts = posts_query posts = posts_query
.list(&local_site.site, &mut context.pool()) .list(&local_site.site, &mut context.pool())