diff options
| author | Harrison Healey <harrisonmhealey@gmail.com> | 2018-01-10 14:22:51 -0500 |
|---|---|---|
| committer | Stephen Kiers <stephen@stephenkiers.com> | 2018-01-10 12:22:51 -0700 |
| commit | 90abd76d3fe4cf1ad88a74cf77eb3ec2b18a7198 (patch) | |
| tree | d6c0522d4aec4886e8f1e8b58664dee7f2e904ef /app/channel.go | |
| parent | edc4c35f5f612aea9956779df57ca6e5422f0601 (diff) | |
| download | chat-90abd76d3fe4cf1ad88a74cf77eb3ec2b18a7198.tar.gz chat-90abd76d3fe4cf1ad88a74cf77eb3ec2b18a7198.tar.bz2 chat-90abd76d3fe4cf1ad88a74cf77eb3ec2b18a7198.zip | |
PLT-8522 Added separate messages for being removed from channel or team (#8078)
Diffstat (limited to 'app/channel.go')
| -rw-r--r-- | app/channel.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/app/channel.go b/app/channel.go index d37f681bb..3480d5b0e 100644 --- a/app/channel.go +++ b/app/channel.go @@ -68,7 +68,7 @@ func (a *App) JoinDefaultChannels(teamId string, user *model.User, channelRole s l4g.Error(utils.T("api.channel.post_user_add_remove_message_and_forget.error"), err) } } else { - if err := a.PostAddToTeamMessage(requestor, user, townSquare, ""); err != nil { + if err := a.postAddToTeamMessage(requestor, user, townSquare, ""); err != nil { l4g.Error(utils.T("api.channel.post_user_add_remove_message_and_forget.error"), err) } } @@ -1058,7 +1058,7 @@ func (a *App) PostAddToChannelMessage(user *model.User, addedUser *model.User, c return nil } -func (a *App) PostAddToTeamMessage(user *model.User, addedUser *model.User, channel *model.Channel, postRootId string) *model.AppError { +func (a *App) postAddToTeamMessage(user *model.User, addedUser *model.User, channel *model.Channel, postRootId string) *model.AppError { post := &model.Post{ ChannelId: channel.Id, Message: fmt.Sprintf(utils.T("api.team.add_user_to_team.added"), addedUser.Username, user.Username), @@ -1078,10 +1078,10 @@ func (a *App) PostAddToTeamMessage(user *model.User, addedUser *model.User, chan return nil } -func (a *App) PostRemoveFromChannelMessage(removerUserId string, removedUser *model.User, channel *model.Channel) *model.AppError { +func (a *App) postRemoveFromChannelMessage(removerUserId string, removedUser *model.User, channel *model.Channel) *model.AppError { post := &model.Post{ ChannelId: channel.Id, - Message: fmt.Sprintf(utils.T("api.team.remove_user_from_team.removed"), removedUser.Username), + Message: fmt.Sprintf(utils.T("api.channel.remove_member.removed"), removedUser.Username), Type: model.POST_REMOVE_FROM_CHANNEL, UserId: removerUserId, Props: model.StringInterface{ @@ -1149,7 +1149,7 @@ func (a *App) RemoveUserFromChannel(userIdToRemove string, removerUserId string, a.postLeaveChannelMessage(user, channel) } else { a.Go(func() { - a.PostRemoveFromChannelMessage(removerUserId, user, channel) + a.postRemoveFromChannelMessage(removerUserId, user, channel) }) } |