diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2017-06-22 06:36:46 -0400 |
|---|---|---|
| committer | George Goldberg <george@gberg.me> | 2017-06-22 11:36:46 +0100 |
| commit | 3f1fca9463df27e8f795356ab6873d0d5bf4d634 (patch) | |
| tree | eb023486f6bac6a8156633fcc6adb5f4bd360583 /app/notification.go | |
| parent | ac4e9909fa4f3f6c6a0d1e537d6039115d07a5e0 (diff) | |
| download | chat-3f1fca9463df27e8f795356ab6873d0d5bf4d634.tar.gz chat-3f1fca9463df27e8f795356ab6873d0d5bf4d634.tar.bz2 chat-3f1fca9463df27e8f795356ab6873d0d5bf4d634.zip | |
PLT-6759 Show deactivated users in GMs (#6703)
* Show deactivated users in GMs
* Fix runtime error when DMing deactivated user
Diffstat (limited to 'app/notification.go')
| -rw-r--r-- | app/notification.go | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/notification.go b/app/notification.go index 7ddba0bdb..2b9c9bcff 100644 --- a/app/notification.go +++ b/app/notification.go @@ -63,7 +63,10 @@ func SendNotifications(post *model.Post, team *model.Team, channel *model.Channe otherUserId = userIds[0] } - mentionedUserIds[otherUserId] = true + if _, ok := profileMap[otherUserId]; ok { + mentionedUserIds[otherUserId] = true + } + if post.Props["from_webhook"] == "true" { mentionedUserIds[post.UserId] = true } |