From ba8c98d722975ef1a1b395f153955aaa1af72866 Mon Sep 17 00:00:00 2001
From: Harrison Healey <harrisonmhealey@gmail.com>
Date: Thu, 8 Dec 2016 10:34:38 -0500
Subject: Fixed sender's username not being sent with websocket posted messages
 (#4736)

---
 api/post.go | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'api')

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 {
-- 
cgit v1.2.3-1-g7c22