Handle Delete(Person) activities
This commit is contained in:
parent
a96d4fecfc
commit
ff892b0826
2 changed files with 20 additions and 6 deletions
|
@ -3,12 +3,15 @@ use tokio_postgres::GenericClient;
|
||||||
use crate::activitypub::{
|
use crate::activitypub::{
|
||||||
activity::Activity,
|
activity::Activity,
|
||||||
receiver::get_object_id,
|
receiver::get_object_id,
|
||||||
vocabulary::NOTE,
|
vocabulary::{NOTE, PERSON},
|
||||||
};
|
};
|
||||||
use crate::config::Config;
|
use crate::config::Config;
|
||||||
use crate::errors::{DatabaseError, ValidationError};
|
use crate::errors::{DatabaseError, ValidationError};
|
||||||
use crate::models::posts::queries::{delete_post, get_post_by_object_id};
|
use crate::models::posts::queries::{delete_post, get_post_by_object_id};
|
||||||
use crate::models::profiles::queries::get_profile_by_actor_id;
|
use crate::models::profiles::queries::{
|
||||||
|
delete_profile,
|
||||||
|
get_profile_by_actor_id,
|
||||||
|
};
|
||||||
use super::HandlerResult;
|
use super::HandlerResult;
|
||||||
|
|
||||||
pub async fn handle_delete(
|
pub async fn handle_delete(
|
||||||
|
@ -18,9 +21,20 @@ pub async fn handle_delete(
|
||||||
) -> HandlerResult {
|
) -> HandlerResult {
|
||||||
let object_id = get_object_id(&activity.object)?;
|
let object_id = get_object_id(&activity.object)?;
|
||||||
if object_id == activity.actor {
|
if object_id == activity.actor {
|
||||||
log::info!("received deletion request for {}", object_id);
|
// Self-delete
|
||||||
// Ignore Delete(Person)
|
let profile = match get_profile_by_actor_id(db_client, &object_id).await {
|
||||||
return Ok(None);
|
Ok(profile) => profile,
|
||||||
|
// Ignore Delete(Person) if profile is not found
|
||||||
|
Err(DatabaseError::NotFound(_)) => return Ok(None),
|
||||||
|
Err(other_error) => return Err(other_error.into()),
|
||||||
|
};
|
||||||
|
let deletion_queue = delete_profile(db_client, &profile.id).await?;
|
||||||
|
let config = config.clone();
|
||||||
|
actix_rt::spawn(async move {
|
||||||
|
deletion_queue.process(&config).await;
|
||||||
|
});
|
||||||
|
log::info!("deleted profie {}", profile.acct);
|
||||||
|
return Ok(Some(PERSON));
|
||||||
};
|
};
|
||||||
let post = match 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,
|
Ok(post) => post,
|
||||||
|
|
|
@ -55,6 +55,6 @@ pub async fn handle_undo(
|
||||||
};
|
};
|
||||||
Ok(Some(ANNOUNCE))
|
Ok(Some(ANNOUNCE))
|
||||||
},
|
},
|
||||||
Err(other_error) => return Err(other_error.into()),
|
Err(other_error) => Err(other_error.into()),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue