mirror of
https://github.com/LemmyNet/lemmy.git
synced 2024-12-02 01:01:20 +00:00
Riley
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
121 lines
3.5 KiB
Rust
121 lines
3.5 KiB
Rust
use crate::PerformCrud;
|
|
use actix_web::web::Data;
|
|
use lemmy_api_common::{
|
|
blocking,
|
|
check_person_block,
|
|
get_local_user_view_from_jwt,
|
|
person::{CreatePrivateMessage, PrivateMessageResponse},
|
|
};
|
|
use lemmy_apub::{
|
|
generate_local_apub_endpoint,
|
|
protocol::activities::{
|
|
private_message::create_or_update::CreateOrUpdatePrivateMessage,
|
|
CreateOrUpdateType,
|
|
},
|
|
EndpointType,
|
|
};
|
|
use lemmy_db_schema::{
|
|
source::private_message::{PrivateMessage, PrivateMessageForm},
|
|
traits::Crud,
|
|
};
|
|
use lemmy_db_views::local_user_view::LocalUserView;
|
|
use lemmy_utils::{utils::remove_slurs, ConnectionId, LemmyError};
|
|
use lemmy_websocket::{
|
|
send::{send_email_to_user, send_pm_ws_message},
|
|
LemmyContext,
|
|
UserOperationCrud,
|
|
};
|
|
|
|
#[async_trait::async_trait(?Send)]
|
|
impl PerformCrud for CreatePrivateMessage {
|
|
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: &CreatePrivateMessage = self;
|
|
let local_user_view =
|
|
get_local_user_view_from_jwt(&data.auth, context.pool(), context.secret()).await?;
|
|
|
|
let content_slurs_removed =
|
|
remove_slurs(&data.content.to_owned(), &context.settings().slur_regex());
|
|
|
|
check_person_block(local_user_view.person.id, data.recipient_id, context.pool()).await?;
|
|
|
|
let private_message_form = PrivateMessageForm {
|
|
content: content_slurs_removed.to_owned(),
|
|
creator_id: local_user_view.person.id,
|
|
recipient_id: data.recipient_id,
|
|
..PrivateMessageForm::default()
|
|
};
|
|
|
|
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(e).with_message("couldnt_create_private_message"));
|
|
}
|
|
};
|
|
|
|
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_ap_id(
|
|
conn,
|
|
inserted_private_message_id,
|
|
apub_id,
|
|
)?)
|
|
},
|
|
)
|
|
.await?
|
|
.map_err(LemmyError::from)
|
|
.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(
|
|
inserted_private_message.id,
|
|
UserOperationCrud::CreatePrivateMessage,
|
|
websocket_id,
|
|
context,
|
|
)
|
|
.await?;
|
|
|
|
// Send email to the local recipient, if one exists
|
|
if res.private_message_view.recipient.local {
|
|
let recipient_id = data.recipient_id;
|
|
let local_recipient = blocking(context.pool(), move |conn| {
|
|
LocalUserView::read_person(conn, recipient_id)
|
|
})
|
|
.await??;
|
|
send_email_to_user(
|
|
&local_recipient,
|
|
"Private Message from",
|
|
"Private Message",
|
|
&content_slurs_removed,
|
|
&context.settings(),
|
|
);
|
|
}
|
|
|
|
Ok(res)
|
|
}
|
|
}
|