From 3f1fca9463df27e8f795356ab6873d0d5bf4d634 Mon Sep 17 00:00:00 2001 From: Joram Wilander Date: Thu, 22 Jun 2017 06:36:46 -0400 Subject: PLT-6759 Show deactivated users in GMs (#6703) * Show deactivated users in GMs * Fix runtime error when DMing deactivated user --- app/notification.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'app/notification.go') 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 } -- cgit v1.2.3-1-g7c22