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

fix(posts/comments/search): return error on invalid community name (#3418)

Browse source
This commit is contained in:
Louis GERARD 2023-07-04 13:04:38 +02:00 committed by GitHub
parent cdc5b47886
commit 85dab149a9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
crates/apub/src/api/list_comments.rs
View file

@ -27,9 +27,7 @@ pub async fn list_comments(
check_private_instance(&local_user_view, &local_site)?; check_private_instance(&local_user_view, &local_site)?;
let community_id = if let Some(name) = &data.community_name { let community_id = if let Some(name) = &data.community_name {
resolve_actor_identifier::<ApubCommunity, Community>(name, &context, &None, true) Some(resolve_actor_identifier::<ApubCommunity, Community>(name, &context, &None, true).await?)
.await
.ok()
.map(|c| c.id) .map(|c| c.id)
} else { } else {
data.community_id data.community_id

4
crates/apub/src/api/list_posts.rs
View file

@ -29,9 +29,7 @@ pub async fn list_posts(
let page = data.page; let page = data.page;
let limit = data.limit; let limit = data.limit;
let community_id = if let Some(name) = &data.community_name { let community_id = if let Some(name) = &data.community_name {
resolve_actor_identifier::<ApubCommunity, Community>(name, &context, &None, true) Some(resolve_actor_identifier::<ApubCommunity, Community>(name, &context, &None, true).await?)
.await
.ok()
.map(|c| c.id) .map(|c| c.id)
} else { } else {
data.community_id data.community_id

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

@ -41,9 +41,10 @@ pub async fn search(
let listing_type = data.listing_type; let listing_type = data.listing_type;
let search_type = data.type_.unwrap_or(SearchType::All); let search_type = data.type_.unwrap_or(SearchType::All);
let community_id = if let Some(name) = &data.community_name { let community_id = if let Some(name) = &data.community_name {
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?,
.ok() )
.map(|c| c.id) .map(|c| c.id)
} else { } else {
data.community_id data.community_id