Skip to content

Commit 2d169d6

Browse files
authored
Don't allow private message edits for blocked users. (#6472)
* Don't allow private message edits for blocked users. * Fixing import * Import 2
1 parent e4efb5a commit 2d169d6

1 file changed

Lines changed: 23 additions & 2 deletions

File tree

  • crates/api/api_crud/src/private_message

crates/api/api_crud/src/private_message/update.rs

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,21 @@ use lemmy_api_utils::{
66
notify::notify_private_message,
77
plugins::{plugin_hook_after, plugin_hook_before},
88
send_activity::{ActivityChannel, SendActivityData},
9-
utils::{check_local_user_valid, get_url_blocklist, process_markdown, slur_regex},
9+
utils::{
10+
check_local_user_valid,
11+
check_private_messages_enabled,
12+
get_url_blocklist,
13+
process_markdown,
14+
slur_regex,
15+
},
16+
};
17+
use lemmy_db_schema::{
18+
source::{
19+
person::PersonActions,
20+
private_message::{PrivateMessage, PrivateMessageUpdateForm},
21+
},
22+
traits::Blockable,
1023
};
11-
use lemmy_db_schema::source::private_message::{PrivateMessage, PrivateMessageUpdateForm};
1224
use lemmy_db_views_local_user::LocalUserView;
1325
use lemmy_db_views_private_message::{
1426
PrivateMessageView,
@@ -48,6 +60,15 @@ pub async fn edit_private_message(
4860
.await?;
4961
is_valid_body_field(&content, false)?;
5062

63+
PersonActions::read_block(
64+
&mut context.pool(),
65+
orig_private_message.recipient_id,
66+
local_user_view.person.id,
67+
)
68+
.await?;
69+
70+
check_private_messages_enabled(&local_user_view)?;
71+
5172
let private_message_id = data.private_message_id;
5273
let mut form = PrivateMessageUpdateForm {
5374
content: Some(content),

0 commit comments

Comments
 (0)