use crate::{
activities::{
- community::announce::GetCommunity,
deletion::{receive_delete_action, verify_delete_activity, DeletableObjects},
generate_activity_id,
},
- local_instance,
- objects::{community::ApubCommunity, person::ApubPerson},
+ insert_received_activity,
+ objects::person::ApubPerson,
protocol::activities::deletion::{delete::Delete, undo_delete::UndoDelete},
};
-use activitypub_federation::{core::object_id::ObjectId, data::Data, traits::ActivityHandler};
-use activitystreams_kinds::activity::UndoType;
-use lemmy_api_common::utils::blocking;
+use activitypub_federation::{config::Data, kinds::activity::UndoType, 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,
ModRemovePost,
ModRemovePostForm,
},
- post::Post,
+ post::{Post, PostUpdateForm},
},
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 UndoDelete {
type DataType = LemmyContext;
type Error = LemmyError;
self.actor.inner()
}
- #[tracing::instrument(skip_all)]
- async fn verify(
- &self,
- context: &Data<LemmyContext>,
- request_counter: &mut i32,
- ) -> Result<(), LemmyError> {
- self.object.verify(context, request_counter).await?;
- verify_delete_activity(
- &self.object,
- self.object.summary.is_some(),
- context,
- request_counter,
- )
- .await?;
+ async fn verify(&self, data: &Data<Self::DataType>) -> Result<(), Self::Error> {
+ insert_received_activity(&self.id, data).await?;
+ self.object.verify(data).await?;
+ verify_delete_activity(&self.object, self.object.summary.is_some(), data).await?;
Ok(())
}
#[tracing::instrument(skip_all)]
- async fn receive(
- self,
- context: &Data<LemmyContext>,
- request_counter: &mut i32,
- ) -> Result<(), LemmyError> {
+ async fn receive(self, context: &Data<LemmyContext>) -> Result<(), LemmyError> {
if self.object.summary.is_some() {
UndoDelete::receive_undo_remove_action(
- &self
- .actor
- .dereference(context, local_instance(context), request_counter)
- .await?,
+ &self.actor.dereference(context).await?,
self.object.object.id(),
context,
)
.await
} else {
- receive_delete_action(
- self.object.object.id(),
- &self.actor,
- false,
- context,
- request_counter,
- )
- .await
+ receive_delete_action(self.object.object.id(), &self.actor, false, context).await
}
}
}
to: Url,
community: Option<&Community>,
summary: Option<String>,
- context: &LemmyContext,
+ context: &Data<LemmyContext>,
) -> Result<UndoDelete, LemmyError> {
let object = Delete::new(actor, object, to.clone(), community, summary, context)?;
)?;
let cc: Option<Url> = community.map(|c| c.actor_id.clone().into());
Ok(UndoDelete {
- actor: ObjectId::new(actor.actor_id.clone()),
+ actor: actor.actor_id.clone().into(),
to: vec![to],
object,
cc: cc.into_iter().collect(),
kind: UndoType::Undo,
id,
- unparsed: Default::default(),
+ audience: community.map(|c| c.actor_id.clone().into()),
})
}
pub(in crate::activities) async fn receive_undo_remove_action(
actor: &ApubPerson,
object: &Url,
- context: &LemmyContext,
+ context: &Data<LemmyContext>,
) -> Result<(), LemmyError> {
- use UserOperationCrud::*;
match DeletableObjects::read_from_db(object, context).await? {
DeletableObjects::Community(community) => {
if community.local {
- return Err(LemmyError::from_message(
- "Only local admin can restore community",
- ));
+ return Err(LemmyErrorType::OnlyLocalAdminCanRestoreCommunity)?;
}
let form = ModRemoveCommunityForm {
mod_person_id: actor.id,
reason: None,
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, false)
- })
- .await??;
- send_community_ws_message(deleted_community.id, EditCommunity, None, None, context).await?;
+ ModRemoveCommunity::create(&mut context.pool(), &form).await?;
+ Community::update(
+ &mut context.pool(),
+ community.id,
+ &CommunityUpdateForm::builder().removed(Some(false)).build(),
+ )
+ .await?;
}
DeletableObjects::Post(post) => {
let form = ModRemovePostForm {
removed: Some(false),
reason: None,
};
- blocking(context.pool(), move |conn| {
- ModRemovePost::create(conn, &form)
- })
- .await??;
- let removed_post = blocking(context.pool(), move |conn| {
- Post::update_removed(conn, post.id, false)
- })
- .await??;
- send_post_ws_message(removed_post.id, EditPost, None, None, context).await?;
+ ModRemovePost::create(&mut context.pool(), &form).await?;
+ Post::update(
+ &mut context.pool(),
+ post.id,
+ &PostUpdateForm::builder().removed(Some(false)).build(),
+ )
+ .await?;
}
DeletableObjects::Comment(comment) => {
let form = ModRemoveCommentForm {
removed: Some(false),
reason: None,
};
- blocking(context.pool(), move |conn| {
- ModRemoveComment::create(conn, &form)
- })
- .await??;
- let removed_comment = blocking(context.pool(), move |conn| {
- Comment::update_removed(conn, comment.id, false)
- })
- .await??;
- send_comment_ws_message_simple(removed_comment.id, EditComment, context).await?;
+ ModRemoveComment::create(&mut context.pool(), &form).await?;
+ Comment::update(
+ &mut context.pool(),
+ comment.id,
+ &CommentUpdateForm::builder().removed(Some(false)).build(),
+ )
+ .await?;
}
DeletableObjects::PrivateMessage(_) => unimplemented!(),
}
Ok(())
}
}
-
-#[async_trait::async_trait(?Send)]
-impl GetCommunity for UndoDelete {
- #[tracing::instrument(skip_all)]
- async fn get_community(
- &self,
- context: &LemmyContext,
- request_counter: &mut i32,
- ) -> Result<ApubCommunity, LemmyError> {
- self.object.get_community(context, request_counter).await
- }
-}