5 files changed, 44 insertions, 12 deletions
diff --git a/api/channel.go b/api/channel.go
index 4b0e99b20..5f0d03246 100644
--- a/api/channel.go
+++ b/api/channel.go
@@ -513,9 +513,18 @@ func AddUserToChannel(user *model.User, channel *model.Channel) (*model.ChannelM
 		return nil, model.NewLocAppError("AddUserToChannel", "api.channel.add_user_to_channel.type.app_error", nil, "")
 	}
 
+	if result := <-Srv.Store.Channel().GetMember(channel.Id, user.Id); result.Err != nil {
+		if result.Err.Id != store.MISSING_MEMBER_ERROR {
+			return nil, result.Err
+		}
+	} else {
+		channelMember := result.Data.(model.ChannelMember)
+		return &channelMember, nil
+	}
+
 	newMember := &model.ChannelMember{ChannelId: channel.Id, UserId: user.Id, NotifyProps: model.GetDefaultChannelNotifyProps()}
-	if cmresult := <-Srv.Store.Channel().SaveMember(newMember); cmresult.Err != nil {
-		l4g.Error("Failed to add member user_id=%v channel_id=%v err=%v", user.Id, channel.Id, cmresult.Err)
+	if result := <-Srv.Store.Channel().SaveMember(newMember); result.Err != nil {
+		l4g.Error("Failed to add member user_id=%v channel_id=%v err=%v", user.Id, channel.Id, result.Err)
 		return nil, model.NewLocAppError("AddUserToChannel", "api.channel.add_user.to.channel.failed.app_error", nil, "")
 	}
 
diff --git a/api/channel_test.go b/api/channel_test.go
index 8ac785f77..a70e5532a 100644
--- a/api/channel_test.go
+++ b/api/channel_test.go
@@ -691,8 +691,8 @@ func TestAddChannelMember(t *testing.T) {
 		t.Fatal("Should have errored, bad user id")
 	}
 
-	if _, err := Client.AddChannelMember(channel1.Id, user2.Id); err == nil {
-		t.Fatal("Should have errored, user already a member")
+	if _, err := Client.AddChannelMember(channel1.Id, user2.Id); err != nil {
+		t.Fatal(err)
 	}
 
 	if _, err := Client.AddChannelMember("sgdsgsdg", user2.Id); err == nil {
diff --git a/api/import.go b/api/import.go
index c39ec5220..59d098d93 100644
--- a/api/import.go
+++ b/api/import.go
@@ -22,7 +22,7 @@ func ImportPost(post *model.Post) {
 	}
 }
 
-func ImportUser(teamId string, user *model.User) *model.User {
+func ImportUser(team *model.Team, user *model.User) *model.User {
 	user.MakeNonNil()
 
 	if result := <-Srv.Store.User().Save(user); result.Err != nil {
@@ -31,14 +31,14 @@ func ImportUser(teamId string, user *model.User) *model.User {
 	} else {
 		ruser := result.Data.(*model.User)
 
-		if err := JoinDefaultChannels(teamId, ruser, ""); err != nil {
-			l4g.Error(utils.T("api.import.import_user.joining_default.error"), ruser.Id, teamId, err)
-		}
-
 		if cresult := <-Srv.Store.User().VerifyEmail(ruser.Id); cresult.Err != nil {
 			l4g.Error(utils.T("api.import.import_user.set_email.error"), cresult.Err)
 		}
 
+		if err := JoinUserToTeam(team, user); err != nil {
+			l4g.Error(utils.T("api.import.import_user.join_team.error"), err)
+		}
+
 		return ruser
 	}
 }
diff --git a/api/slackimport.go b/api/slackimport.go
index 4319fe409..df43e1a8b 100644
--- a/api/slackimport.go
+++ b/api/slackimport.go
@@ -99,6 +99,16 @@ func SlackAddUsers(teamId string, slackusers []SlackUser, log *bytes.Buffer) map
 	log.WriteString("===============\r\n\r\n")
 
 	addedUsers := make(map[string]*model.User)
+
+	// Need the team
+	var team *model.Team
+	if result := <-Srv.Store.Team().Get(teamId); result.Err != nil {
+		log.WriteString(utils.T("api.slackimport.slack_import.team_fail"))
+		return addedUsers
+	} else {
+		team = result.Data.(*model.Team)
+	}
+
 	for _, sUser := range slackusers {
 		firstName := ""
 		lastName := ""
@@ -119,7 +129,7 @@ func SlackAddUsers(teamId string, slackusers []SlackUser, log *bytes.Buffer) map
 			Password:  password,
 		}
 
-		if mUser := ImportUser(teamId, &newUser); mUser != nil {
+		if mUser := ImportUser(team, &newUser); mUser != nil {
 			addedUsers[sUser.Id] = mUser
 			log.WriteString(utils.T("api.slackimport.slack_add_users.email_pwd", map[string]interface{}{"Email": newUser.Email, "Password": password}))
 		} else {
@@ -173,6 +183,18 @@ func SlackAddPosts(channel *model.Channel, posts []SlackPost, users map[string]*
 	}
 }
 
+func addSlackUsersToChannel(members []string, users map[string]*model.User, channel *model.Channel, log *bytes.Buffer) {
+	for _, member := range members {
+		if user, ok := users[member]; !ok {
+			log.WriteString(utils.T("api.slackimport.slack_add_channels.failed_to_add_user", map[string]interface{}{"Username": "?"}))
+		} else {
+			if _, err := AddUserToChannel(user, channel); err != nil {
+				log.WriteString(utils.T("api.slackimport.slack_add_channels.failed_to_add_user", map[string]interface{}{"Username": user.Username}))
+			}
+		}
+	}
+}
+
 func SlackAddChannels(teamId string, slackchannels []SlackChannel, posts map[string][]SlackPost, users map[string]*model.User, log *bytes.Buffer) map[string]*model.Channel {
 	// Write Header
 	log.WriteString(utils.T("api.slackimport.slack_add_channels.added"))
@@ -199,6 +221,7 @@ func SlackAddChannels(teamId string, slackchannels []SlackChannel, posts map[str
 				log.WriteString(utils.T("api.slackimport.slack_add_channels.merge", map[string]interface{}{"DisplayName": newChannel.DisplayName}))
 			}
 		}
+		addSlackUsersToChannel(sChannel.Members, users, mChannel, log)
 		log.WriteString(newChannel.DisplayName + "\r\n")
 		addedChannels[sChannel.Id] = mChannel
 		SlackAddPosts(mChannel, posts[sChannel.Name], users)
diff --git a/api/team.go b/api/team.go
index eefdc3d85..6db8bc245 100644
--- a/api/team.go
+++ b/api/team.go
@@ -40,8 +40,8 @@ func InitTeam() {
 	BaseRoutes.NeedTeam.Handle("/add_user_to_team", ApiUserRequired(addUserToTeam)).Methods("POST")
 
 	// These should be moved to the global admain console
-	BaseRoutes.Teams.Handle("/import_team", ApiUserRequired(importTeam)).Methods("POST")
-	BaseRoutes.Teams.Handle("/export_team", ApiUserRequired(exportTeam)).Methods("GET")
+	BaseRoutes.NeedTeam.Handle("/import_team", ApiUserRequired(importTeam)).Methods("POST")
+	BaseRoutes.NeedTeam.Handle("/export_team", ApiUserRequired(exportTeam)).Methods("GET")
 	BaseRoutes.Teams.Handle("/add_user_to_team_from_invite", ApiUserRequired(addUserToTeamFromInvite)).Methods("POST")
 }