From 1476ca5b2d2430858f5cfe8206815ec659393609 Mon Sep 17 00:00:00 2001 From: Saturnino Abril Date: Wed, 4 Apr 2018 02:22:06 +0800 Subject: revert default ephemeral post message for out of channel mention (#8571) --- app/notification.go | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'app/notification.go') diff --git a/app/notification.go b/app/notification.go index 6d0de2223..0ea03c9d9 100644 --- a/app/notification.go +++ b/app/notification.go @@ -99,7 +99,7 @@ func (a *App) SendNotifications(post *model.Post, team *model.Team, channel *mod outOfChannelMentions := result.Data.([]*model.User) if channel.Type != model.CHANNEL_GROUP { a.Go(func() { - a.sendOutOfChannelMentions(sender, post, channel.Type, outOfChannelMentions) + a.sendOutOfChannelMentions(sender, post, outOfChannelMentions) }) } } @@ -754,7 +754,7 @@ func (a *App) getMobileAppSessions(userId string) ([]*model.Session, *model.AppE } } -func (a *App) sendOutOfChannelMentions(sender *model.User, post *model.Post, channelType string, users []*model.User) *model.AppError { +func (a *App) sendOutOfChannelMentions(sender *model.User, post *model.Post, users []*model.User) *model.AppError { if len(users) == 0 { return nil } @@ -772,25 +772,16 @@ func (a *App) sendOutOfChannelMentions(sender *model.User, post *model.Post, cha T := utils.GetUserTranslations(sender.Locale) - var localePhrase string - if channelType == model.CHANNEL_OPEN { - localePhrase = T("api.post.check_for_out_of_channel_mentions.link.public") - } else if channelType == model.CHANNEL_PRIVATE { - localePhrase = T("api.post.check_for_out_of_channel_mentions.link.private") - } - ephemeralPostId := model.NewId() var message string if len(users) == 1 { message = T("api.post.check_for_out_of_channel_mentions.message.one", map[string]interface{}{ "Username": usernames[0], - "Phrase": localePhrase, }) } else { message = T("api.post.check_for_out_of_channel_mentions.message.multiple", map[string]interface{}{ "Usernames": strings.Join(usernames[:len(usernames)-1], ", @"), "LastUsername": usernames[len(usernames)-1], - "Phrase": localePhrase, }) } -- cgit v1.2.3-1-g7c22