diff options
| -rw-r--r-- | app/notification.go | 2 | ||||
| -rw-r--r-- | webapp/actions/user_actions.jsx | 2 | ||||
| -rw-r--r-- | webapp/stores/notification_store.jsx | 4 |
3 files changed, 6 insertions, 2 deletions
diff --git a/app/notification.go b/app/notification.go index 469d114ee..1dd3fedb2 100644 --- 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 index b5f14577f..231b09f11 100644 --- 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 index f32e71047..f32107ef7 100644 --- 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) + '...'; |