                     (not secure-access?)
                     (= access-level :author))
                (conj (secure-link org-slug secure-uuid))
-               ;; Accessing their drafts, or access by an author, both get interaction links
-               (or (and draft?
-                        (not secure-access?))
-                   member?)
+               ;; Team members always get links to read and add comments
+               member?
                (concat [(content/comment-link org-uuid board-uuid entry-uuid)
-                        (content/comments-link org-uuid board-uuid entry-uuid comments)
-                        (content/mark-unread-link entry-uuid)])
+                        (content/comments-link org-uuid board-uuid entry-uuid comments)])
+               ;; Team members always get the mark unread except on secure access
+               (and member?
+                    (not secure-access?))
+               (conj (content/mark-unread-link entry-uuid))
                ;; All memebers can react but only if there are less than x reactions
                (and member?
                     (< (count reaction-list) config/max-reaction-count))

                        bookmarks-link
                        user-visibility-link])
               ;; Add home and board pin links if user is a member (clients will limit home pins from private boards)
               member?
               (concat [home-pin-link board-pin-link])
               ;; Only admins and the owner can edit or delete the entry
               (and (not secure-access?)

  (filter :reaction interactions))

(defun- board-of
  ([boards :guard map? entry]
    (boards (:board-uuid entry)))
  ([board _entry] board))

