diff options
author | Ryan Wang <R-Wang97@users.noreply.github.com> | 2016-09-26 07:47:17 -0400 |
---|---|---|
committer | Joram Wilander <jwawilander@gmail.com> | 2016-09-26 07:47:17 -0400 |
commit | 1479c4a2caf6edcbf179680d811e6fa7ecf3b755 (patch) | |
tree | 8829ca96a80d7feb47ce69cdbab9bcd95b917e55 /api | |
parent | 6a5991360907384ffa5a06e90c17b2d17cb3689b (diff) | |
download | chat-1479c4a2caf6edcbf179680d811e6fa7ecf3b755.tar.gz chat-1479c4a2caf6edcbf179680d811e6fa7ecf3b755.tar.bz2 chat-1479c4a2caf6edcbf179680d811e6fa7ecf3b755.zip |
Message is displayed when user joins Off_Topic (#4067)
Diffstat (limited to 'api')
-rw-r--r-- | api/admin_test.go | 2 | ||||
-rw-r--r-- | api/channel.go | 27 |
2 files changed, 20 insertions, 9 deletions
diff --git a/api/admin_test.go b/api/admin_test.go index 7f3c584d8..c758bd4fe 100644 --- a/api/admin_test.go +++ b/api/admin_test.go @@ -211,7 +211,7 @@ func TestGetTeamAnalyticsStandard(t *testing.T) { t.Fatal() } - if rows[2].Value != 3 { + if rows[2].Value != 5 { t.Log(rows.ToJson()) t.Fatal() } diff --git a/api/channel.go b/api/channel.go index 734dac744..2950b8831 100644 --- a/api/channel.go +++ b/api/channel.go @@ -591,6 +591,14 @@ func JoinDefaultChannels(teamId string, user *model.User, channelRole string) *m var err *model.AppError = nil + fakeContext := &Context{ + Session: model.Session{ + UserId: user.Id, + }, + TeamId: teamId, + T: utils.TfuncWithFallback(user.Locale), + } + if result := <-Srv.Store.Channel().GetByName(teamId, "town-square"); result.Err != nil { err = result.Err } else { @@ -608,14 +616,6 @@ func JoinDefaultChannels(teamId string, user *model.User, channelRole string) *m UserId: user.Id, } - fakeContext := &Context{ - Session: model.Session{ - UserId: user.Id, - }, - TeamId: teamId, - T: utils.TfuncWithFallback(user.Locale), - } - if _, err := CreatePost(fakeContext, post, false); err != nil { l4g.Error(utils.T("api.channel.post_user_add_remove_message_and_forget.error"), err) } @@ -630,6 +630,17 @@ func JoinDefaultChannels(teamId string, user *model.User, channelRole string) *m if cmResult := <-Srv.Store.Channel().SaveMember(cm); cmResult.Err != nil { err = cmResult.Err } + + post := &model.Post{ + ChannelId: result.Data.(*model.Channel).Id, + Message: fmt.Sprintf(utils.T("api.channel.join_channel.post_and_forget"), user.Username), + Type: model.POST_JOIN_LEAVE, + UserId: user.Id, + } + + if _, err := CreatePost(fakeContext, post, false); err != nil { + l4g.Error(utils.T("api.channel.post_user_add_remove_message_and_forget.error"), err) + } } return err |