summaryrefslogtreecommitdiffstats
path: root/webapp
diff options
context:
space:
mode:
authorHarrison Healey <harrisonmhealey@gmail.com>2016-08-18 18:45:35 -0400
committerCorey Hulen <corey@hulen.com>2016-08-18 14:45:35 -0800
commit9ad50d4d7562c1b029c888e892dd7cfc203f938a (patch)
tree0c173f204eb20e06a116762c2a378a742210c0db /webapp
parent3289c856130c4d1956dda9229fb3c6a060655b1a (diff)
downloadchat-9ad50d4d7562c1b029c888e892dd7cfc203f938a.tar.gz
chat-9ad50d4d7562c1b029c888e892dd7cfc203f938a.tar.bz2
chat-9ad50d4d7562c1b029c888e892dd7cfc203f938a.zip
Fixed calculation of mention count for direct channels (#3831)
* Fixed clientside calculation of direct channel mention count * Fixed serverside calculation of direct channel mention count
Diffstat (limited to 'webapp')
-rw-r--r--webapp/stores/channel_store.jsx2
1 files changed, 1 insertions, 1 deletions
diff --git a/webapp/stores/channel_store.jsx b/webapp/stores/channel_store.jsx
index 542fbdf6b..8fc0df17f 100644
--- a/webapp/stores/channel_store.jsx
+++ b/webapp/stores/channel_store.jsx
@@ -325,7 +325,7 @@ class ChannelStoreClass extends EventEmitter {
const chMember = this.getMember(id);
let chMentionCount = chMember.mention_count;
- let chUnreadCount = ch.total_msg_count - chMember.msg_count - chMentionCount;
+ let chUnreadCount = ch.total_msg_count - chMember.msg_count;
if (ch.type === 'D') {
chMentionCount = chUnreadCount;