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 /app/slackimport.go | |
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 'app/slackimport.go')
-rw-r--r-- | app/slackimport.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/slackimport.go b/app/slackimport.go index 259d0a8d4..3e226203b 100644 --- a/app/slackimport.go +++ b/app/slackimport.go @@ -160,7 +160,7 @@ func SlackAddUsers(teamId string, slackusers []SlackUser, log *bytes.Buffer) map if result := <-Srv.Store.User().GetByEmail(email); result.Err == nil { existingUser := result.Data.(*model.User) addedUsers[sUser.Id] = existingUser - if err := JoinUserToTeam(team, addedUsers[sUser.Id]); err != nil { + if err := JoinUserToTeam(team, addedUsers[sUser.Id], ""); err != nil { log.WriteString(utils.T("api.slackimport.slack_add_users.merge_existing_failed", map[string]interface{}{"Email": existingUser.Email, "Username": existingUser.Username})) } else { log.WriteString(utils.T("api.slackimport.slack_add_users.merge_existing", map[string]interface{}{"Email": existingUser.Email, "Username": existingUser.Username})) |