Merge cf07966 into 6ff46f3

mattermost · Mar 9, 2017 · dbd033e · dbd033e
2 parents 6ff46f3 + cf07966
commit dbd033e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/app/notification.go b/app/notification.go
@@ -286,7 +286,7 @@ func SendNotifications(post *model.Post, team *model.Team, channel *model.Channe
 	message := model.NewWebSocketEvent(model.WEBSOCKET_EVENT_POSTED, "", post.ChannelId, "", nil)
 	message.Add("post", post.ToJson())
 	message.Add("channel_type", channel.Type)
-	message.Add("channel_display_name", channel.DisplayName)
+	message.Add("channel_display_name", channelName)
 	message.Add("channel_name", channel.Name)
 	message.Add("sender_name", senderUsername)
 	message.Add("team_id", team.Id)

diff --git a/webapp/actions/user_actions.jsx b/webapp/actions/user_actions.jsx
@@ -304,7 +304,7 @@ export function loadProfilesForGM() {
 
         if (!isVisible) {
             const member = ChannelStore.getMyMember(channel.id);
-            if (!member || (member.mention_count === 0 && member.msg_count < member.total_msg_count)) {
+            if (!member || (member.mention_count === 0 && member.msg_count >= channel.total_msg_count)) {
                 continue;
             }
 

diff --git a/webapp/stores/notification_store.jsx b/webapp/stores/notification_store.jsx
@@ -82,6 +82,10 @@ class NotificationStoreClass extends EventEmitter {
                 title = channel.display_name;
             }
 
+            if (title === '') {
+                title = msgProps.channel_display_name;
+            }
+
             let notifyText = post.message.replace(/\n+/g, ' ');
             if (notifyText.length > 50) {
                 notifyText = notifyText.substring(0, 49) + '...';