diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2017-03-13 13:20:21 -0400 |
|---|---|---|
| committer | George Goldberg <george@gberg.me> | 2017-03-13 17:20:21 +0000 |
| commit | ca90fe5cbe43df68a2690077b86377f5823f3284 (patch) | |
| tree | c269e830e51c6d675fda451d44aa93b98ea93b80 | |
| parent | a8524b648eb5266df0c2c05995dd90d0500e7b49 (diff) | |
| download | chat-ca90fe5cbe43df68a2690077b86377f5823f3284.tar.gz chat-ca90fe5cbe43df68a2690077b86377f5823f3284.tar.bz2 chat-ca90fe5cbe43df68a2690077b86377f5823f3284.zip | |
Fix permalink in email for DMs/GMs (#5751)
| -rw-r--r-- | app/notification.go | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/notification.go b/app/notification.go index 67959c6bc..7b61de9ac 100644 --- a/app/notification.go +++ b/app/notification.go @@ -318,8 +318,7 @@ func SendNotifications(post *model.Post, team *model.Team, channel *model.Channe } func sendNotificationEmail(post *model.Post, user *model.User, channel *model.Channel, team *model.Team, senderName string, sender *model.User, siteURL string) *model.AppError { - if channel.IsGroupOrDirect() && channel.TeamId != team.Id { - // this message is a cross-team DM/GM so we need to find a team that the recipient is on to use in the link + if channel.IsGroupOrDirect() { if result := <-Srv.Store.Team().GetTeamsByUserId(user.Id); result.Err != nil { return result.Err } else { |