From: Dessalines <dessalines@users.noreply.github.com>
Date: Tue, 14 Jul 2020 16:12:04 +0000 (-0400)
Subject: Fixing user mention reading. (#968)
X-Git-Url: http://these/git/%7B%60/feeds/inbox/%22%7B%7D/%22?a=commitdiff_plain;h=cc0ae6343c5a6537cee19c7b5a21201794f7d4c3;p=lemmy.git

Fixing user mention reading. (#968)
---

diff --git a/server/src/api/user.rs b/server/src/api/user.rs
index ddcf2ef2..d547f64b 100644
--- a/server/src/api/user.rs
+++ b/server/src/api/user.rs
@@ -880,28 +880,29 @@ impl Perform for Oper<EditUserMention> {
     };
 
     let user_id = claims.id;
-    if user_id != data.user_mention_id {
-      return Err(APIError::err("couldnt_update_comment").into());
-    }
 
     let user_mention_id = data.user_mention_id;
-    let user_mention =
+    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());
+    }
+
     let user_mention_form = UserMentionForm {
-      recipient_id: user_id,
-      comment_id: user_mention.comment_id,
+      recipient_id: read_user_mention.recipient_id,
+      comment_id: read_user_mention.comment_id,
       read: data.read.to_owned(),
     };
 
-    let user_mention_id = user_mention.id;
+    let user_mention_id = read_user_mention.id;
     let update_mention =
       move |conn: &'_ _| UserMention::update(conn, user_mention_id, &user_mention_form);
     if blocking(pool, update_mention).await?.is_err() {
       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| {
       UserMentionView::read(conn, user_mention_id, user_id)
     })