From be0ae364223efb1c32a8a1815583663071f255c5 Mon Sep 17 00:00:00 2001
From: George Goldberg <george@gberg.me>
Date: Mon, 28 Nov 2016 15:39:06 +0000
Subject: [PATCH] Fix failure to import same Slack archive to 2 teams. (#4650)

This fixes the issue where you can't import 2 Slack exports with any
users who's emails appear in both exports onto different teams of the
same server.

Fixes #4126
---
 api/slackimport.go | 6 +++++-
 i18n/en.json       | 4 ++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/api/slackimport.go b/api/slackimport.go
index 90e92cf0a1..15f5f43f43 100644
--- a/api/slackimport.go
+++ b/api/slackimport.go
@@ -162,7 +162,11 @@ 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
-			log.WriteString(utils.T("api.slackimport.slack_add_users.merge_existing", map[string]interface{}{"Email": existingUser.Email, "Username": existingUser.Username}))
+			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}))
+			}
 			continue
 		}
 
diff --git a/i18n/en.json b/i18n/en.json
index 10652ba72f..1cf41377ea 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -1643,6 +1643,10 @@
     "id": "api.slackimport.slack_add_users.merge_existing",
     "translation": "Merged user with existing account: {{.Email}}, {{.Username}}\r\n"
   },
+  {
+    "id": "api.slackimport.slack_add_users.merge_existing_failed",
+    "translation": "Tried to merge user with existing account: {{.Email}}, {{.Username}}, but failed to add the user to this team.\r\n"
+  },
   {
     "id": "api.slackimport.slack_add_users.unable_import",
     "translation": "Unable to import user: {{.Username}}\r\n"