IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

PLT-6108 fixing to use senderId for push (#6245)

Browse Source
This commit is contained in:
Corey Hulen
2017-04-27 04:51:19 -07:00
committed by Joram Wilander
parent c540e80166
commit a6397b5ed9
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/notification.go
View File

@@ -494,7 +494,7 @@ func sendPushNotification(post *model.Post, user *model.User, channel *model.Cha
msg.TeamId = channel.TeamId
msg.ChannelId = channel.Id
msg.ChannelName = channel.Name
msg.UserId = user.Id
msg.SenderId = post.UserId
if ou, ok := post.Props["override_username"]; ok && ou != nil {
msg.OverrideUsername = ou.(string)

2
model/push_notification.go
View File

@@ -36,7 +36,7 @@ type PushNotification struct {
ChannelId string `json:"channel_id"`
ChannelName string `json:"channel_name"`
Type string `json:"type"`
UserId string `json:"user_id"`
SenderId string `json:"sender_id"`
OverrideUsername string `json:"override_username"`
OverrideIconUrl string `json:"override_icon_url"`
FromWebhook string `json:"from_webhook"`