mirror of
https://github.com/LemmyNet/lemmy.git
synced 2024-06-02 04:49:30 +00:00
35cbae61bc
* Respond directly with LemmyError Instrument Perform implementations for more precise traces Use ApiError to format JSON errors when messages are present Keep SpanTrace output in LemmyError Display impl * Hide SpanTrace debug output from LemmyError * Don't log when entering spans, only when leaving * Update actix-web * Update actix-rt * Add newline after error info in LemmyError Display impl * Propogate span information to blocking operations * Instrument apub functions * Use skip_all for more instrument attributes, don't skip 'self' in some api actions * Make message a static string * Send proper JSON over websocket * Add 'message' to LemmyError display if present * Use a quieter root span builder, don't pretty-print logs * Keep passwords and emails out of logs * Re-enable logging Login * Instrument feeds * Emit our own errors * Move error log after status code recording * Make Sensitive generic over the inner type * Remove line that logged secrets
76 lines
2.4 KiB
Rust
76 lines
2.4 KiB
Rust
use crate::PerformCrud;
|
|
use actix_web::web::Data;
|
|
use lemmy_api_common::{
|
|
blocking,
|
|
get_local_user_view_from_jwt,
|
|
person::{DeletePrivateMessage, PrivateMessageResponse},
|
|
};
|
|
use lemmy_apub::protocol::activities::private_message::{
|
|
delete::DeletePrivateMessage as DeletePrivateMessageApub,
|
|
undo_delete::UndoDeletePrivateMessage,
|
|
};
|
|
use lemmy_db_schema::{
|
|
source::private_message::PrivateMessage,
|
|
traits::{Crud, DeleteableOrRemoveable},
|
|
};
|
|
use lemmy_utils::{ConnectionId, LemmyError};
|
|
use lemmy_websocket::{send::send_pm_ws_message, LemmyContext, UserOperationCrud};
|
|
|
|
#[async_trait::async_trait(?Send)]
|
|
impl PerformCrud for DeletePrivateMessage {
|
|
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: &DeletePrivateMessage = self;
|
|
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;
|
|
let orig_private_message = blocking(context.pool(), move |conn| {
|
|
PrivateMessage::read(conn, private_message_id)
|
|
})
|
|
.await??;
|
|
if local_user_view.person.id != orig_private_message.creator_id {
|
|
return Err(LemmyError::from_message("no_private_message_edit_allowed"));
|
|
}
|
|
|
|
// Doing the update
|
|
let private_message_id = data.private_message_id;
|
|
let deleted = data.deleted;
|
|
let updated_private_message = blocking(context.pool(), move |conn| {
|
|
PrivateMessage::update_deleted(conn, private_message_id, deleted)
|
|
})
|
|
.await?
|
|
.map_err(LemmyError::from)
|
|
.map_err(|e| e.with_message("couldnt_update_private_message"))?;
|
|
|
|
// Send the apub update
|
|
if data.deleted {
|
|
DeletePrivateMessageApub::send(
|
|
&local_user_view.person.into(),
|
|
&updated_private_message
|
|
.blank_out_deleted_or_removed_info()
|
|
.into(),
|
|
context,
|
|
)
|
|
.await?;
|
|
} else {
|
|
UndoDeletePrivateMessage::send(
|
|
&local_user_view.person.into(),
|
|
&updated_private_message.into(),
|
|
context,
|
|
)
|
|
.await?;
|
|
}
|
|
|
|
let op = UserOperationCrud::DeletePrivateMessage;
|
|
send_pm_ws_message(data.private_message_id, op, websocket_id, context).await
|
|
}
|
|
}
|