From 5683cd3987c6986d75b5d948f3f2d7ebbdaa655d Mon Sep 17 00:00:00 2001
From: Dessalines <tyhou13@gmx.com>
Date: Thu, 25 Apr 2019 08:33:25 -0700
Subject: [PATCH] Fix for marking a comment as read.

---
 server/src/websocket_server/server.rs | 45 ++++++++++++++-------------
 1 file changed, 24 insertions(+), 21 deletions(-)

diff --git a/server/src/websocket_server/server.rs b/server/src/websocket_server/server.rs
index 84536c53d..79707bf47 100644
--- a/server/src/websocket_server/server.rs
+++ b/server/src/websocket_server/server.rs
@@ -1311,30 +1311,32 @@ impl Perform for EditComment {
 
     let user_id = claims.id;
 
-    // Verify its the creator or a mod, or an admin
-    let orig_comment = CommentView::read(&conn, self.edit_id, None)?;
-    let mut editors: Vec<i32> = vec![self.creator_id];
-    editors.append(
-      &mut CommunityModeratorView::for_community(&conn, orig_comment.community_id)
-      ?
-      .into_iter()
-      .map(|m| m.user_id)
-      .collect()
-      );
-    editors.append(
-      &mut UserView::admins(&conn)
-      ?
-      .into_iter()
-      .map(|a| a.id)
-      .collect()
-      );
-
-    if !editors.contains(&user_id) {
-      return Err(self.error("Not allowed to edit comment."))?
-    }
 
     // You are allowed to mark the comment as read even if you're banned.
     if self.read.is_none() {
+
+      // Verify its the creator or a mod, or an admin
+      let orig_comment = CommentView::read(&conn, self.edit_id, None)?;
+      let mut editors: Vec<i32> = vec![self.creator_id];
+      editors.append(
+        &mut CommunityModeratorView::for_community(&conn, orig_comment.community_id)
+        ?
+        .into_iter()
+        .map(|m| m.user_id)
+        .collect()
+        );
+      editors.append(
+        &mut UserView::admins(&conn)
+        ?
+        .into_iter()
+        .map(|a| a.id)
+        .collect()
+        );
+
+      if !editors.contains(&user_id) {
+        return Err(self.error("Not allowed to edit comment."))?
+      }
+
       // Check for a community ban
       if CommunityUserBanView::get(&conn, user_id, orig_comment.community_id).is_ok() {
         return Err(self.error("You have been banned from this community"))?
@@ -1344,6 +1346,7 @@ impl Perform for EditComment {
       if UserView::read(&conn, user_id)?.banned {
         return Err(self.error("You have been banned from the site"))?
       }
+
     }
 
     let content_slurs_removed = remove_slurs(&self.content.to_owned());