mirror of
https://github.com/LemmyNet/lemmy.git
synced 2024-11-10 10:08:58 +00:00
Merge pull request #1188 from LemmyNet/fix_blocked_creator_outbox
Fixed an issue with blocked post creators in outbox.
This commit is contained in:
commit
70f7dd876f
|
@ -189,10 +189,6 @@ where
|
|||
return Ok(());
|
||||
}
|
||||
|
||||
for to_url in &to {
|
||||
check_is_apub_id_valid(&to_url)?;
|
||||
}
|
||||
|
||||
let activity = activity.into_any_base()?;
|
||||
let serialised_activity = serde_json::to_string(&activity)?;
|
||||
|
||||
|
|
|
@ -338,7 +338,13 @@ async fn fetch_remote_community(
|
|||
}
|
||||
for o in outbox_items {
|
||||
let page = PageExt::from_any_base(o)?.context(location_info!())?;
|
||||
let post = PostForm::from_apub(&page, context, None).await?;
|
||||
|
||||
// The post creator may be from a blocked instance,
|
||||
// if it errors, then continue
|
||||
let post = match PostForm::from_apub(&page, context, None).await {
|
||||
Ok(post) => post,
|
||||
Err(_) => continue,
|
||||
};
|
||||
let post_ap_id = post.ap_id.as_ref().context(location_info!())?.clone();
|
||||
// Check whether the post already exists in the local db
|
||||
let existing = blocking(context.pool(), move |conn| {
|
||||
|
|
Loading…
Reference in a new issue