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,
send_email_to_user,
EndpointType,
},
- websocket::UserOperationCrud,
};
use lemmy_db_schema::{
source::{
},
traits::Crud,
};
-use lemmy_db_views::structs::LocalUserView;
+use lemmy_db_views::structs::{LocalUserView, PrivateMessageView};
use lemmy_utils::{
error::LemmyError,
utils::{slurs::remove_slurs, validation::is_valid_body_field},
- ConnectionId,
};
#[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_user_view = local_user_view_from_jwt(&data.auth, context).await?;
let local_site = LocalSite::read(context.pool()).await?;
let content_slurs_removed = remove_slurs(
&data.content.clone(),
&local_site_to_slur_regex(&local_site),
);
- is_valid_body_field(&Some(content_slurs_removed.clone()))?;
+ is_valid_body_field(&Some(content_slurs_removed.clone()), false)?;
check_person_block(local_user_view.person.id, data.recipient_id, context.pool()).await?;
.await
.map_err(|e| LemmyError::from_error_message(e, "couldnt_create_private_message"))?;
- let res = context
- .send_pm_ws_message(
- &UserOperationCrud::CreatePrivateMessage,
- inserted_private_message.id,
- websocket_id,
- )
- .await?;
+ let view = PrivateMessageView::read(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 = LocalUserView::read_person(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_slurs_removed, sender_name),
context.settings(),
- );
+ )
+ .await;
}
- Ok(res)
+ Ok(PrivateMessageResponse {
+ private_message_view: view,
+ })
}
}