-use crate::PerformCrud;
-use actix_web::web::Data;
+use activitypub_federation::config::Data;
+use actix_web::web::Json;
use lemmy_api_common::{
- blocking,
- check_community_ban,
- comment::*,
- get_local_user_view_from_jwt,
- is_mod_or_admin,
+ build_response::{build_comment_response, send_local_notifs},
+ comment::{CommentResponse, DeleteComment},
+ context::LemmyContext,
+ send_activity::{ActivityChannel, SendActivityData},
+ utils::{check_community_ban, local_user_view_from_jwt},
};
-use lemmy_apub::activities::deletion::{send_apub_delete, send_apub_remove};
use lemmy_db_schema::{
source::{
- comment::Comment,
- community::Community,
- moderator::{ModRemoveComment, ModRemoveCommentForm},
+ comment::{Comment, CommentUpdateForm},
post::Post,
},
traits::Crud,
};
-use lemmy_db_views::comment_view::CommentView;
-use lemmy_utils::{ApiError, ConnectionId, LemmyError};
-use lemmy_websocket::{
- send::{send_comment_ws_message, send_local_notifs},
- LemmyContext,
- UserOperationCrud,
-};
-
-#[async_trait::async_trait(?Send)]
-impl PerformCrud for DeleteComment {
- type Response = CommentResponse;
-
- async fn perform(
- &self,
- context: &Data<LemmyContext>,
- websocket_id: Option<ConnectionId>,
- ) -> Result<CommentResponse, LemmyError> {
- let data: &DeleteComment = self;
- let local_user_view =
- get_local_user_view_from_jwt(&data.auth, context.pool(), context.secret()).await?;
-
- let comment_id = data.comment_id;
- let orig_comment = blocking(context.pool(), move |conn| {
- CommentView::read(conn, comment_id, None)
- })
- .await??;
-
- // Dont delete it if its already been deleted.
- if orig_comment.comment.deleted == data.deleted {
- return Err(ApiError::err_plain("couldnt_update_comment").into());
- }
-
- check_community_ban(
- local_user_view.person.id,
- orig_comment.community.id,
- context.pool(),
- )
- .await?;
-
- // Verify that only the creator can delete
- if local_user_view.person.id != orig_comment.creator.id {
- return Err(ApiError::err_plain("no_comment_edit_allowed").into());
- }
-
- // Do the delete
- let deleted = data.deleted;
- let updated_comment = blocking(context.pool(), move |conn| {
- Comment::update_deleted(conn, comment_id, deleted)
- })
- .await?
- .map_err(|e| ApiError::err("couldnt_update_comment", e))?;
-
- // Send the apub message
- let community = blocking(context.pool(), move |conn| {
- Community::read(conn, orig_comment.post.community_id)
- })
- .await??;
- send_apub_delete(
- &local_user_view.person.clone().into(),
- &community.clone().into(),
- updated_comment.ap_id.clone().into(),
- deleted,
- context,
- )
- .await?;
-
- let post_id = updated_comment.post_id;
- let post = blocking(context.pool(), move |conn| Post::read(conn, post_id)).await??;
- let recipient_ids = send_local_notifs(
- vec![],
- &updated_comment,
- &local_user_view.person,
- &post,
- false,
- context,
- )
- .await?;
-
- send_comment_ws_message(
- data.comment_id,
- UserOperationCrud::DeleteComment,
- websocket_id,
- None, // TODO a comment delete might clear forms?
- Some(local_user_view.person.id),
- recipient_ids,
- context,
- )
- .await
+use lemmy_db_views::structs::CommentView;
+use lemmy_utils::error::{LemmyError, LemmyErrorExt, LemmyErrorType};
+
+#[tracing::instrument(skip(context))]
+pub async fn delete_comment(
+ data: Json<DeleteComment>,
+ context: Data<LemmyContext>,
+) -> Result<Json<CommentResponse>, LemmyError> {
+ let local_user_view = local_user_view_from_jwt(&data.auth, &context).await?;
+
+ let comment_id = data.comment_id;
+ let orig_comment = CommentView::read(&mut context.pool(), comment_id, None).await?;
+
+ // Dont delete it if its already been deleted.
+ if orig_comment.comment.deleted == data.deleted {
+ return Err(LemmyErrorType::CouldntUpdateComment)?;
}
-}
-
-#[async_trait::async_trait(?Send)]
-impl PerformCrud for RemoveComment {
- type Response = CommentResponse;
-
- async fn perform(
- &self,
- context: &Data<LemmyContext>,
- websocket_id: Option<ConnectionId>,
- ) -> Result<CommentResponse, LemmyError> {
- let data: &RemoveComment = self;
- let local_user_view =
- get_local_user_view_from_jwt(&data.auth, context.pool(), context.secret()).await?;
- let comment_id = data.comment_id;
- let orig_comment = blocking(context.pool(), move |conn| {
- CommentView::read(conn, comment_id, None)
- })
- .await??;
-
- check_community_ban(
- local_user_view.person.id,
- orig_comment.community.id,
- context.pool(),
- )
- .await?;
-
- // Verify that only a mod or admin can remove
- is_mod_or_admin(
- context.pool(),
- local_user_view.person.id,
- orig_comment.community.id,
- )
- .await?;
+ check_community_ban(
+ local_user_view.person.id,
+ orig_comment.community.id,
+ &mut context.pool(),
+ )
+ .await?;
- // Do the remove
- let removed = data.removed;
- let updated_comment = blocking(context.pool(), move |conn| {
- Comment::update_removed(conn, comment_id, removed)
- })
- .await?
- .map_err(|e| ApiError::err("couldnt_update_comment", e))?;
-
- // Mod tables
- let form = ModRemoveCommentForm {
- mod_person_id: local_user_view.person.id,
- comment_id: data.comment_id,
- removed: Some(removed),
- reason: data.reason.to_owned(),
- };
- blocking(context.pool(), move |conn| {
- ModRemoveComment::create(conn, &form)
- })
- .await??;
-
- // Send the apub message
- let community = blocking(context.pool(), move |conn| {
- Community::read(conn, orig_comment.post.community_id)
- })
- .await??;
- send_apub_remove(
- &local_user_view.person.clone().into(),
- &community.into(),
- updated_comment.ap_id.clone().into(),
- data.reason.clone().unwrap_or_else(|| "".to_string()),
- removed,
- context,
- )
- .await?;
-
- let post_id = updated_comment.post_id;
- let post = blocking(context.pool(), move |conn| Post::read(conn, post_id)).await??;
- let recipient_ids = send_local_notifs(
- vec![],
- &updated_comment,
- &local_user_view.person.clone(),
- &post,
- false,
- context,
- )
- .await?;
+ // Verify that only the creator can delete
+ if local_user_view.person.id != orig_comment.creator.id {
+ return Err(LemmyErrorType::NoCommentEditAllowed)?;
+ }
- send_comment_ws_message(
- data.comment_id,
- UserOperationCrud::RemoveComment,
- websocket_id,
- None, // TODO maybe this might clear other forms
- Some(local_user_view.person.id),
+ // Do the delete
+ let deleted = data.deleted;
+ let updated_comment = Comment::update(
+ &mut context.pool(),
+ comment_id,
+ &CommentUpdateForm::builder().deleted(Some(deleted)).build(),
+ )
+ .await
+ .with_lemmy_type(LemmyErrorType::CouldntUpdateComment)?;
+
+ let post_id = updated_comment.post_id;
+ let post = Post::read(&mut context.pool(), post_id).await?;
+ let recipient_ids = send_local_notifs(
+ vec![],
+ &updated_comment,
+ &local_user_view.person,
+ &post,
+ false,
+ &context,
+ )
+ .await?;
+ let updated_comment_id = updated_comment.id;
+
+ ActivityChannel::submit_activity(
+ SendActivityData::DeleteComment(
+ updated_comment,
+ local_user_view.person.clone(),
+ orig_comment.community,
+ ),
+ &context,
+ )
+ .await?;
+
+ Ok(Json(
+ build_comment_response(
+ &context,
+ updated_comment_id,
+ Some(local_user_view),
+ None,
recipient_ids,
- context,
)
- .await
- }
+ .await?,
+ ))
}
projects / lemmy.git / blobdiff