X-Git-Url: http://these/git/?a=blobdiff_plain;f=crates%2Fapub%2Fsrc%2Factivities%2Fdeletion%2Fdelete.rs;h=06f7463ae0f12dfe163677153e726aaf846da746;hb=3471f3533cb724b2cf6953d563aadfcc9f66c1d2;hp=95024c475c3c1b3ac609c03e9b6320d33bbcbb4f;hpb=235cc8b22897bfb3e71ba3dbd725d36863fea8ba;p=lemmy.git diff --git a/crates/apub/src/activities/deletion/delete.rs b/crates/apub/src/activities/deletion/delete.rs index 95024c47..06f7463a 100644 --- a/crates/apub/src/activities/deletion/delete.rs +++ b/crates/apub/src/activities/deletion/delete.rs @@ -1,19 +1,14 @@ use crate::{ activities::{ - community::announce::GetCommunity, deletion::{receive_delete_action, verify_delete_activity, DeletableObjects}, generate_activity_id, }, - check_apub_id_valid, - fetch_local_site_data, - local_instance, - objects::{community::ApubCommunity, person::ApubPerson}, + insert_received_activity, + objects::person::ApubPerson, protocol::{activities::deletion::delete::Delete, IdOrNestedObject}, }; -use activitypub_federation::{core::object_id::ObjectId, data::Data, traits::ActivityHandler}; -use activitystreams_kinds::activity::DeleteType; -use anyhow::anyhow; -use lemmy_api_common::utils::blocking; +use activitypub_federation::{config::Data, kinds::activity::DeleteType, traits::ActivityHandler}; +use lemmy_api_common::{context::LemmyContext, utils::sanitize_html_opt}; use lemmy_db_schema::{ source::{ comment::{Comment, CommentUpdateForm}, @@ -30,15 +25,10 @@ use lemmy_db_schema::{ }, traits::Crud, }; -use lemmy_utils::error::LemmyError; -use lemmy_websocket::{ - send::{send_comment_ws_message_simple, send_community_ws_message, send_post_ws_message}, - LemmyContext, - UserOperationCrud, -}; +use lemmy_utils::error::{LemmyError, LemmyErrorType}; use url::Url; -#[async_trait::async_trait(?Send)] +#[async_trait::async_trait] impl ActivityHandler for Delete { type DataType = LemmyContext; type Error = LemmyError; @@ -52,24 +42,14 @@ impl ActivityHandler for Delete { } #[tracing::instrument(skip_all)] - async fn verify( - &self, - context: &Data, - request_counter: &mut i32, - ) -> Result<(), LemmyError> { - let local_site_data = blocking(context.pool(), fetch_local_site_data).await??; - check_apub_id_valid(self.id(), &local_site_data, context.settings()) - .map_err(LemmyError::from_message)?; - verify_delete_activity(self, self.summary.is_some(), context, request_counter).await?; + async fn verify(&self, context: &Data) -> Result<(), LemmyError> { + insert_received_activity(&self.id, context).await?; + verify_delete_activity(self, self.summary.is_some(), context).await?; Ok(()) } #[tracing::instrument(skip_all)] - async fn receive( - self, - context: &Data, - request_counter: &mut i32, - ) -> Result<(), LemmyError> { + async fn receive(self, context: &Data) -> Result<(), LemmyError> { if let Some(reason) = self.summary { // We set reason to empty string if it doesn't exist, to distinguish between delete and // remove. Here we change it back to option, so we don't write it to db. @@ -79,24 +59,14 @@ impl ActivityHandler for Delete { Some(reason) }; receive_remove_action( - &self - .actor - .dereference(context, local_instance(context), request_counter) - .await?, + &self.actor.dereference(context).await?, self.object.id(), reason, context, ) .await } else { - receive_delete_action( - self.object.id(), - &self.actor, - true, - context, - request_counter, - ) - .await + receive_delete_action(self.object.id(), &self.actor, true, context).await } } } @@ -108,7 +78,7 @@ impl Delete { to: Url, community: Option<&Community>, summary: Option, - context: &LemmyContext, + context: &Data, ) -> Result { let id = generate_activity_id( DeleteType::Delete, @@ -116,14 +86,14 @@ impl Delete { )?; let cc: Option = community.map(|c| c.actor_id.clone().into()); Ok(Delete { - actor: ObjectId::new(actor.actor_id.clone()), + actor: actor.actor_id.clone().into(), to: vec![to], object: IdOrNestedObject::Id(object.id()), cc: cc.into_iter().collect(), kind: DeleteType::Delete, summary, id, - unparsed: Default::default(), + audience: community.map(|c| c.actor_id.clone().into()), }) } } @@ -133,15 +103,14 @@ pub(in crate::activities) async fn receive_remove_action( actor: &ApubPerson, object: &Url, reason: Option, - context: &LemmyContext, + context: &Data, ) -> Result<(), LemmyError> { - use UserOperationCrud::*; + let reason = sanitize_html_opt(&reason); + match DeletableObjects::read_from_db(object, context).await? { DeletableObjects::Community(community) => { if community.local { - return Err(LemmyError::from_message( - "Only local admin can remove community", - )); + return Err(LemmyErrorType::OnlyLocalAdminCanRemoveCommunity)?; } let form = ModRemoveCommunityForm { mod_person_id: actor.id, @@ -150,20 +119,13 @@ pub(in crate::activities) async fn receive_remove_action( reason, expires: None, }; - blocking(context.pool(), move |conn| { - ModRemoveCommunity::create(conn, &form) - }) - .await??; - let deleted_community = blocking(context.pool(), move |conn| { - Community::update( - conn, - community.id, - &CommunityUpdateForm::builder().removed(Some(true)).build(), - ) - }) - .await??; - - send_community_ws_message(deleted_community.id, RemoveCommunity, None, None, context).await?; + ModRemoveCommunity::create(&mut context.pool(), &form).await?; + Community::update( + &mut context.pool(), + community.id, + &CommunityUpdateForm::builder().removed(Some(true)).build(), + ) + .await?; } DeletableObjects::Post(post) => { let form = ModRemovePostForm { @@ -172,20 +134,13 @@ pub(in crate::activities) async fn receive_remove_action( removed: Some(true), reason, }; - blocking(context.pool(), move |conn| { - ModRemovePost::create(conn, &form) - }) - .await??; - let removed_post = blocking(context.pool(), move |conn| { - Post::update( - conn, - post.id, - &PostUpdateForm::builder().removed(Some(true)).build(), - ) - }) - .await??; - - send_post_ws_message(removed_post.id, RemovePost, None, None, context).await?; + ModRemovePost::create(&mut context.pool(), &form).await?; + Post::update( + &mut context.pool(), + post.id, + &PostUpdateForm::builder().removed(Some(true)).build(), + ) + .await?; } DeletableObjects::Comment(comment) => { let form = ModRemoveCommentForm { @@ -194,49 +149,15 @@ pub(in crate::activities) async fn receive_remove_action( removed: Some(true), reason, }; - blocking(context.pool(), move |conn| { - ModRemoveComment::create(conn, &form) - }) - .await??; - let removed_comment = blocking(context.pool(), move |conn| { - Comment::update( - conn, - comment.id, - &CommentUpdateForm::builder().removed(Some(true)).build(), - ) - }) - .await??; - - send_comment_ws_message_simple(removed_comment.id, RemoveComment, context).await?; + ModRemoveComment::create(&mut context.pool(), &form).await?; + Comment::update( + &mut context.pool(), + comment.id, + &CommentUpdateForm::builder().removed(Some(true)).build(), + ) + .await?; } DeletableObjects::PrivateMessage(_) => unimplemented!(), } Ok(()) } - -#[async_trait::async_trait(?Send)] -impl GetCommunity for Delete { - #[tracing::instrument(skip_all)] - async fn get_community( - &self, - context: &LemmyContext, - _request_counter: &mut i32, - ) -> Result { - let community_id = match DeletableObjects::read_from_db(self.object.id(), context).await? { - DeletableObjects::Community(c) => c.id, - DeletableObjects::Comment(c) => { - let post = blocking(context.pool(), move |conn| Post::read(conn, c.post_id)).await??; - post.community_id - } - DeletableObjects::Post(p) => p.community_id, - DeletableObjects::PrivateMessage(_) => { - return Err(anyhow!("Private message is not part of community").into()) - } - }; - let community = blocking(context.pool(), move |conn| { - Community::read(conn, community_id) - }) - .await??; - Ok(community.into()) - } -}