grishka/lemmy
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixing user mention reading. (#968)

Browse source
This commit is contained in:
Dessalines 2020-07-14 12:12:04 -04:00 committed by GitHub
parent 2f32d3e6df
commit cc0ae6343c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
server/src/api/user.rs
View file

@ -880,28 +880,29 @@ impl Perform for Oper<EditUserMention> {
}; };
let user_id = claims.id; let user_id = claims.id;
if user_id != data.user_mention_id {
let user_mention_id = data.user_mention_id;
let read_user_mention =
blocking(pool, move |conn| UserMention::read(conn, user_mention_id)).await??;
if user_id != read_user_mention.recipient_id {
return Err(APIError::err("couldnt_update_comment").into()); return Err(APIError::err("couldnt_update_comment").into());
} }
let user_mention_id = data.user_mention_id;
let user_mention =
blocking(pool, move |conn| UserMention::read(conn, user_mention_id)).await??;
let user_mention_form = UserMentionForm { let user_mention_form = UserMentionForm {
recipient_id: user_id, recipient_id: read_user_mention.recipient_id,
comment_id: user_mention.comment_id, comment_id: read_user_mention.comment_id,
read: data.read.to_owned(), read: data.read.to_owned(),
}; };
let user_mention_id = user_mention.id; let user_mention_id = read_user_mention.id;
let update_mention = let update_mention =
move |conn: &'_ _| UserMention::update(conn, user_mention_id, &user_mention_form); move |conn: &'_ _| UserMention::update(conn, user_mention_id, &user_mention_form);
if blocking(pool, update_mention).await?.is_err() { if blocking(pool, update_mention).await?.is_err() {
return Err(APIError::err("couldnt_update_comment").into()); return Err(APIError::err("couldnt_update_comment").into());
}; };
let user_mention_id = user_mention.id; let user_mention_id = read_user_mention.id;
let user_mention_view = blocking(pool, move |conn| { let user_mention_view = blocking(pool, move |conn| {
UserMentionView::read(conn, user_mention_id, user_id) UserMentionView::read(conn, user_mention_id, user_id)
}) })