From 8f984771ae99e903f834236e24a1048d163a0ae6 Mon Sep 17 00:00:00 2001 From: Joram Wilander Date: Tue, 31 May 2016 10:45:45 -0400 Subject: Send websocket event for system message posts (#3162) --- api/post.go | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/api/post.go b/api/post.go index b20e7b47c..d5d3564f2 100644 --- a/api/post.go +++ b/api/post.go @@ -467,7 +467,24 @@ func handleWebhookEvents(c *Context, post *model.Post, team *model.Team, channel } func sendNotifications(c *Context, post *model.Post, team *model.Team, channel *model.Channel, profileMap map[string]*model.User, members []model.ChannelMember) { + message := model.NewMessage(c.TeamId, post.ChannelId, post.UserId, model.ACTION_POSTED) + message.Add("post", post.ToJson()) + message.Add("channel_type", channel.Type) + + if len(post.Filenames) != 0 { + message.Add("otherFile", "true") + + for _, filename := range post.Filenames { + ext := filepath.Ext(filename) + if model.IsFileExtImage(ext) { + message.Add("image", "true") + break + } + } + } + if post.IsSystemMessage() { + go Publish(message) return } @@ -623,23 +640,8 @@ func sendNotifications(c *Context, post *model.Post, team *model.Team, channel * } } - message := model.NewMessage(c.TeamId, post.ChannelId, post.UserId, model.ACTION_POSTED) - message.Add("post", post.ToJson()) - message.Add("channel_type", channel.Type) message.Add("sender_name", senderName) - if len(post.Filenames) != 0 { - message.Add("otherFile", "true") - - for _, filename := range post.Filenames { - ext := filepath.Ext(filename) - if model.IsFileExtImage(ext) { - message.Add("image", "true") - break - } - } - } - if len(mentionedUsersList) != 0 { message.Add("mentions", model.ArrayToJson(mentionedUsersList)) } -- cgit v1.2.3-1-g7c22