diff options
-rw-r--r-- | app/notification.go | 11 | ||||
-rw-r--r-- | model/push_notification.go | 6 |
2 files changed, 12 insertions, 5 deletions
diff --git a/app/notification.go b/app/notification.go index 1d3416794..258606ad4 100644 --- a/app/notification.go +++ b/app/notification.go @@ -574,6 +574,8 @@ func sendPushNotification(post *model.Post, user *model.User, channel *model.Cha msg.Type = model.PUSH_TYPE_MESSAGE msg.TeamId = channel.TeamId msg.ChannelId = channel.Id + msg.PostId = post.Id + msg.RootId = post.RootId msg.ChannelName = channel.Name msg.SenderId = post.UserId @@ -590,15 +592,15 @@ func sendPushNotification(post *model.Post, user *model.User, channel *model.Cha } if *utils.Cfg.EmailSettings.PushNotificationContents == model.FULL_NOTIFICATION { + msg.Category = model.CATEGORY_CAN_REPLY if channel.Type == model.CHANNEL_DIRECT { - msg.Category = model.CATEGORY_DM msg.Message = senderName + ": " + model.ClearMentionTags(post.Message) } else { msg.Message = senderName + userLocale("api.post.send_notifications_and_forget.push_in") + channelName + ": " + model.ClearMentionTags(post.Message) } } else if *utils.Cfg.EmailSettings.PushNotificationContents == model.GENERIC_NO_CHANNEL_NOTIFICATION { if channel.Type == model.CHANNEL_DIRECT { - msg.Category = model.CATEGORY_DM + msg.Category = model.CATEGORY_CAN_REPLY msg.Message = senderName + userLocale("api.post.send_notifications_and_forget.push_message") } else if wasMentioned || channel.Type == model.CHANNEL_GROUP { msg.Message = senderName + userLocale("api.post.send_notifications_and_forget.push_mention_no_channel") @@ -607,9 +609,10 @@ func sendPushNotification(post *model.Post, user *model.User, channel *model.Cha } } else { if channel.Type == model.CHANNEL_DIRECT { - msg.Category = model.CATEGORY_DM + msg.Category = model.CATEGORY_CAN_REPLY msg.Message = senderName + userLocale("api.post.send_notifications_and_forget.push_message") } else if wasMentioned || channel.Type == model.CHANNEL_GROUP { + msg.Category = model.CATEGORY_CAN_REPLY msg.Message = senderName + userLocale("api.post.send_notifications_and_forget.push_mention") + channelName } else { msg.Message = senderName + userLocale("api.post.send_notifications_and_forget.push_non_mention") + channelName @@ -625,7 +628,7 @@ func sendPushNotification(post *model.Post, user *model.User, channel *model.Cha } } - l4g.Debug("Sending push notification for user %v with msg of '%v'", user.Id, msg.Message) + //l4g.Debug("Sending push notification for user %v with msg of '%v'", user.Id, msg.Message) for _, session := range sessions { tmpMessage := *model.PushNotificationFromJson(strings.NewReader(msg.ToJson())) diff --git a/model/push_notification.go b/model/push_notification.go index 654d1d9a5..69719e74c 100644 --- a/model/push_notification.go +++ b/model/push_notification.go @@ -18,7 +18,9 @@ const ( PUSH_TYPE_MESSAGE = "message" PUSH_TYPE_CLEAR = "clear" - CATEGORY_DM = "DIRECT_MESSAGE" + // The category is set to handle a set of interactive Actions + // with the push notifications + CATEGORY_CAN_REPLY = "CAN_REPLY" MHPNS = "https://push.mattermost.com" ) @@ -34,6 +36,8 @@ type PushNotification struct { ContentAvailable int `json:"cont_ava"` TeamId string `json:"team_id"` ChannelId string `json:"channel_id"` + PostId string `json:"post_id"` + RootId string `json:"root_id"` ChannelName string `json:"channel_name"` Type string `json:"type"` SenderId string `json:"sender_id"` |