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::protocol::activities::{
- private_message::create_or_update::CreateOrUpdatePrivateMessage,
+ create_or_update::private_message::CreateOrUpdatePrivateMessage,
CreateOrUpdateType,
};
use lemmy_db_schema::{source::private_message::PrivateMessage, traits::Crud};
-use lemmy_utils::{utils::remove_slurs, ApiError, ConnectionId, LemmyError};
+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>,
})
.await??;
if local_user_view.person.id != orig_private_message.creator_id {
- return Err(ApiError::err_plain("no_private_message_edit_allowed").into());
+ return Err(LemmyError::from_message("no_private_message_edit_allowed"));
}
// Doing the update
PrivateMessage::update_content(conn, private_message_id, &content_slurs_removed)
})
.await?
- .map_err(|e| ApiError::err("couldnt_update_private_message", e))?;
+ .map_err(|e| LemmyError::from_error_message(e, "couldnt_update_private_message"))?;
// Send the apub update
CreateOrUpdatePrivateMessage::send(
- &updated_private_message.into(),
+ updated_private_message.into(),
&local_user_view.person.into(),
CreateOrUpdateType::Update,
context,