X-Git-Url: http://these/git/?a=blobdiff_plain;f=crates%2Fapi_crud%2Fsrc%2Fpost%2Fremove.rs;h=2fbd6ccffcd1811b1fd0aa91b0ba7e563bfec14a;hb=f7f6766650b9b573a72075e564aed353c0131cd7;hp=9ba29158ba862a7cfaf8d8b26b615f4d1211f6fa;hpb=a2a594b7635db2241602be56250f7d9bf992f7b9;p=lemmy.git

diff --git a/crates/api_crud/src/post/remove.rs b/crates/api_crud/src/post/remove.rs
index 9ba29158..2fbd6ccf 100644
--- a/crates/api_crud/src/post/remove.rs
+++ b/crates/api_crud/src/post/remove.rs
@@ -1,97 +1,78 @@
-use crate::PerformCrud;
-use actix_web::web::Data;
+use activitypub_federation::config::Data;
+use actix_web::web::Json;
 use lemmy_api_common::{
+  build_response::build_post_response,
+  context::LemmyContext,
   post::{PostResponse, RemovePost},
-  utils::{blocking, check_community_ban, get_local_user_view_from_jwt, is_mod_or_admin},
+  send_activity::{ActivityChannel, SendActivityData},
+  utils::{check_community_ban, is_mod_or_admin, local_user_view_from_jwt},
 };
-use lemmy_apub::activities::deletion::{send_apub_delete_in_community, DeletableObjects};
 use lemmy_db_schema::{
   source::{
-    community::Community,
     moderator::{ModRemovePost, ModRemovePostForm},
-    post::Post,
+    post::{Post, PostUpdateForm},
+    post_report::PostReport,
   },
-  traits::Crud,
+  traits::{Crud, Reportable},
 };
-use lemmy_utils::{error::LemmyError, ConnectionId};
-use lemmy_websocket::{send::send_post_ws_message, LemmyContext, UserOperationCrud};
+use lemmy_utils::error::LemmyError;
 
-#[async_trait::async_trait(?Send)]
-impl PerformCrud for RemovePost {
-  type Response = PostResponse;
+#[tracing::instrument(skip(context))]
+pub async fn remove_post(
+  data: Json<RemovePost>,
+  context: Data<LemmyContext>,
+) -> Result<Json<PostResponse>, LemmyError> {
+  let local_user_view = local_user_view_from_jwt(&data.auth, &context).await?;
 
-  #[tracing::instrument(skip(context, websocket_id))]
-  async fn perform(
-    &self,
-    context: &Data<LemmyContext>,
-    websocket_id: Option<ConnectionId>,
-  ) -> Result<PostResponse, LemmyError> {
-    let data: &RemovePost = self;
-    let local_user_view =
-      get_local_user_view_from_jwt(&data.auth, context.pool(), context.secret()).await?;
+  let post_id = data.post_id;
+  let orig_post = Post::read(&mut context.pool(), post_id).await?;
 
-    let post_id = data.post_id;
-    let orig_post = blocking(context.pool(), move |conn| Post::read(conn, post_id)).await??;
+  check_community_ban(
+    local_user_view.person.id,
+    orig_post.community_id,
+    &mut context.pool(),
+  )
+  .await?;
 
-    check_community_ban(
-      local_user_view.person.id,
-      orig_post.community_id,
-      context.pool(),
-    )
-    .await?;
-
-    // Verify that only the mods can remove
-    is_mod_or_admin(
-      context.pool(),
-      local_user_view.person.id,
-      orig_post.community_id,
-    )
-    .await?;
-
-    // Update the post
-    let post_id = data.post_id;
-    let removed = data.removed;
-    let updated_post = blocking(context.pool(), move |conn| {
-      Post::update_removed(conn, post_id, removed)
-    })
-    .await??;
+  // Verify that only the mods can remove
+  is_mod_or_admin(
+    &mut context.pool(),
+    local_user_view.person.id,
+    orig_post.community_id,
+  )
+  .await?;
 
-    // Mod tables
-    let form = ModRemovePostForm {
-      mod_person_id: local_user_view.person.id,
-      post_id: data.post_id,
+  // Update the post
+  let post_id = data.post_id;
+  let removed = data.removed;
+  let post = Post::update(
+    &mut context.pool(),
+    post_id,
+    &PostUpdateForm {
       removed: Some(removed),
-      reason: data.reason.to_owned(),
-    };
-    blocking(context.pool(), move |conn| {
-      ModRemovePost::create(conn, &form)
-    })
-    .await??;
+      ..Default::default()
+    },
+  )
+  .await?;
 
-    let res = send_post_ws_message(
-      data.post_id,
-      UserOperationCrud::RemovePost,
-      websocket_id,
-      Some(local_user_view.person.id),
-      context,
-    )
+  PostReport::resolve_all_for_object(&mut context.pool(), post_id, local_user_view.person.id)
     .await?;
 
-    // apub updates
-    let community = blocking(context.pool(), move |conn| {
-      Community::read(conn, orig_post.community_id)
-    })
-    .await??;
-    let deletable = DeletableObjects::Post(Box::new(updated_post.into()));
-    send_apub_delete_in_community(
-      local_user_view.person,
-      community,
-      deletable,
-      data.reason.clone().or_else(|| Some("".to_string())),
-      removed,
-      context,
-    )
-    .await?;
-    Ok(res)
-  }
+  // Mod tables
+  let form = ModRemovePostForm {
+    mod_person_id: local_user_view.person.id,
+    post_id: data.post_id,
+    removed: Some(removed),
+    reason: data.reason.clone(),
+  };
+  ModRemovePost::create(&mut context.pool(), &form).await?;
+
+  let person_id = local_user_view.person.id;
+  ActivityChannel::submit_activity(
+    SendActivityData::RemovePost(post, local_user_view.person, data.0),
+    &context,
+  )
+  .await?;
+
+  build_post_response(&context, orig_post.community_id, person_id, post_id).await
 }