use crate::{
activities::{
- comment::send_websocket_message as send_comment_message,
- community::send_websocket_message as send_community_message,
- deletion::delete::DeletePostCommentOrCommunity,
- post::send_websocket_message as send_post_message,
- verify_activity,
- verify_mod_action,
- verify_person_in_community,
+ community::announce::GetCommunity,
+ deletion::{receive_delete_action, verify_delete_activity, DeletableObjects},
+ generate_activity_id,
},
- fetcher::{
- community::get_or_fetch_and_upsert_community,
- objects::get_or_fetch_and_insert_post_or_comment,
- person::get_or_fetch_and_upsert_person,
+ check_apub_id_valid,
+ fetch_local_site_data,
+ local_instance,
+ objects::{community::ApubCommunity, 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 lemmy_db_schema::{
+ source::{
+ comment::{Comment, CommentUpdateForm},
+ community::{Community, CommunityUpdateForm},
+ moderator::{
+ ModRemoveComment,
+ ModRemoveCommentForm,
+ ModRemoveCommunity,
+ ModRemoveCommunityForm,
+ ModRemovePost,
+ ModRemovePostForm,
+ },
+ post::{Post, PostUpdateForm},
},
- CommunityType,
- PostOrComment,
+ 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 activitystreams::activity::kind::UndoType;
-use lemmy_api_common::blocking;
-use lemmy_apub_lib::{verify_urls_match, ActivityCommonFields, ActivityHandler, PublicUrl};
-use lemmy_db_queries::source::{comment::Comment_, community::Community_, post::Post_};
-use lemmy_db_schema::source::{comment::Comment, community::Community, post::Post};
-use lemmy_utils::LemmyError;
-use lemmy_websocket::{LemmyContext, UserOperationCrud};
use url::Url;
-#[derive(Clone, Debug, serde::Deserialize, serde::Serialize)]
-#[serde(rename_all = "camelCase")]
-pub struct UndoDeletePostCommentOrCommunity {
- to: PublicUrl,
- object: DeletePostCommentOrCommunity,
- cc: [Url; 1],
- #[serde(rename = "type")]
- kind: UndoType,
- #[serde(flatten)]
- common: ActivityCommonFields,
-}
-
#[async_trait::async_trait(?Send)]
-impl ActivityHandler for UndoDeletePostCommentOrCommunity {
+impl ActivityHandler for UndoDelete {
+ type DataType = LemmyContext;
+ 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: &LemmyContext,
+ context: &Data<LemmyContext>,
request_counter: &mut i32,
) -> Result<(), LemmyError> {
- verify_activity(self.common())?;
+ 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)?;
self.object.verify(context, request_counter).await?;
- let object_community =
- get_or_fetch_and_upsert_community(&self.object.object, context, request_counter).await;
- // restoring a community
- if object_community.is_ok() {
- verify_mod_action(&self.common.actor, self.object.object.clone(), context).await?;
- }
- // restoring a post or comment
- else {
- verify_person_in_community(&self.common().actor, &self.cc, context, request_counter).await?;
- verify_urls_match(&self.common.actor, &self.object.common().actor)?;
- }
+ verify_delete_activity(
+ &self.object,
+ self.object.summary.is_some(),
+ context,
+ request_counter,
+ )
+ .await?;
Ok(())
}
+ #[tracing::instrument(skip_all)]
async fn receive(
- &self,
- context: &LemmyContext,
+ self,
+ context: &Data<LemmyContext>,
request_counter: &mut i32,
) -> Result<(), LemmyError> {
- let object_community =
- get_or_fetch_and_upsert_community(&self.object.object, context, request_counter).await;
- // restoring a community
- if let Ok(community) = object_community {
- if community.local {
- // repeat these checks just to be sure
- verify_person_in_community(&self.common().actor, &self.cc, context, request_counter)
- .await?;
- verify_mod_action(&self.common.actor, self.object.object.clone(), context).await?;
- let mod_ =
- get_or_fetch_and_upsert_person(&self.common.actor, context, request_counter).await?;
- community.send_undo_delete(mod_, context).await?;
- }
- let deleted_community = blocking(context.pool(), move |conn| {
- Community::update_deleted(conn, community.id, false)
- })
- .await??;
-
- send_community_message(
- deleted_community.id,
- UserOperationCrud::EditCommunity,
+ if self.object.summary.is_some() {
+ UndoDelete::receive_undo_remove_action(
+ &self
+ .actor
+ .dereference(context, local_instance(context), request_counter)
+ .await?,
+ self.object.object.id(),
context,
)
.await
+ } else {
+ receive_delete_action(
+ self.object.object.id(),
+ &self.actor,
+ false,
+ context,
+ request_counter,
+ )
+ .await
}
- // restoring a post or comment
- else {
- match get_or_fetch_and_insert_post_or_comment(&self.object.object, context, request_counter)
- .await?
- {
- PostOrComment::Post(post) => {
- let deleted_post = blocking(context.pool(), move |conn| {
- Post::update_deleted(conn, post.id, false)
- })
- .await??;
- send_post_message(deleted_post.id, UserOperationCrud::EditPost, context).await
+ }
+}
+
+impl UndoDelete {
+ #[tracing::instrument(skip_all)]
+ pub(in crate::activities::deletion) fn new(
+ actor: &ApubPerson,
+ object: DeletableObjects,
+ to: Url,
+ community: Option<&Community>,
+ summary: Option<String>,
+ context: &LemmyContext,
+ ) -> Result<UndoDelete, LemmyError> {
+ let object = Delete::new(actor, object, to.clone(), community, summary, context)?;
+
+ let id = generate_activity_id(
+ UndoType::Undo,
+ &context.settings().get_protocol_and_hostname(),
+ )?;
+ let cc: Option<Url> = community.map(|c| c.actor_id.clone().into());
+ Ok(UndoDelete {
+ actor: ObjectId::new(actor.actor_id.clone()),
+ to: vec![to],
+ object,
+ cc: cc.into_iter().collect(),
+ kind: UndoType::Undo,
+ id,
+ unparsed: Default::default(),
+ })
+ }
+
+ #[tracing::instrument(skip_all)]
+ pub(in crate::activities) async fn receive_undo_remove_action(
+ actor: &ApubPerson,
+ object: &Url,
+ context: &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",
+ ));
}
- PostOrComment::Comment(comment) => {
- let deleted_comment = blocking(context.pool(), move |conn| {
- Comment::update_deleted(conn, comment.id, false)
- })
- .await??;
- send_comment_message(
- deleted_comment.id,
- vec![],
- UserOperationCrud::EditComment,
- context,
+ let form = ModRemoveCommunityForm {
+ mod_person_id: actor.id,
+ community_id: community.id,
+ removed: Some(false),
+ reason: None,
+ 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(false)).build(),
)
- .await
- }
+ })
+ .await??;
+ send_community_ws_message(deleted_community.id, EditCommunity, None, None, context).await?;
}
+ DeletableObjects::Post(post) => {
+ let form = ModRemovePostForm {
+ mod_person_id: actor.id,
+ post_id: post.id,
+ 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(
+ conn,
+ post.id,
+ &PostUpdateForm::builder().removed(Some(false)).build(),
+ )
+ })
+ .await??;
+ send_post_ws_message(removed_post.id, EditPost, None, None, context).await?;
+ }
+ DeletableObjects::Comment(comment) => {
+ let form = ModRemoveCommentForm {
+ mod_person_id: actor.id,
+ comment_id: comment.id,
+ 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(
+ conn,
+ comment.id,
+ &CommentUpdateForm::builder().removed(Some(false)).build(),
+ )
+ })
+ .await??;
+ send_comment_ws_message_simple(removed_comment.id, EditComment, context).await?;
+ }
+ DeletableObjects::PrivateMessage(_) => unimplemented!(),
}
+ Ok(())
}
+}
- fn common(&self) -> &ActivityCommonFields {
- &self.common
+#[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
}
}
projects / lemmy.git / blobdiff