diff options
author | Tsilavina Razafinirina <t.razafinirina@gmail.com> | 2017-12-08 22:15:33 +0300 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2017-12-08 11:15:33 -0800 |
commit | 0cdf969ac71440cd52dd5b069a9068a9e5d49bd3 (patch) | |
tree | 154c3afa779b31554eaba867d97b265d293450be /app | |
parent | 617a98d6d8a48e347921bdcaa5155b4022174d87 (diff) | |
download | chat-0cdf969ac71440cd52dd5b069a9068a9e5d49bd3.tar.gz chat-0cdf969ac71440cd52dd5b069a9068a9e5d49bd3.tar.bz2 chat-0cdf969ac71440cd52dd5b069a9068a9e5d49bd3.zip |
PLT-6217-bis Fixes system message posted to Town Square when a user joins a team #7863 (#7864)
* Adds new string post message when a user has joined a team (#6483)
* Simplifies long if statement in post.go (#6483)
Diffstat (limited to 'app')
-rw-r--r-- | app/channel.go | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/app/channel.go b/app/channel.go index caaacea06..4dc1f349f 100644 --- a/app/channel.go +++ b/app/channel.go @@ -64,7 +64,7 @@ func (a *App) JoinDefaultChannels(teamId string, user *model.User, channelRole s } if requestor == nil { - if err := a.postJoinChannelMessage(user, townSquare); err != nil { + if err := a.postJoinTeamMessage(user, townSquare); err != nil { l4g.Error(utils.T("api.channel.post_user_add_remove_message_and_forget.error"), err) } } else { @@ -965,6 +965,24 @@ func (a *App) postJoinChannelMessage(user *model.User, channel *model.Channel) * return nil } +func (a *App) postJoinTeamMessage(user *model.User, channel *model.Channel) *model.AppError { + post := &model.Post{ + ChannelId: channel.Id, + Message: fmt.Sprintf(utils.T("api.team.join_team.post_and_forget"), user.Username), + Type: model.POST_JOIN_TEAM, + UserId: user.Id, + Props: model.StringInterface{ + "username": user.Username, + }, + } + + if _, err := a.CreatePost(post, channel, false); err != nil { + return model.NewAppError("postJoinTeamMessage", "api.channel.post_user_add_remove_message_and_forget.error", nil, err.Error(), http.StatusInternalServerError) + } + + return nil +} + func (a *App) LeaveChannel(channelId string, userId string) *model.AppError { sc := a.Srv.Store.Channel().Get(channelId, true) uc := a.Srv.Store.User().Get(userId) |