IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixing slack import. (#2819)

Browse Source
This commit is contained in:
Christopher Speller
2016-04-28 16:29:13 -04:00
committed by Joram Wilander
parent 938caa061d
commit f3fa435a1b
6 changed files with 48 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
api/import.go
View File

@@ -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
}
}

25
api/slackimport.go
View File

@@ -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)

4
api/team.go
View File

@@ -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")
}

12
i18n/en.json
View File

@@ -667,6 +667,10 @@
"id": "api.import.import_user.set_email.error",
"translation": "Failed to set email verified err=%v"
},
{
"id": "api.import.import_user.join_team.error",
"translation": "Failed to join team when importing err=%v"
},
{
"id": "api.license.add_license.array.app_error",
"translation": "Empty array under 'license' in request"
@@ -995,6 +999,10 @@
"id": "api.slackimport.slack_add_channels.merge",
"translation": "Merged with existing channel: {{.DisplayName}}\r\n"
},
{
"id": "api.slackimport.slack_add_channels.failed_to_add_user",
"translation": "Failed to add user to channel: {{.Username}}\r\n"
},
{
"id": "api.slackimport.slack_add_posts.bot.warn",
"translation": "Slack bot posts are not imported yet"
@@ -1035,6 +1043,10 @@
"id": "api.slackimport.slack_import.log",
"translation": "Mattermost Slack Import Log\r\n"
},
{
"id": "api.slackimport.slack_import.team_fail",
"translation": "Failed to get team to import into.\r\n"
},
{
"id": "api.slackimport.slack_import.note1",
"translation": "- Some posts may not have been imported because they where not supported by this importer.\r\n"

5
webapp/client/client.jsx
View File

@@ -348,10 +348,9 @@ export default class Client {
importSlack = (fileData, success, error) => {
request.
post(`${this.getTeamsRoute()}/import_team`).
post(`${this.getTeamNeededRoute()}/import_team`).
set(this.defaultHeaders).
type('application/json').
accept('application/json').
accept('application/octet-stream').
send(fileData).
end(this.handleResponse.bind(this, 'importSlack', success, error));
}

6
webapp/components/team_import_tab.jsx
View File

@@ -33,8 +33,8 @@ class TeamImportTab extends React.Component {
this.setState({status: 'fail', link: ''});
}
onImportSuccess(data) {
this.setState({status: 'done', link: 'data:application/octet-stream;charset=utf-8,' + encodeURIComponent(data)});
onImportSuccess(data, res) {
this.setState({status: 'done', link: 'data:application/octet-stream;charset=utf-8,' + encodeURIComponent(res.text)});
}
doImportSlack(file) {
@@ -167,4 +167,4 @@ TeamImportTab.propTypes = {
intl: intlShape.isRequired
};
export default injectIntl(TeamImportTab);
export default injectIntl(TeamImportTab);