use actix_web::web::Data;
use lemmy_api_common::{
blocking,
+ check_person_block,
get_local_user_view_from_jwt,
person::{CreatePrivateMessage, PrivateMessageResponse},
send_email_to_user,
};
use lemmy_apub::{
- activities::{
+ generate_local_apub_endpoint,
+ protocol::activities::{
private_message::create_or_update::CreateOrUpdatePrivateMessage,
CreateOrUpdateType,
},
- generate_apub_endpoint,
EndpointType,
};
-use lemmy_db_queries::{source::private_message::PrivateMessage_, Crud};
-use lemmy_db_schema::source::private_message::{PrivateMessage, PrivateMessageForm};
+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, ApiError, ConnectionId, LemmyError};
+use lemmy_utils::{utils::remove_slurs, ConnectionId, LemmyError};
use lemmy_websocket::{send::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()).await?;
+ 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());
- let content_slurs_removed = remove_slurs(&data.content.to_owned());
+ 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(),
.await?
{
Ok(private_message) => private_message,
- Err(_e) => {
- return Err(ApiError::err("couldnt_create_private_message").into());
+ 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_apub_endpoint(
+ let apub_id = generate_local_apub_endpoint(
EndpointType::PrivateMessage,
&inserted_private_message_id.to_string(),
+ &protocol_and_hostname,
)?;
Ok(PrivateMessage::update_ap_id(
conn,
},
)
.await?
- .map_err(|_| ApiError::err("couldnt_create_private_message"))?;
+ .map_err(LemmyError::from)
+ .map_err(|e| e.with_message("couldnt_create_private_message"))?;
CreateOrUpdatePrivateMessage::send(
- &updated_private_message,
- &local_user_view.person,
+ updated_private_message.into(),
+ &local_user_view.person.into(),
CreateOrUpdateType::Create,
context,
)
"Private Message from",
"Private Message",
&content_slurs_removed,
+ &context.settings(),
);
}