IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

PLT-4649 reply threads highlight (#4479)

Browse Source
This commit is contained in:
enahum
2016-11-08 11:59:27 -03:00
committed by Harrison Healey
parent 5fe2d78211
commit 376f7c6f0e
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
webapp/components/post_view/components/post_list.jsx
View File

@@ -264,6 +264,7 @@ export default class PostList extends React.Component {
let commentCount = 0;
let isCommentMention = false;
let shouldHighlightThreads = false;
let commentRootId;
if (parentPost) {
commentRootId = post.root_id;
@@ -274,6 +275,9 @@ export default class PostList extends React.Component {
for (const postId in posts) {
if (posts[postId].root_id === commentRootId) {
commentCount += 1;
if (posts[postId].user_id === userId) {
shouldHighlightThreads = true;
}
}
}
@@ -281,7 +285,7 @@ export default class PostList extends React.Component {
const commentsNotifyLevel = this.props.currentUser.notify_props.comments || 'never';
const notCurrentUser = post.user_id !== userId || (post.props && post.props.from_webhook);
if (notCurrentUser) {
if (commentsNotifyLevel === 'any') {
if (commentsNotifyLevel === 'any' && (posts[commentRootId].user_id === userId || shouldHighlightThreads)) {
isCommentMention = true;
} else if (commentsNotifyLevel === 'root' && posts[commentRootId].user_id === userId) {
isCommentMention = true;