mirror of
https://github.com/LemmyNet/lemmy.git
synced 2024-05-15 08:22:39 +00:00
19a1a077c5
* Add a blocklist for URLs. * Fix SQL format * Make clippy happy. * Use regex for URL matching. * Escape regex chars in URLs. * Use post for modification. * Make URL block regex static and remove API routes. * Add date fields to table and use transaction. * Use Cache for blocklist. * Rename check_links + move list to parameters of process_markdown. * SQL format. * Format, again. * Remove println. * Add API test. * Set a shorter lifetime for regex in debug mode. * Add missing macro. * Update lemmy-js-client * Update api_test/pnpm-lock.yaml * Don't break other tests * Use different URL for test --------- Co-authored-by: Dessalines <dessalines@users.noreply.github.com> Co-authored-by: Nutomic <me@nutomic.com>
69 lines
2.1 KiB
Rust
69 lines
2.1 KiB
Rust
use activitypub_federation::config::Data;
|
|
use actix_web::web::Json;
|
|
use lemmy_api_common::{
|
|
context::LemmyContext,
|
|
private_message::{EditPrivateMessage, PrivateMessageResponse},
|
|
send_activity::{ActivityChannel, SendActivityData},
|
|
utils::{get_url_blocklist, local_site_to_slur_regex, process_markdown},
|
|
};
|
|
use lemmy_db_schema::{
|
|
source::{
|
|
local_site::LocalSite,
|
|
private_message::{PrivateMessage, PrivateMessageUpdateForm},
|
|
},
|
|
traits::Crud,
|
|
utils::naive_now,
|
|
};
|
|
use lemmy_db_views::structs::{LocalUserView, PrivateMessageView};
|
|
use lemmy_utils::{
|
|
error::{LemmyError, LemmyErrorExt, LemmyErrorType},
|
|
utils::validation::is_valid_body_field,
|
|
};
|
|
|
|
#[tracing::instrument(skip(context))]
|
|
pub async fn update_private_message(
|
|
data: Json<EditPrivateMessage>,
|
|
context: Data<LemmyContext>,
|
|
local_user_view: LocalUserView,
|
|
) -> Result<Json<PrivateMessageResponse>, LemmyError> {
|
|
let local_site = LocalSite::read(&mut context.pool()).await?;
|
|
|
|
// Checking permissions
|
|
let private_message_id = data.private_message_id;
|
|
let orig_private_message = PrivateMessage::read(&mut context.pool(), private_message_id).await?;
|
|
if local_user_view.person.id != orig_private_message.creator_id {
|
|
Err(LemmyErrorType::EditPrivateMessageNotAllowed)?
|
|
}
|
|
|
|
// Doing the update
|
|
let slur_regex = local_site_to_slur_regex(&local_site);
|
|
let url_blocklist = get_url_blocklist(&context).await?;
|
|
let content = process_markdown(&data.content, &slur_regex, &url_blocklist, &context).await?;
|
|
is_valid_body_field(&Some(content.clone()), false)?;
|
|
|
|
let private_message_id = data.private_message_id;
|
|
PrivateMessage::update(
|
|
&mut context.pool(),
|
|
private_message_id,
|
|
&PrivateMessageUpdateForm {
|
|
content: Some(content),
|
|
updated: Some(Some(naive_now())),
|
|
..Default::default()
|
|
},
|
|
)
|
|
.await
|
|
.with_lemmy_type(LemmyErrorType::CouldntUpdatePrivateMessage)?;
|
|
|
|
let view = PrivateMessageView::read(&mut context.pool(), private_message_id).await?;
|
|
|
|
ActivityChannel::submit_activity(
|
|
SendActivityData::UpdatePrivateMessage(view.clone()),
|
|
&context,
|
|
)
|
|
.await?;
|
|
|
|
Ok(Json(PrivateMessageResponse {
|
|
private_message_view: view,
|
|
}))
|
|
}
|