From 14f1f4e9b119f00246a7a5f49e607413c99e4f74 Mon Sep 17 00:00:00 2001
From: Pepijn <pepijnfens@gmail.com>
Date: Wed, 28 Dec 2016 03:49:44 +0100
Subject: Tweaked new message indicator calculation: (#4763)

* Removed count from new message indicator

* Don't count deleted posts towards the unviewedCount

* remove lodash, reduce() is natively available
---
 .../post_view/components/new_message_indicator.jsx          |  2 +-
 webapp/components/post_view/components/post_list.jsx        | 13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

(limited to 'webapp/components/post_view')

diff --git a/webapp/components/post_view/components/new_message_indicator.jsx b/webapp/components/post_view/components/new_message_indicator.jsx
index f9bd17bd7..5167a3d2d 100644
--- a/webapp/components/post_view/components/new_message_indicator.jsx
+++ b/webapp/components/post_view/components/new_message_indicator.jsx
@@ -40,7 +40,7 @@ export default class NewMessageIndicator extends React.Component {
                     />
                     <FormattedMessage
                         id='posts_view.newMsgBelow'
-                        defaultMessage='{count} new {count, plural, one {message} other {messages}} below'
+                        defaultMessage='New {count, plural, one {message} other {messages}} below'
                         values={{count: this.props.newMessages}}
                     />
                 </div>
diff --git a/webapp/components/post_view/components/post_list.jsx b/webapp/components/post_view/components/post_list.jsx
index 05e2ff618..516487eaf 100644
--- a/webapp/components/post_view/components/post_list.jsx
+++ b/webapp/components/post_view/components/post_list.jsx
@@ -1,6 +1,5 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
-
 import $ from 'jquery';
 
 import Post from './post.jsx';
@@ -84,13 +83,15 @@ export default class PostList extends React.Component {
         // Only count if we're  not at the bottom, not in highlight view,
         // or anything else
         if (nextProps.scrollType === Constants.ScrollTypes.FREE) {
-            for (let i = order.length - 1; i >= 0; i--) {
-                const post = posts[order[i]];
+            unViewedCount = order.reduce((count, orderId) => {
+                const post = posts[orderId];
                 if (post.create_at > nextProps.lastViewedBottom &&
-                    post.user_id !== nextProps.currentUser.id) {
-                    unViewedCount++;
+                    post.user_id !== nextProps.currentUser.id &&
+                    post.state !== Constants.POST_DELETED) {
+                    return count + 1;
                 }
-            }
+                return count;
+            }, 0);
         }
         this.setState({unViewedCount});
     }
-- 
cgit v1.2.3-1-g7c22