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

Ignore Undo() if object is not found in database

Browse source
This commit is contained in:
silverpill 2021-12-26 14:10:11 +00:00
parent 74a89f6fe9
commit 51aea90158
1 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/activitypub/receiver.rs
View file

@ -549,24 +549,26 @@ pub async fn receive_activity(
match get_reaction_by_activity_id(db_client, &object_id).await { match get_reaction_by_activity_id(db_client, &object_id).await {
Ok(reaction) => { Ok(reaction) => {
// Undo(Like) // Undo(Like)
match delete_reaction( delete_reaction(
db_client, db_client,
&reaction.author_id, &reaction.author_id,
&reaction.post_id, &reaction.post_id,
).await { ).await?;
Ok(_) => (),
// Ignore undo if reaction is not found
Err(DatabaseError::NotFound(_)) => return Ok(()),
Err(other_error) => return Err(other_error.into()),
};
LIKE LIKE
}, },
Err(DatabaseError::NotFound(_)) => { Err(DatabaseError::NotFound(_)) => {
// Undo(Announce) // Undo(Announce)
let post = get_post_by_object_id(db_client, &object_id).await?; let post = match get_post_by_object_id(db_client, &object_id).await {
Ok(post) => post,
// Ignore undo if neither reaction nor repost is found
Err(DatabaseError::NotFound(_)) => return Ok(()),
Err(other_error) => return Err(other_error.into()),
};
match post.repost_of_id { match post.repost_of_id {
// Ignore returned data because reposts don't have attached files
Some(_) => delete_post(db_client, &post.id).await?, Some(_) => delete_post(db_client, &post.id).await?,
None => return Err(HttpError::NotFoundError("object")), // Can't undo regular post
None => return Err(HttpError::ValidationError("object is not a repost".into())),
}; };
ANNOUNCE ANNOUNCE
}, },