deletion::{receive_delete_action, verify_delete_activity, DeletableObjects},
generate_activity_id,
},
+ check_apub_id_valid,
+ fetch_local_site_data,
local_instance,
objects::{community::ApubCommunity, person::ApubPerson},
protocol::activities::deletion::{delete::Delete, undo_delete::UndoDelete},
use lemmy_api_common::utils::blocking;
use lemmy_db_schema::{
source::{
- comment::Comment,
- community::Community,
+ comment::{Comment, CommentUpdateForm},
+ community::{Community, CommunityUpdateForm},
moderator::{
ModRemoveComment,
ModRemoveCommentForm,
ModRemovePost,
ModRemovePostForm,
},
- person::Person,
- post::Post,
+ post::{Post, PostUpdateForm},
},
traits::Crud,
};
context: &Data<LemmyContext>,
request_counter: &mut i32,
) -> Result<(), LemmyError> {
+ 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?;
verify_delete_activity(
&self.object,
UndoDelete::receive_undo_remove_action(
&self
.actor
- .dereference::<LemmyError>(context, local_instance(context), request_counter)
+ .dereference(context, local_instance(context), request_counter)
.await?,
self.object.object.id(),
context,
impl UndoDelete {
#[tracing::instrument(skip_all)]
pub(in crate::activities::deletion) fn new(
- actor: &Person,
+ actor: &ApubPerson,
object: DeletableObjects,
to: Url,
community: Option<&Community>,
})
.await??;
let deleted_community = blocking(context.pool(), move |conn| {
- Community::update_removed(conn, community.id, false)
+ Community::update(
+ conn,
+ community.id,
+ &CommunityUpdateForm::builder().removed(Some(false)).build(),
+ )
})
.await??;
send_community_ws_message(deleted_community.id, EditCommunity, None, None, context).await?;
})
.await??;
let removed_post = blocking(context.pool(), move |conn| {
- Post::update_removed(conn, post.id, false)
+ Post::update(
+ conn,
+ post.id,
+ &PostUpdateForm::builder().removed(Some(false)).build(),
+ )
})
.await??;
send_post_ws_message(removed_post.id, EditPost, None, None, context).await?;
})
.await??;
let removed_comment = blocking(context.pool(), move |conn| {
- Comment::update_removed(conn, comment.id, false)
+ Comment::update(
+ conn,
+ comment.id,
+ &CommentUpdateForm::builder().removed(Some(false)).build(),
+ )
})
.await??;
send_comment_ws_message_simple(removed_comment.id, EditComment, context).await?;