use crate::{
activities::{
- community::{announce::GetCommunity, send_activity_in_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_kinds::{activity::DeleteType, public};
-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,
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;
+ 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<LemmyContext>,
- request_counter: &mut i32,
- ) -> Result<(), LemmyError> {
- verify_is_public(&self.to, &[])?;
- verify_activity(&self.id, self.actor.inner(), &context.settings())?;
- let community = self.get_community(context, request_counter).await?;
- verify_delete_activity(
- &self.object.id,
- &self.actor,
- &community,
- self.summary.is_some(),
- context,
- request_counter,
- )
- .await?;
+ async fn verify(&self, context: &Data<Self::DataType>) -> 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<LemmyContext>,
- request_counter: &mut i32,
- ) -> Result<(), LemmyError> {
+ async fn receive(self, context: &Data<LemmyContext>) -> 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.
Some(reason)
};
receive_remove_action(
- &self.actor,
- &self.object.id,
+ &self.actor.dereference(context).await?,
+ self.object.id(),
reason,
context,
- request_counter,
)
.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
}
}
}
pub(in crate::activities::deletion) fn new(
actor: &ApubPerson,
object: DeletableObjects,
+ to: Url,
+ community: Option<&Community>,
summary: Option<String>,
- context: &LemmyContext,
+ 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: ObjectId::new(actor.actor_id()),
- to: vec![public()],
- object: object.to_tombstone()?,
+ 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()),
})
}
-
- #[tracing::instrument(skip_all)]
- pub(in crate::activities::deletion) async fn send(
- actor: &ApubPerson,
- community: &ApubCommunity,
- object: DeletableObjects,
- summary: Option<String>,
- context: &LemmyContext,
- ) -> Result<(), LemmyError> {
- let delete = Delete::new(actor, object, summary, context)?;
- let delete_id = delete.id.clone();
-
- let activity = AnnouncableActivities::Delete(delete);
- send_activity_in_community(activity, &delete_id, actor, community, vec![], context).await
- }
}
#[tracing::instrument(skip_all)]
pub(in crate::activities) async fn receive_remove_action(
- actor: &ObjectId<ApubPerson>,
+ actor: &ApubPerson,
object: &Url,
reason: Option<String>,
- context: &LemmyContext,
- request_counter: &mut i32,
+ context: &Data<LemmyContext>,
) -> Result<(), LemmyError> {
- let actor = actor
- .dereference(context, context.client(), request_counter)
- .await?;
- 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 remove community",
- ));
+ 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(())
}
-
-#[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<ApubCommunity, LemmyError> {
- 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,
- };
- let community = blocking(context.pool(), move |conn| {
- Community::read(conn, community_id)
- })
- .await??;
- Ok(community.into())
- }
-}
projects / lemmy.git / blobdiff