Skip to content

Commit

Permalink
Fetch community outbox in parallel (fixes #2180) (#2181)
Browse files Browse the repository at this point in the history
  • Loading branch information
Nutomic authored Apr 1, 2022
1 parent 4597ea2 commit 589d952
Showing 1 changed file with 14 additions and 6 deletions.
20 changes: 14 additions & 6 deletions crates/apub/src/collections/community_outbox.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ use crate::{
};
use activitystreams_kinds::collection::OrderedCollectionType;
use chrono::NaiveDateTime;
use futures::future::join_all;
use lemmy_api_common::blocking;
use lemmy_apub_lib::{
data::Data,
Expand Down Expand Up @@ -97,7 +98,7 @@ impl ApubObject for ApubCommunityOutbox {
async fn from_apub(
apub: Self::ApubType,
data: &Self::DataType,
request_counter: &mut i32,
_request_counter: &mut i32,
) -> Result<Self, LemmyError> {
let mut outbox_activities = apub.ordered_items;
if outbox_activities.len() > 20 {
Expand All @@ -108,12 +109,19 @@ impl ApubObject for ApubCommunityOutbox {
// Lemmy versions, or from other software which we cant parse. In that case, we simply skip the
// item and only parse the ones that work.
let data = Data::new(data.1.clone());
for activity in outbox_activities {
let verify = activity.verify(&data, request_counter).await;
if verify.is_ok() {
activity.receive(&data, request_counter).await.ok();
// process items in parallel, to avoid long delay from fetch_site_metadata() and other processing
join_all(outbox_activities.into_iter().map(|activity| {
async {
// use separate request counter for each item, otherwise there will be problems with
// parallel processing
let request_counter = &mut 0;
let verify = activity.verify(&data, request_counter).await;
if verify.is_ok() {
activity.receive(&data, request_counter).await.ok();
}
}
}
}))
.await;

// This return value is unused, so just set an empty vec
Ok(ApubCommunityOutbox(Vec::new()))
Expand Down

0 comments on commit 589d952

Please sign in to comment.