use crate::{
activities::{
- community::announce::AnnouncableActivities,
- deletion::{
- receive_delete_action,
- verify_delete_activity,
- DeletableObjects,
- WebsocketMessages,
- },
+ deletion::{receive_delete_action, verify_delete_activity, DeletableObjects},
generate_activity_id,
- verify_activity,
},
- activity_queue::send_to_community_new,
- extensions::context::lemmy_context,
- fetcher::person::get_or_fetch_and_upsert_person,
- ActorType,
-};
-use activitystreams::activity::kind::DeleteType;
-use anyhow::anyhow;
-use lemmy_api_common::blocking;
-use lemmy_apub_lib::{values::PublicUrl, ActivityCommonFields, ActivityHandler};
-use lemmy_db_queries::{
- source::{comment::Comment_, community::Community_, post::Post_},
- Crud,
+ insert_activity,
+ objects::person::ApubPerson,
+ protocol::{activities::deletion::delete::Delete, IdOrNestedObject},
};
-use lemmy_db_schema::source::{
- comment::Comment,
- community::Community,
- moderator::{
- ModRemoveComment,
- ModRemoveCommentForm,
- ModRemoveCommunity,
- ModRemoveCommunityForm,
- ModRemovePost,
- ModRemovePostForm,
+use activitypub_federation::{config::Data, kinds::activity::DeleteType, traits::ActivityHandler};
+use lemmy_api_common::context::LemmyContext;
+use lemmy_db_schema::{
+ source::{
+ comment::{Comment, CommentUpdateForm},
+ community::{Community, CommunityUpdateForm},
+ moderator::{
+ ModRemoveComment,
+ ModRemoveCommentForm,
+ ModRemoveCommunity,
+ ModRemoveCommunityForm,
+ ModRemovePost,
+ ModRemovePostForm,
+ },
+ post::{Post, PostUpdateForm},
},
- person::Person,
- post::Post,
-};
-use lemmy_utils::LemmyError;
-use lemmy_websocket::{
- send::{send_comment_ws_message_simple, send_community_ws_message, send_post_ws_message},
- LemmyContext,
- UserOperationCrud,
+ traits::Crud,
};
+use lemmy_utils::error::{LemmyError, LemmyErrorType};
use url::Url;
-/// This is very confusing, because there are four distinct cases to handle:
-/// - user deletes their post
-/// - user deletes their comment
-/// - remote community mod deletes local community
-/// - remote community deletes itself (triggered by a mod)
-///
-/// TODO: we should probably change how community deletions work to simplify this. Probably by
-/// wrapping it in an announce just like other activities, instead of having the community send it.
-#[derive(Clone, Debug, serde::Deserialize, serde::Serialize)]
-#[serde(rename_all = "camelCase")]
-pub struct Delete {
- pub(in crate::activities::deletion) to: PublicUrl,
- pub(in crate::activities::deletion) object: Url,
- pub(in crate::activities::deletion) cc: [Url; 1],
- #[serde(rename = "type")]
- pub(in crate::activities::deletion) kind: DeleteType,
- /// If summary is present, this is a mod action (Remove in Lemmy terms). Otherwise, its a user
- /// deleting their own content.
- pub(in crate::activities::deletion) summary: Option<String>,
- #[serde(flatten)]
- pub(in crate::activities::deletion) common: ActivityCommonFields,
-}
-
-#[async_trait::async_trait(?Send)]
+#[async_trait::async_trait]
impl ActivityHandler for Delete {
- async fn verify(
- &self,
- context: &LemmyContext,
- request_counter: &mut i32,
- ) -> Result<(), LemmyError> {
- verify_activity(self.common())?;
- verify_delete_activity(
- &self.object,
- &self.cc[0],
- &self.common,
- self.summary.is_some(),
- context,
- request_counter,
- )
- .await?;
+ 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: &Data<Self::DataType>) -> Result<(), LemmyError> {
+ verify_delete_activity(self, self.summary.is_some(), context).await?;
Ok(())
}
- async fn receive(
- self,
- context: &LemmyContext,
- request_counter: &mut i32,
- ) -> Result<(), LemmyError> {
+ #[tracing::instrument(skip_all)]
+ async fn receive(self, context: &Data<LemmyContext>) -> Result<(), LemmyError> {
+ insert_activity(&self.id, &self, false, false, context).await?;
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.
Some(reason)
};
receive_remove_action(
- &self.common.actor,
- &self.object,
+ &self.actor.dereference(context).await?,
+ self.object.id(),
reason,
context,
- request_counter,
)
.await
} else {
- receive_delete_action(
- &self.object,
- &self.common.actor,
- WebsocketMessages {
- community: UserOperationCrud::DeleteCommunity,
- post: UserOperationCrud::DeletePost,
- comment: UserOperationCrud::DeleteComment,
- },
- true,
- context,
- request_counter,
- )
- .await
+ receive_delete_action(self.object.id(), &self.actor, true, context).await
}
}
-
- fn common(&self) -> &ActivityCommonFields {
- &self.common
- }
}
impl Delete {
- pub(in crate::activities::deletion) async fn send(
- actor: &Person,
- community: &Community,
- object_id: Url,
+ pub(in crate::activities::deletion) fn new(
+ actor: &ApubPerson,
+ object: DeletableObjects,
+ to: Url,
+ community: Option<&Community>,
summary: Option<String>,
- context: &LemmyContext,
- ) -> Result<(), LemmyError> {
- let id = generate_activity_id(DeleteType::Delete)?;
- let delete = Delete {
- to: PublicUrl::Public,
- object: object_id,
- cc: [community.actor_id()],
+ context: &Data<LemmyContext>,
+ ) -> Result<Delete, LemmyError> {
+ let id = generate_activity_id(
+ DeleteType::Delete,
+ &context.settings().get_protocol_and_hostname(),
+ )?;
+ let cc: Option<Url> = community.map(|c| c.actor_id.clone().into());
+ Ok(Delete {
+ actor: actor.actor_id.clone().into(),
+ to: vec![to],
+ object: IdOrNestedObject::Id(object.id()),
+ cc: cc.into_iter().collect(),
kind: DeleteType::Delete,
summary,
- common: ActivityCommonFields {
- context: lemmy_context(),
- id: id.clone(),
- actor: actor.actor_id(),
- unparsed: Default::default(),
- },
- };
-
- let activity = AnnouncableActivities::Delete(delete);
- send_to_community_new(activity, &id, actor, community, vec![], context).await
+ id,
+ audience: community.map(|c| c.actor_id.clone().into()),
+ })
}
}
+#[tracing::instrument(skip_all)]
pub(in crate::activities) async fn receive_remove_action(
- actor: &Url,
+ actor: &ApubPerson,
object: &Url,
reason: Option<String>,
- context: &LemmyContext,
- request_counter: &mut i32,
+ context: &Data<LemmyContext>,
) -> Result<(), LemmyError> {
- let actor = get_or_fetch_and_upsert_person(actor, 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,
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 {
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 {
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(())
}