summaryrefslogtreecommitdiffstats
path: root/api/slackimport.go
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2015-08-18 11:53:18 -0400
committerChristopher Speller <crspeller@gmail.com>2015-08-19 08:53:52 -0400
commit9222e191aab9397b6a7c6713d1b0b0b96b421de7 (patch)
treebdc90c7467bcab3f0755312ff0cfdb6ecddc20ff /api/slackimport.go
parenta7e935af9c7e6254ca45e0286b05b5eb6d8283a6 (diff)
downloadchat-9222e191aab9397b6a7c6713d1b0b0b96b421de7.tar.gz
chat-9222e191aab9397b6a7c6713d1b0b0b96b421de7.tar.bz2
chat-9222e191aab9397b6a7c6713d1b0b0b96b421de7.zip
Requiring team admin to import and fixing a few style issues
Diffstat (limited to 'api/slackimport.go')
-rw-r--r--api/slackimport.go8
1 files changed, 3 insertions, 5 deletions
diff --git a/api/slackimport.go b/api/slackimport.go
index c662181cb..ca3fdf3d1 100644
--- a/api/slackimport.go
+++ b/api/slackimport.go
@@ -24,7 +24,7 @@ type SlackChannel struct {
type SlackUser struct {
Id string `json:"id"`
- UserName string `json:"name"`
+ Username string `json:"name"`
Profile map[string]string `json:"profile"`
}
@@ -85,7 +85,6 @@ func SlackAddUsers(teamId string, slackusers []SlackUser, log *bytes.Buffer) map
log.WriteString("\n Users Created\n")
log.WriteString("===============\n\n")
- // Add users
addedUsers := make(map[string]*model.User)
for _, sUser := range slackusers {
firstName := ""
@@ -101,7 +100,7 @@ func SlackAddUsers(teamId string, slackusers []SlackUser, log *bytes.Buffer) map
newUser := model.User{
TeamId: teamId,
- Username: sUser.UserName,
+ Username: sUser.Username,
FirstName: firstName,
LastName: lastName,
Email: sUser.Profile["email"],
@@ -112,7 +111,7 @@ func SlackAddUsers(teamId string, slackusers []SlackUser, log *bytes.Buffer) map
addedUsers[sUser.Id] = mUser
log.WriteString("Email, Password: " + newUser.Email + ", " + password + "\n")
} else {
- log.WriteString("Unable to import user: " + sUser.UserName)
+ log.WriteString("Unable to import user: " + sUser.Username)
}
}
@@ -167,7 +166,6 @@ func SlackAddChannels(teamId string, slackchannels []SlackChannel, posts map[str
log.WriteString("\n Channels Added \n")
log.WriteString("=================\n\n")
- // Add channels
addedChannels := make(map[string]*model.Channel)
for _, sChannel := range slackchannels {
newChannel := model.Channel{