use crate::PerformCrud;
use actix_web::web::Data;
use lemmy_api_common::{
- blocking,
- get_local_user_view_from_jwt,
- person::{EditPrivateMessage, PrivateMessageResponse},
+ private_message::{EditPrivateMessage, PrivateMessageResponse},
+ utils::{blocking, get_local_user_view_from_jwt},
};
-use lemmy_apub::ApubObjectType;
-use lemmy_db_queries::{source::private_message::PrivateMessage_, Crud, DeleteableOrRemoveable};
-use lemmy_db_schema::source::private_message::PrivateMessage;
-use lemmy_db_views::{local_user_view::LocalUserView, private_message_view::PrivateMessageView};
-use lemmy_utils::{utils::remove_slurs, ApiError, ConnectionId, LemmyError};
-use lemmy_websocket::{messages::SendUserRoomMessage, LemmyContext, UserOperationCrud};
+use lemmy_apub::protocol::activities::{
+ create_or_update::private_message::CreateOrUpdatePrivateMessage,
+ CreateOrUpdateType,
+};
+use lemmy_db_schema::{source::private_message::PrivateMessage, traits::Crud};
+use lemmy_utils::{error::LemmyError, utils::remove_slurs, ConnectionId};
+use lemmy_websocket::{send::send_pm_ws_message, LemmyContext, UserOperationCrud};
#[async_trait::async_trait(?Send)]
impl PerformCrud for EditPrivateMessage {
type Response = PrivateMessageResponse;
+ #[tracing::instrument(skip(self, context, websocket_id))]
async fn perform(
&self,
context: &Data<LemmyContext>,
websocket_id: Option<ConnectionId>,
) -> Result<PrivateMessageResponse, LemmyError> {
let data: &EditPrivateMessage = self;
- let local_user_view = get_local_user_view_from_jwt(&data.auth, context.pool()).await?;
+ let local_user_view =
+ get_local_user_view_from_jwt(&data.auth, context.pool(), context.secret()).await?;
// Checking permissions
let private_message_id = data.private_message_id;
})
.await??;
if local_user_view.person.id != orig_private_message.creator_id {
- return Err(ApiError::err("no_private_message_edit_allowed").into());
+ return Err(LemmyError::from_message("no_private_message_edit_allowed"));
}
// Doing the update
- let content_slurs_removed = remove_slurs(&data.content);
+ let content_slurs_removed = remove_slurs(&data.content, &context.settings().slur_regex());
let private_message_id = data.private_message_id;
let updated_private_message = blocking(context.pool(), move |conn| {
PrivateMessage::update_content(conn, private_message_id, &content_slurs_removed)
})
.await?
- .map_err(|_| ApiError::err("couldnt_update_private_message"))?;
+ .map_err(|e| LemmyError::from_error_message(e, "couldnt_update_private_message"))?;
// Send the apub update
- updated_private_message
- .send_update(&local_user_view.person, context)
- .await?;
-
- let private_message_id = data.private_message_id;
- let mut private_message_view = blocking(context.pool(), move |conn| {
- PrivateMessageView::read(conn, private_message_id)
- })
- .await??;
-
- // Blank out deleted or removed info
- if private_message_view.private_message.deleted {
- private_message_view.private_message = private_message_view
- .private_message
- .blank_out_deleted_or_removed_info();
- }
-
- let res = PrivateMessageResponse {
- private_message_view,
- };
-
- // Send notifications to the local recipient, if one exists
- let recipient_id = orig_private_message.recipient_id;
- if let Ok(local_recipient) = blocking(context.pool(), move |conn| {
- LocalUserView::read_person(conn, recipient_id)
- })
- .await?
- {
- let local_recipient_id = local_recipient.local_user.id;
- context.chat_server().do_send(SendUserRoomMessage {
- op: UserOperationCrud::EditPrivateMessage,
- response: res.clone(),
- local_recipient_id,
- websocket_id,
- });
- }
-
- Ok(res)
+ CreateOrUpdatePrivateMessage::send(
+ updated_private_message.into(),
+ &local_user_view.person.into(),
+ CreateOrUpdateType::Update,
+ context,
+ )
+ .await?;
+
+ let op = UserOperationCrud::EditPrivateMessage;
+ send_pm_ws_message(data.private_message_id, op, websocket_id, context).await
}
}