From 32460bf63bc07c69ee5da0bb5640b879facb5538 Mon Sep 17 00:00:00 2001 From: George Goldberg Date: Tue, 4 Apr 2017 18:19:42 +0100 Subject: 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. --- app/slackimport.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/slackimport.go') 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})) -- cgit v1.2.3-1-g7c22