FediMovies/fedimovies
1
1
Fork 0
Code Issues 3 Pull requests Projects Releases Packages Activity

Always put outgoing activities in a queue

Browse source
This commit is contained in:
silverpill 2023-01-04 19:26:21 +00:00
parent 30857868a0
commit 5c9aa0f148
8 changed files with 38 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/activitypub/deliverer.rs
View file

@ -208,6 +208,7 @@ async fn deliver_activity_worker(
}
pub struct OutgoingActivity {
pub db_pool: Option<DbPool>, // needed to track unreachable actors (optional)
pub instance: Instance,
pub sender: User,
pub activity: Value,
@ -233,6 +234,7 @@ impl OutgoingActivity {
};
};
Self {
db_pool: None,
instance: instance.clone(),
sender: sender.clone(),
activity: serde_json::to_value(activity)
@ -241,9 +243,11 @@ impl OutgoingActivity {
}
}
pub async fn deliver(self) -> Result<(), DelivererError> {
pub async fn deliver(
self,
) -> Result<(), DelivererError> {
deliver_activity_worker(
None,
self.db_pool,
self.instance,
self.sender,
self.activity,
@ -251,30 +255,9 @@ impl OutgoingActivity {
).await
}
pub async fn deliver_or_log(self) -> () {
self.deliver().await.unwrap_or_else(|err| {
log::error!("{}", err);
});
}
pub fn spawn_deliver(self) -> () {
tokio::spawn(async move {
self.deliver_or_log().await;
});
}
pub fn spawn_deliver_with_tracking(
self,
db_pool: DbPool,
) -> () {
tokio::spawn(async move {
deliver_activity_worker(
Some(db_pool),
self.instance,
self.sender,
self.activity,
self.recipients,
).await.unwrap_or_else(|err| {
self.deliver().await.unwrap_or_else(|err| {
log::error!("{}", err);
});
});

2
src/activitypub/handlers/follow.rs
View file

@ -69,7 +69,7 @@ pub async fn handle_follow(
&target_user,
&source_actor,
&activity.id,
).spawn_deliver();
).enqueue(db_client).await?;
Ok(Some(PERSON))
}

14
src/activitypub/handlers/move.rs
View file

@ -90,7 +90,6 @@ pub async fn handle_move(
};
let followers = get_followers(db_client, &old_profile.id).await?;
let mut activities = vec![];
for follower in followers {
let follower = get_user_by_id(db_client, &follower.id).await?;
// Unfollow old profile
@ -103,12 +102,12 @@ pub async fn handle_move(
if let Some(ref old_actor) = old_profile.actor_json {
let follow_request_id = maybe_follow_request_id
.expect("follow request must exist");
activities.push(prepare_undo_follow(
prepare_undo_follow(
&instance,
&follower,
old_actor,
&follow_request_id,
));
).enqueue(db_client).await?;
};
// Follow new profile
match create_follow_request(
@ -117,12 +116,12 @@ pub async fn handle_move(
&new_profile.id,
).await {
Ok(follow_request) => {
activities.push(prepare_follow(
prepare_follow(
&instance,
&follower,
new_actor,
&follow_request.id,
));
).enqueue(db_client).await?;
},
Err(DatabaseError::AlreadyExists(_)) => (), // already following
Err(other_error) => return Err(other_error.into()),
@ -133,11 +132,6 @@ pub async fn handle_move(
&follower.id,
).await?;
};
tokio::spawn(async move {
for activity in activities {
activity.deliver_or_log().await;
};
});
Ok(Some(PERSON))
}

3
src/activitypub/queues.rs
View file

@ -142,12 +142,13 @@ pub async fn process_queued_outgoing_activities(
.map_err(|_| DatabaseTypeError)?;
let sender = get_user_by_id(db_client, &job_data.sender_id).await?;
let outgoing_activity = OutgoingActivity {
db_pool: Some(db_pool.clone()),
instance: config.instance(),
sender,
activity: job_data.activity,
recipients: job_data.recipients,
};
outgoing_activity.spawn_deliver_with_tracking(db_pool.clone());
outgoing_activity.spawn_deliver();
delete_job_from_queue(db_client, &job.id).await?;
};
Ok(())

4
src/ethereum/subscriptions.rs
View file

@ -80,7 +80,7 @@ pub async fn send_subscription_notifications(
recipient,
remote_sender,
LocalActorCollection::Subscribers,
).spawn_deliver();
).enqueue(db_client).await?;
};
Ok(())
}
@ -277,7 +277,7 @@ pub async fn update_expired_subscriptions(
&recipient,
remote_sender,
LocalActorCollection::Subscribers,
).spawn_deliver();
).enqueue(db_client).await?;
} else {
create_subscription_expiration_notification(
db_client,

23
src/mastodon_api/accounts/views.rs
View file

@ -236,8 +236,11 @@ async fn update_credentials(
).await?;
// Federate
prepare_update_person(db_client, &config.instance(), &current_user).await?
.spawn_deliver();
prepare_update_person(
db_client,
&config.instance(),
&current_user,
).await?.enqueue(db_client).await?;
let account = Account::from_user(current_user, &config.instance_url());
Ok(HttpResponse::Ok().json(account))
@ -313,13 +316,12 @@ async fn move_followers(
.expect("actor data must be present");
let follow_request_id = maybe_follow_request_id
.expect("follow request must exist");
// TODO: send in a batch
prepare_undo_follow(
&config.instance(),
&current_user,
remote_actor,
&follow_request_id,
).spawn_deliver();
).enqueue(db_client).await?;
},
// Not a follower, ignore
Err(DatabaseError::NotFound(_)) => continue,
@ -420,7 +422,7 @@ async fn send_signed_activity(
add_integrity_proof(&mut outgoing_activity.activity, proof)
.map_err(|_| HttpError::InternalError)?;
outgoing_activity.spawn_deliver();
outgoing_activity.enqueue(db_client).await?;
let account = Account::from_user(current_user, &config.instance_url());
Ok(HttpResponse::Ok().json(account))
@ -530,8 +532,11 @@ async fn create_identity_proof(
).await?;
// Federate
prepare_update_person(db_client, &config.instance(), &current_user).await?
.spawn_deliver();
prepare_update_person(
db_client,
&config.instance(),
&current_user,
).await?.enqueue(db_client).await?;
let account = Account::from_user(current_user, &config.instance_url());
Ok(HttpResponse::Ok().json(account))
@ -633,7 +638,7 @@ async fn follow_account(
&current_user,
&remote_actor,
&follow_request.id,
).spawn_deliver();
).enqueue(db_client).await?;
},
Err(DatabaseError::AlreadyExists(_)) => (), // already following
Err(other_error) => return Err(other_error.into()),
@ -683,7 +688,7 @@ async fn unfollow_account(
&current_user,
&remote_actor,
&follow_request_id,
).spawn_deliver();
).enqueue(db_client).await?;
},
Ok(None) => (), // local follow
Err(DatabaseError::NotFound(_)) => (), // not following

6
src/mastodon_api/statuses/views.rs
View file

@ -245,7 +245,7 @@ async fn delete_status(
tokio::spawn(async move {
deletion_queue.process(&config).await;
});
delete_note.spawn_deliver();
delete_note.enqueue(db_client).await?;
Ok(HttpResponse::NoContent().finish())
}
@ -349,7 +349,7 @@ async fn unfavourite(
&current_user,
&post,
&reaction_id,
).await?.spawn_deliver();
).await?.enqueue(db_client).await?;
};
let status = build_status(
@ -422,7 +422,7 @@ async fn unreblog(
&current_user,
&post,
repost_id,
).await?.spawn_deliver();
).await?.enqueue(db_client).await?;
let status = build_status(
db_client,

7
src/mastodon_api/subscriptions/views.rs
View file

@ -142,8 +142,11 @@ pub async fn register_subscription_option(
).await?;
// Federate
prepare_update_person(db_client, &config.instance(), &current_user)
.await?.spawn_deliver();
prepare_update_person(
db_client,
&config.instance(),
&current_user,
).await?.enqueue(db_client).await?;
};
let account = Account::from_user(current_user, &config.instance_url());