X-Git-Url: http://these/git/?a=blobdiff_plain;f=crates%2Fapi_crud%2Fsrc%2Fprivate_message%2Fcreate.rs;h=3b1a625f63b4284a9d0b3223b77c997f664014d5;hb=3471f3533cb724b2cf6953d563aadfcc9f66c1d2;hp=9eeea66d8e98ca9edff620d5772834af60517d56;hpb=235cc8b22897bfb3e71ba3dbd725d36863fea8ba;p=lemmy.git

diff --git a/crates/api_crud/src/private_message/create.rs b/crates/api_crud/src/private_message/create.rs
index 9eeea66d..3b1a625f 100644
--- a/crates/api_crud/src/private_message/create.rs
+++ b/crates/api_crud/src/private_message/create.rs
@@ -1,24 +1,19 @@
 use crate::PerformCrud;
 use actix_web::web::Data;
 use lemmy_api_common::{
+  context::LemmyContext,
   private_message::{CreatePrivateMessage, PrivateMessageResponse},
   utils::{
-    blocking,
     check_person_block,
+    generate_local_apub_endpoint,
     get_interface_language,
-    get_local_user_view_from_jwt,
     local_site_to_slur_regex,
+    local_user_view_from_jwt,
+    sanitize_html,
     send_email_to_user,
+    EndpointType,
   },
 };
-use lemmy_apub::{
-  generate_local_apub_endpoint,
-  protocol::activities::{
-    create_or_update::private_message::CreateOrUpdatePrivateMessage,
-    CreateOrUpdateType,
-  },
-  EndpointType,
-};
 use lemmy_db_schema::{
   source::{
     local_site::LocalSite,
@@ -26,111 +21,84 @@ use lemmy_db_schema::{
   },
   traits::Crud,
 };
-use lemmy_db_views::structs::LocalUserView;
-use lemmy_utils::{error::LemmyError, utils::remove_slurs, ConnectionId};
-use lemmy_websocket::{send::send_pm_ws_message, LemmyContext, UserOperationCrud};
+use lemmy_db_views::structs::{LocalUserView, PrivateMessageView};
+use lemmy_utils::{
+  error::{LemmyError, LemmyErrorExt, LemmyErrorType},
+  utils::{slurs::remove_slurs, validation::is_valid_body_field},
+};
 
 #[async_trait::async_trait(?Send)]
 impl PerformCrud for CreatePrivateMessage {
   type Response = PrivateMessageResponse;
 
-  #[tracing::instrument(skip(self, context, websocket_id))]
+  #[tracing::instrument(skip(self, context))]
   async fn perform(
     &self,
     context: &Data<LemmyContext>,
-    websocket_id: Option<ConnectionId>,
   ) -> Result<PrivateMessageResponse, LemmyError> {
     let data: &CreatePrivateMessage = self;
-    let local_user_view =
-      get_local_user_view_from_jwt(&data.auth, context.pool(), context.secret()).await?;
-    let local_site = blocking(context.pool(), LocalSite::read).await??;
+    let local_user_view = local_user_view_from_jwt(&data.auth, context).await?;
+    let local_site = LocalSite::read(&mut context.pool()).await?;
 
-    let content_slurs_removed = remove_slurs(
-      &data.content.to_owned(),
-      &local_site_to_slur_regex(&local_site),
-    );
+    let content = sanitize_html(&data.content);
+    let content = remove_slurs(&content, &local_site_to_slur_regex(&local_site));
+    is_valid_body_field(&Some(content.clone()), false)?;
 
-    check_person_block(local_user_view.person.id, data.recipient_id, context.pool()).await?;
+    check_person_block(
+      local_user_view.person.id,
+      data.recipient_id,
+      &mut context.pool(),
+    )
+    .await?;
 
     let private_message_form = PrivateMessageInsertForm::builder()
-      .content(content_slurs_removed.to_owned())
+      .content(content.clone())
       .creator_id(local_user_view.person.id)
       .recipient_id(data.recipient_id)
       .build();
 
-    let inserted_private_message = match blocking(context.pool(), move |conn| {
-      PrivateMessage::create(conn, &private_message_form)
-    })
-    .await?
-    {
-      Ok(private_message) => private_message,
-      Err(e) => {
-        return Err(LemmyError::from_error_message(
-          e,
-          "couldnt_create_private_message",
-        ));
-      }
-    };
+    let inserted_private_message =
+      PrivateMessage::create(&mut context.pool(), &private_message_form)
+        .await
+        .with_lemmy_type(LemmyErrorType::CouldntCreatePrivateMessage)?;
 
     let inserted_private_message_id = inserted_private_message.id;
     let protocol_and_hostname = context.settings().get_protocol_and_hostname();
-    let updated_private_message = blocking(
-      context.pool(),
-      move |conn| -> Result<PrivateMessage, LemmyError> {
-        let apub_id = generate_local_apub_endpoint(
-          EndpointType::PrivateMessage,
-          &inserted_private_message_id.to_string(),
-          &protocol_and_hostname,
-        )?;
-        Ok(PrivateMessage::update(
-          conn,
-          inserted_private_message.id,
-          &PrivateMessageUpdateForm::builder()
-            .ap_id(Some(apub_id))
-            .build(),
-        )?)
-      },
-    )
-    .await?
-    .map_err(|e| e.with_message("couldnt_create_private_message"))?;
-
-    CreateOrUpdatePrivateMessage::send(
-      updated_private_message.into(),
-      &local_user_view.person.into(),
-      CreateOrUpdateType::Create,
-      context,
-    )
-    .await?;
-
-    let res = send_pm_ws_message(
+    let apub_id = generate_local_apub_endpoint(
+      EndpointType::PrivateMessage,
+      &inserted_private_message_id.to_string(),
+      &protocol_and_hostname,
+    )?;
+    PrivateMessage::update(
+      &mut context.pool(),
       inserted_private_message.id,
-      UserOperationCrud::CreatePrivateMessage,
-      websocket_id,
-      context,
+      &PrivateMessageUpdateForm::builder()
+        .ap_id(Some(apub_id))
+        .build(),
     )
-    .await?;
+    .await
+    .with_lemmy_type(LemmyErrorType::CouldntCreatePrivateMessage)?;
+
+    let view = PrivateMessageView::read(&mut context.pool(), inserted_private_message.id).await?;
 
     // Send email to the local recipient, if one exists
-    if res.private_message_view.recipient.local {
+    if view.recipient.local {
       let recipient_id = data.recipient_id;
-      let local_recipient = blocking(context.pool(), move |conn| {
-        LocalUserView::read_person(conn, recipient_id)
-      })
-      .await??;
+      let local_recipient = LocalUserView::read_person(&mut context.pool(), recipient_id).await?;
       let lang = get_interface_language(&local_recipient);
       let inbox_link = format!("{}/inbox", context.settings().get_protocol_and_hostname());
+      let sender_name = &local_user_view.person.name;
       send_email_to_user(
         &local_recipient,
-        &lang.notification_private_message_subject(&local_recipient.person.name),
-        &lang.notification_private_message_body(
-          &inbox_link,
-          &content_slurs_removed,
-          &local_recipient.person.name,
-        ),
+        &lang.notification_private_message_subject(sender_name),
+        &lang.notification_private_message_body(inbox_link, &content, sender_name),
         context.settings(),
-      );
+      )
+      .await;
     }
 
-    Ok(res)
+    Ok(PrivateMessageResponse {
+      private_message_view: view,
+    })
   }
 }