diff options
| author | Harrison Healey <harrisonmhealey@gmail.com> | 2016-12-08 10:34:38 -0500 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2016-12-08 10:34:38 -0500 |
| commit | ba8c98d722975ef1a1b395f153955aaa1af72866 (patch) | |
| tree | ecffeb588e2b0b8d134bf129d3882ff1f15bbd80 /api/post.go | |
| parent | d402b1d010a56256f15bb482684c18b10ed4bcc5 (diff) | |
| download | chat-ba8c98d722975ef1a1b395f153955aaa1af72866.tar.gz chat-ba8c98d722975ef1a1b395f153955aaa1af72866.tar.bz2 chat-ba8c98d722975ef1a1b395f153955aaa1af72866.zip | |
Fixed sender's username not being sent with websocket posted messages (#4736)
Diffstat (limited to 'api/post.go')
| -rw-r--r-- | api/post.go | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/api/post.go b/api/post.go index fcbafbbe5..69d190e52 100644 --- a/api/post.go +++ b/api/post.go @@ -679,6 +679,13 @@ func sendNotifications(c *Context, post *model.Post, team *model.Team, channel * } } + var senderUsername string + if value, ok := post.Props["override_username"]; ok && post.Props["from_webhook"] == "true" { + senderUsername = value.(string) + } else { + senderUsername = profileMap[post.UserId].Username + } + if utils.Cfg.EmailSettings.SendEmailNotifications { for _, id := range mentionedUsersList { userAllowsEmails := profileMap[id].NotifyProps["email"] != "false" @@ -815,7 +822,7 @@ func sendNotifications(c *Context, post *model.Post, team *model.Team, channel * message.Add("post", post.ToJson()) message.Add("channel_type", channel.Type) message.Add("channel_display_name", channel.DisplayName) - message.Add("sender_name", senderName) + message.Add("sender_name", senderUsername) message.Add("team_id", team.Id) if len(post.FileIds) != 0 { |