Skip to content

Commit

Permalink
Fixed sender's username not being sent with websocket posted messages (
Browse files Browse the repository at this point in the history
  • Loading branch information
hmhealey authored and jwilander committed Dec 8, 2016
1 parent d402b1d commit ba8c98d
Showing 1 changed file with 8 additions and 1 deletion.
9 changes: 8 additions & 1 deletion api/post.go
Expand Up @@ -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"
Expand Down Expand Up @@ -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 {
Expand Down

0 comments on commit ba8c98d

Please sign in to comment.