diff options
author | Christopher Speller <crspeller@gmail.com> | 2017-05-12 09:12:55 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-05-12 09:12:55 -0400 |
commit | 1397798f1763b0848957a8672c8d40b6243764d5 (patch) | |
tree | 5d109da2e9e088f16eff0ad1421876a3d3da412e /webapp/components/sidebar.jsx | |
parent | b1c39204a63a87d2cbc57f66cf9db50c938b2ee5 (diff) | |
parent | 9d109b070037951fcd0832b785eba8a3db9a157c (diff) | |
download | chat-1397798f1763b0848957a8672c8d40b6243764d5.tar.gz chat-1397798f1763b0848957a8672c8d40b6243764d5.tar.bz2 chat-1397798f1763b0848957a8672c8d40b6243764d5.zip |
Merge pull request #6401 from mattermost/merge-3.9
Merge release-3.9 branch into master
Diffstat (limited to 'webapp/components/sidebar.jsx')
-rw-r--r-- | webapp/components/sidebar.jsx | 24 |
1 files changed, 2 insertions, 22 deletions
diff --git a/webapp/components/sidebar.jsx b/webapp/components/sidebar.jsx index aa7b98be0..5784f96ba 100644 --- a/webapp/components/sidebar.jsx +++ b/webapp/components/sidebar.jsx @@ -90,28 +90,8 @@ export default class Sidebar extends React.Component { } getTotalUnreadCount() { - let msgs = 0; - let mentions = 0; - const unreadCounts = this.state.unreadCounts; - const teamMembers = this.state.teamMembers; - - teamMembers.forEach((member) => { - if (member.team_id !== this.state.currentTeam.id) { - msgs += member.msg_count || 0; - mentions += member.mention_count || 0; - } - }); - - Object.keys(unreadCounts).forEach((chId) => { - const channel = ChannelStore.get(chId); - - if (channel && (channel.type === Constants.DM_CHANNEL || channel.type === Constants.GM_CHANNEL || channel.team_id === this.state.currentTeam.id)) { - msgs += unreadCounts[chId].msgs; - mentions += unreadCounts[chId].mentions; - } - }); - - return {msgs, mentions}; + const unreads = ChannelUtils.getCountsStateFromStores(this.state.currentTeam, this.state.teamMembers, this.state.unreadCounts); + return {msgs: unreads.messageCount, mentions: unreads.mentionCount}; } getStateFromStores() { |