diff options
| author | George Goldberg <george@gberg.me> | 2017-04-04 18:19:42 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-04 18:19:42 +0100 |
| commit | 32460bf63bc07c69ee5da0bb5640b879facb5538 (patch) | |
| tree | 2ee6abc94175823632e9f9ab40172948fcfa0f85 /api4 | |
| parent | 0b5c0794fdcbb551c1233dcdfbdf5c7deb585fd6 (diff) | |
| download | chat-32460bf63bc07c69ee5da0bb5640b879facb5538.tar.gz chat-32460bf63bc07c69ee5da0bb5640b879facb5538.tar.bz2 chat-32460bf63bc07c69ee5da0bb5640b879facb5538.zip | |
PLT-6198: Use added to channel system message on default channels. (#5969)
Use a different sytem message when a user was added to a default channel
by someone else than when they joined themselves.
Diffstat (limited to 'api4')
| -rw-r--r-- | api4/apitestlib.go | 2 | ||||
| -rw-r--r-- | api4/team.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/api4/apitestlib.go b/api4/apitestlib.go index eaeb827fc..bd36f49cc 100644 --- a/api4/apitestlib.go +++ b/api4/apitestlib.go @@ -362,7 +362,7 @@ func (me *TestHelper) UpdateActiveUser(user *model.User, active bool) { func LinkUserToTeam(user *model.User, team *model.Team) { utils.DisableDebugLogForTest() - err := app.JoinUserToTeam(team, user) + err := app.JoinUserToTeam(team, user, "") if err != nil { l4g.Error(err.Error()) l4g.Close() diff --git a/api4/team.go b/api4/team.go index 9bde841ab..22ab15bfd 100644 --- a/api4/team.go +++ b/api4/team.go @@ -407,7 +407,7 @@ func addTeamMembers(c *Context, w http.ResponseWriter, r *http.Request) { return } - members, err = app.AddTeamMembers(c.Params.TeamId, userIds) + members, err = app.AddTeamMembers(c.Params.TeamId, userIds, c.Session.UserId) if err != nil { c.Err = err |