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

Prepare Delete(Note) before deleting post from database

Browse source
This commit is contained in:
silverpill 2022-10-16 00:42:06 +00:00
parent ea62f1fdaf
commit f6c3cbc0fa
2 changed files with 22 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/cli.rs
View file

@ -185,14 +185,22 @@ impl DeletePost {
db_client: &mut impl GenericClient, db_client: &mut impl GenericClient,
) -> Result<(), Error> { ) -> Result<(), Error> {
let post = get_post_by_id(db_client, &self.id).await?; let post = get_post_by_id(db_client, &self.id).await?;
let mut maybe_delete_note = None;
if post.author.is_local() {
let author = get_user_by_id(db_client, &post.author.id).await?;
let activity = prepare_delete_note(
db_client,
config.instance(),
&author,
&post,
).await?;
maybe_delete_note = Some(activity);
};
let deletion_queue = delete_post(db_client, &post.id).await?; let deletion_queue = delete_post(db_client, &post.id).await?;
deletion_queue.process(config).await; deletion_queue.process(config).await;
if post.author.is_local() { // Send Delete(Note) activity
// Send Delete(Note) activity if let Some(activity) = maybe_delete_note {
let author = get_user_by_id(db_client, &post.author.id).await?; activity.deliver().await?;
prepare_delete_note(db_client, config.instance(), &author, &post)
.await?
.deliver().await?;
}; };
println!("post deleted"); println!("post deleted");
Ok(()) Ok(())

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

@ -242,14 +242,17 @@ async fn delete_status(
if post.author.id != current_user.id { if post.author.id != current_user.id {
return Err(HttpError::PermissionError); return Err(HttpError::PermissionError);
}; };
let delete_note = prepare_delete_note(
db_client,
config.instance(),
&current_user,
&post,
).await?;
let deletion_queue = delete_post(db_client, &status_id).await?; let deletion_queue = delete_post(db_client, &status_id).await?;
let config_clone = config.clone();
tokio::spawn(async move { tokio::spawn(async move {
deletion_queue.process(&config_clone).await; deletion_queue.process(&config).await;
}); });
delete_note.spawn_deliver();
prepare_delete_note(db_client, config.instance(), &current_user, &post).await?
.spawn_deliver();
Ok(HttpResponse::NoContent().finish()) Ok(HttpResponse::NoContent().finish())
} }