diff options
author | Joram Wilander <jwawilander@gmail.com> | 2017-05-10 07:41:12 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-05-10 07:41:12 -0400 |
commit | 9625362494888c9423bb6503b7e18557b6b9cc79 (patch) | |
tree | 976611e0ee7fff14dd13e044c571c370f5895392 /webapp/components/notify_counts.jsx | |
parent | 6e642036f460fb2e28572d46ca29aa81fbc8c8d1 (diff) | |
download | chat-9625362494888c9423bb6503b7e18557b6b9cc79.tar.gz chat-9625362494888c9423bb6503b7e18557b6b9cc79.tar.bz2 chat-9625362494888c9423bb6503b7e18557b6b9cc79.zip |
Fix DM getting marked unread from your own message (#6373)
Diffstat (limited to 'webapp/components/notify_counts.jsx')
-rw-r--r-- | webapp/components/notify_counts.jsx | 34 |
1 files changed, 1 insertions, 33 deletions
diff --git a/webapp/components/notify_counts.jsx b/webapp/components/notify_counts.jsx index dda352349..f05ecbf12 100644 --- a/webapp/components/notify_counts.jsx +++ b/webapp/components/notify_counts.jsx @@ -2,42 +2,10 @@ // See License.txt for license information. import * as utils from 'utils/utils.jsx'; +import {getCountsStateFromStores} from 'utils/channel_utils.jsx'; import ChannelStore from 'stores/channel_store.jsx'; import TeamStore from 'stores/team_store.jsx'; -function getCountsStateFromStores() { - let mentionCount = 0; - let messageCount = 0; - const teamMembers = TeamStore.getMyTeamMembers(); - const channels = ChannelStore.getAll(); - const members = ChannelStore.getMyMembers(); - - teamMembers.forEach((member) => { - if (member.team_id !== TeamStore.getCurrentId()) { - mentionCount += (member.mention_count || 0); - messageCount += (member.msg_count || 0); - } - }); - - channels.forEach((channel) => { - const channelMember = members[channel.id]; - if (channelMember == null) { - return; - } - - if (channel.type === 'D') { - mentionCount += channel.total_msg_count - channelMember.msg_count; - } else if (channelMember.mention_count > 0) { - mentionCount += channelMember.mention_count; - } - if (channelMember.notify_props.mark_unread !== 'mention' && channel.total_msg_count - channelMember.msg_count > 0) { - messageCount += 1; - } - }); - - return {mentionCount, messageCount}; -} - import React from 'react'; export default class NotifyCounts extends React.Component { |