From b8a4316b13bc0664648abda6b8d3de585d79173d Mon Sep 17 00:00:00 2001 From: Harrison Healey Date: Mon, 12 Feb 2018 11:09:51 -0500 Subject: ICU-753 Remove special behaviour for group messages in generic push notifications --- app/notification.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app/notification.go') diff --git a/app/notification.go b/app/notification.go index 1318308f8..2e99ca03c 100644 --- a/app/notification.go +++ b/app/notification.go @@ -607,7 +607,7 @@ func (a *App) sendPushNotification(post *model.Post, user *model.User, channel * if channel.Type == model.CHANNEL_DIRECT { 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 { + } else if wasMentioned { msg.Message = senderName + userLocale("api.post.send_notifications_and_forget.push_mention_no_channel") } else { msg.Message = senderName + userLocale("api.post.send_notifications_and_forget.push_non_mention_no_channel") @@ -616,7 +616,7 @@ func (a *App) sendPushNotification(post *model.Post, user *model.User, channel * if channel.Type == model.CHANNEL_DIRECT { 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 { + } else if wasMentioned { msg.Category = model.CATEGORY_CAN_REPLY msg.Message = senderName + userLocale("api.post.send_notifications_and_forget.push_mention") + channelName } else { -- cgit v1.2.3-1-g7c22