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/team.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/team.go')
-rw-r--r-- | app/team.go | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/app/team.go b/app/team.go index 00808b200..b12904ab3 100644 --- a/app/team.go +++ b/app/team.go @@ -621,7 +621,7 @@ func (a *App) LeaveTeam(team *model.Team, user *model.User, requestorId string) l4g.Error(utils.T("api.channel.post_user_add_remove_message_and_forget.error"), err) } } else { - if err := a.PostRemoveFromChannelMessage(user.Id, user, channel); err != nil { + if err := a.postRemoveFromTeamMessage(user, channel); err != nil { l4g.Error(utils.T("api.channel.post_user_add_remove_message_and_forget.error"), err) } } @@ -672,6 +672,24 @@ func (a *App) postLeaveTeamMessage(user *model.User, channel *model.Channel) *mo return nil } +func (a *App) postRemoveFromTeamMessage(user *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"), user.Username), + Type: model.POST_REMOVE_FROM_TEAM, + UserId: user.Id, + Props: model.StringInterface{ + "removedUsername": user.Username, + }, + } + + if _, err := a.CreatePost(post, channel, false); err != nil { + return model.NewAppError("postRemoveFromTeamMessage", "api.channel.post_user_add_remove_message_and_forget.error", nil, err.Error(), http.StatusInternalServerError) + } + + return nil +} + func (a *App) InviteNewUsersToTeam(emailList []string, teamId, senderId string) *model.AppError { if len(emailList) == 0 { err := model.NewAppError("InviteNewUsersToTeam", "api.team.invite_members.no_one.app_error", nil, "", http.StatusBadRequest) |