Fixing new messages indicator (#4531)

webapp/actions/global_actions.jsx

@@ -43,6 +43,9 @@ export function emitChannelClickEvent(channel) {
         );
     }
     function switchToChannel(chan) {
+        const getMyChannelMembersPromise = AsyncClient.getChannelMember(chan.id, UserStore.getCurrentId());
+
+        getMyChannelMembersPromise.then(() => {
             AsyncClient.getChannelStats(chan.id, true);
             AsyncClient.updateLastViewedAt(chan.id);
             loadPosts(chan.id);
@@ -54,6 +57,7 @@ export function emitChannelClickEvent(channel) {
                 id: chan.id,
                 prev: ChannelStore.getCurrentId()
             });
+        });
     }
 
     if (channel.fake) {

webapp/stores/channel_store.jsx

@@ -263,6 +263,12 @@ class ChannelStoreClass extends EventEmitter {
         });
     }
 
+    setUnreadCountsByCurrentMembers() {
+        Object.keys(this.myChannelMembers).forEach((key) => {
+            this.setUnreadCountByChannel(this.myChannelMembers[key].channel_id);
+        });
+    }
+
     setUnreadCountsByChannels(channels) {
         channels.forEach((c) => {
             this.setUnreadCountByChannel(c.id);
@@ -368,6 +374,15 @@ ChannelStore.dispatchToken = AppDispatcher.register((payload) => {
         ChannelStore.setUnreadCountsByMembers(action.members);
         ChannelStore.emitChange();
         break;
+    case ActionTypes.RECEIVED_CHANNEL_MEMBER:
+        ChannelStore.storeMyChannelMember(action.member);
+        currentId = ChannelStore.getCurrentId();
+        if (currentId && window.isActive) {
+            ChannelStore.resetCounts(currentId);
+        }
+        ChannelStore.setUnreadCountsByCurrentMembers();
+        ChannelStore.emitChange();
+        break;
     case ActionTypes.RECEIVED_MORE_CHANNELS:
         ChannelStore.storeMoreChannels(action.channels);
         ChannelStore.emitChange();

webapp/utils/async_client.jsx

@@ -111,7 +111,9 @@ export function getChannel(id) {
 }
 
 export function getMyChannelMembers() {
+    return new Promise((resolve, reject) => {
         if (isCallInProgress('getMyChannelMembers')) {
+            resolve();
             return;
         }
 
@@ -125,12 +127,15 @@ export function getMyChannelMembers() {
                     type: ActionTypes.RECEIVED_MY_CHANNEL_MEMBERS,
                     members: data
                 });
+                resolve();
             },
             (err) => {
                 callTracker.getChannelsUnread = 0;
                 dispatchError(err, 'getMyChannelMembers');
+                reject();
             }
         );
+    });
 }
 
 export function updateLastViewedAt(id, active) {
@@ -263,7 +268,9 @@ export function getChannelStats(channelId = ChannelStore.getCurrentId(), doVersi
 }
 
 export function getChannelMember(channelId, userId) {
+    return new Promise((resolve, reject) => {
         if (isCallInProgress(`getChannelMember${channelId}${userId}`)) {
+            resolve();
             return;
         }
 
@@ -279,12 +286,15 @@ export function getChannelMember(channelId, userId) {
                     type: ActionTypes.RECEIVED_CHANNEL_MEMBER,
                     member: data
                 });
+                resolve();
             },
             (err) => {
                 callTracker[`getChannelMember${channelId}${userId}`] = 0;
                 dispatchError(err, 'getChannelMember');
+                reject();
             }
         );
+    });
 }
 
 export function getUser(userId) {

webapp/utils/constants.jsx

@@ -70,6 +70,7 @@ export const ActionTypes = keyMirror({
 
     RECEIVED_CHANNELS: null,
     RECEIVED_CHANNEL: null,
+    RECEIVED_CHANNEL_MEMBER: null,
     RECEIVED_MORE_CHANNELS: null,
     RECEIVED_CHANNEL_STATS: null,
     RECEIVED_MY_CHANNEL_MEMBERS: null,