X-Git-Url: http://these/git/?a=blobdiff_plain;f=crates%2Fapub%2Fsrc%2Factivities%2Fdeletion%2Fdelete.rs;h=fcdede8d76745460653ea97874f3317633146b61;hb=e9e76549a88cfbdab36f00d302cceabcaaa24f4c;hp=54e9c3941e2dbb985e32a7546d2023cd636f3075;hpb=888e6838563504ac48fb87f49539963934e88558;p=lemmy.git diff --git a/crates/apub/src/activities/deletion/delete.rs b/crates/apub/src/activities/deletion/delete.rs index 54e9c394..fcdede8d 100644 --- a/crates/apub/src/activities/deletion/delete.rs +++ b/crates/apub/src/activities/deletion/delete.rs @@ -1,27 +1,18 @@ use crate::{ activities::{ - community::{announce::GetCommunity, send_to_community}, deletion::{receive_delete_action, verify_delete_activity, DeletableObjects}, generate_activity_id, - verify_activity, - verify_is_public, }, - activity_lists::AnnouncableActivities, - objects::{community::ApubCommunity, person::ApubPerson}, - protocol::activities::deletion::delete::Delete, -}; -use activitystreams::{activity::kind::DeleteType, public}; -use anyhow::anyhow; -use lemmy_api_common::blocking; -use lemmy_apub_lib::{ - data::Data, - object_id::ObjectId, - traits::{ActivityHandler, ActorType}, + insert_received_activity, + objects::person::ApubPerson, + protocol::{activities::deletion::delete::Delete, IdOrNestedObject}, }; +use activitypub_federation::{config::Data, kinds::activity::DeleteType, traits::ActivityHandler}; +use lemmy_api_common::context::LemmyContext; use lemmy_db_schema::{ source::{ - comment::Comment, - community::Community, + comment::{Comment, CommentUpdateForm}, + community::{Community, CommunityUpdateForm}, moderator::{ ModRemoveComment, ModRemoveCommentForm, @@ -30,46 +21,35 @@ use lemmy_db_schema::{ ModRemovePost, ModRemovePostForm, }, - post::Post, + post::{Post, PostUpdateForm}, }, traits::Crud, }; -use lemmy_utils::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; - async fn verify( - &self, - context: &Data, - request_counter: &mut i32, - ) -> Result<(), LemmyError> { - verify_is_public(&self.to, &self.cc)?; - verify_activity(&self.id, self.actor.inner(), &context.settings())?; - let community = self.get_community(context, request_counter).await?; - verify_delete_activity( - &self.object, - &self.actor, - &community, - self.summary.is_some(), - context, - request_counter, - ) - .await?; + type Error = LemmyError; + + fn id(&self) -> &Url { + &self.id + } + + fn actor(&self) -> &Url { + self.actor.inner() + } + + #[tracing::instrument(skip_all)] + 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(()) } - async fn receive( - self, - context: &Data, - request_counter: &mut i32, - ) -> Result<(), LemmyError> { + #[tracing::instrument(skip_all)] + 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. @@ -78,9 +58,15 @@ impl ActivityHandler for Delete { } else { Some(reason) }; - receive_remove_action(&self.actor, &self.object, reason, context, request_counter).await + receive_remove_action( + &self.actor.dereference(context).await?, + self.object.id(), + reason, + context, + ) + .await } else { - receive_delete_action(&self.object, &self.actor, true, context, request_counter).await + receive_delete_action(self.object.id(), &self.actor, true, context).await } } } @@ -88,53 +74,41 @@ impl ActivityHandler for Delete { impl Delete { pub(in crate::activities::deletion) fn new( actor: &ApubPerson, - community: &ApubCommunity, - object_id: Url, + object: DeletableObjects, + to: Url, + community: Option<&Community>, summary: Option, - context: &LemmyContext, + context: &Data, ) -> Result { + let id = generate_activity_id( + DeleteType::Delete, + &context.settings().get_protocol_and_hostname(), + )?; + let cc: Option = community.map(|c| c.actor_id.clone().into()); Ok(Delete { - actor: ObjectId::new(actor.actor_id()), - to: vec![public()], - object: object_id, - cc: vec![community.actor_id()], + actor: actor.actor_id.clone().into(), + to: vec![to], + object: IdOrNestedObject::Id(object.id()), + cc: cc.into_iter().collect(), kind: DeleteType::Delete, summary, - id: generate_activity_id( - DeleteType::Delete, - &context.settings().get_protocol_and_hostname(), - )?, - unparsed: Default::default(), + id, + audience: community.map(|c| c.actor_id.clone().into()), }) } - pub(in crate::activities::deletion) async fn send( - actor: &ApubPerson, - community: &ApubCommunity, - object_id: Url, - summary: Option, - context: &LemmyContext, - ) -> Result<(), LemmyError> { - let delete = Delete::new(actor, community, object_id, summary, context)?; - let delete_id = delete.id.clone(); - - let activity = AnnouncableActivities::Delete(delete); - send_to_community(activity, &delete_id, actor, community, vec![], context).await - } } +#[tracing::instrument(skip_all)] pub(in crate::activities) async fn receive_remove_action( - actor: &ObjectId, + actor: &ApubPerson, object: &Url, reason: Option, - context: &LemmyContext, - request_counter: &mut i32, + context: &Data, ) -> Result<(), LemmyError> { - let actor = actor.dereference(context, request_counter).await?; - use UserOperationCrud::*; match DeletableObjects::read_from_db(object, context).await? { DeletableObjects::Community(community) => { if community.local { - return Err(anyhow!("Only local admin can remove community").into()); + return Err(LemmyErrorType::OnlyLocalAdminCanRemoveCommunity)?; } let form = ModRemoveCommunityForm { mod_person_id: actor.id, @@ -143,16 +117,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_removed(conn, community.id, true) - }) - .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 { @@ -161,16 +132,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_removed(conn, post.id, true) - }) - .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 { @@ -179,40 +147,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_removed(conn, comment.id, true) - }) - .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 { - async fn get_community( - &self, - context: &LemmyContext, - _request_counter: &mut i32, - ) -> Result { - let community_id = match DeletableObjects::read_from_db(&self.object, 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, - }; - let community = blocking(context.pool(), move |conn| { - Community::read(conn, community_id) - }) - .await??; - Ok(community.into()) - } -}