diff options
author | Joram Wilander <jwawilander@gmail.com> | 2015-09-14 14:32:15 -0400 |
---|---|---|
committer | Joram Wilander <jwawilander@gmail.com> | 2015-09-14 14:32:15 -0400 |
commit | 125b7dc71bb3ef00dc038632bf71737e5d25158b (patch) | |
tree | bea7dc36e248391ceba9323f07c9d516c7b5af1a /api | |
parent | 0d8e27ce94c53b628109cc6ad11feeb2a1e4de88 (diff) | |
parent | 7b3c2d6d85ecee86fbc85b440e7028018b1090b1 (diff) | |
download | chat-125b7dc71bb3ef00dc038632bf71737e5d25158b.tar.gz chat-125b7dc71bb3ef00dc038632bf71737e5d25158b.tar.bz2 chat-125b7dc71bb3ef00dc038632bf71737e5d25158b.zip |
Merge pull request #677 from mattermost/plt-50
PLT-50 Allowing channel names with underscores. Allow import of more slack channel names.
Diffstat (limited to 'api')
-rw-r--r-- | api/slackimport.go | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/api/slackimport.go b/api/slackimport.go index 1d037a934..4e6c01dbb 100644 --- a/api/slackimport.go +++ b/api/slackimport.go @@ -50,6 +50,15 @@ func SlackConvertTimeStamp(ts string) int64 { return timeStamp * 1000 // Convert to milliseconds } +func SlackConvertChannelName(channelName string) string { + newName := strings.Trim(channelName, "_-") + if len(newName) == 1 { + return "slack-channel-" + newName + } + + return newName +} + func SlackParseChannels(data io.Reader) []SlackChannel { decoder := json.NewDecoder(data) @@ -172,7 +181,7 @@ func SlackAddChannels(teamId string, slackchannels []SlackChannel, posts map[str TeamId: teamId, Type: model.CHANNEL_OPEN, DisplayName: sChannel.Name, - Name: sChannel.Name, + Name: SlackConvertChannelName(sChannel.Name), Description: sChannel.Topic["value"], } mChannel := ImportChannel(&newChannel) |