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

Merge pull request #1188 from LemmyNet/fix_blocked_creator_outbox

Browse source 
Fixed an issue with blocked post creators in outbox.
This commit is contained in:
Nutomic 2020-10-12 10:30:48 +00:00 committed by GitHub
commit 70f7dd876f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lemmy_apub/src/activity_queue.rs
View file

@ -189,10 +189,6 @@ where
return Ok(()); return Ok(());
} }
for to_url in &to {
check_is_apub_id_valid(&to_url)?;
}
let activity = activity.into_any_base()?; let activity = activity.into_any_base()?;
let serialised_activity = serde_json::to_string(&activity)?; let serialised_activity = serde_json::to_string(&activity)?;

8
lemmy_apub/src/fetcher.rs
View file

@ -338,7 +338,13 @@ async fn fetch_remote_community(
} }
for o in outbox_items { for o in outbox_items {
let page = PageExt::from_any_base(o)?.context(location_info!())?; 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(); let post_ap_id = post.ap_id.as_ref().context(location_info!())?.clone();
// Check whether the post already exists in the local db // Check whether the post already exists in the local db
let existing = blocking(context.pool(), move |conn| { let existing = blocking(context.pool(), move |conn| {