summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorGeorge Goldberg <george@gberg.me>2016-10-05 13:14:36 +0100
committerJoram Wilander <jwawilander@gmail.com>2016-10-05 08:14:36 -0400
commitcd5bf7cb5a328f9c267abfd4083d395fbe559a64 (patch)
tree2049ebeb1b37581fa095024d882e260f20d8c438 /api
parent816a738d28bd475a445963b95eb854614a12a032 (diff)
downloadchat-cd5bf7cb5a328f9c267abfd4083d395fbe559a64.tar.gz
chat-cd5bf7cb5a328f9c267abfd4083d395fbe559a64.tar.bz2
chat-cd5bf7cb5a328f9c267abfd4083d395fbe559a64.zip
Correctly import Slack topic and purpose. (#4152)
In order to maintain consistency with how topic and purpose are used in Slack, the mapping is as follows: Slack -> Mattermost ===== ========== Purpose -> Purpose Topic -> Header
Diffstat (limited to 'api')
-rw-r--r--api/slackimport.go4
1 files changed, 3 insertions, 1 deletions
diff --git a/api/slackimport.go b/api/slackimport.go
index a374d335b..59d5f621a 100644
--- a/api/slackimport.go
+++ b/api/slackimport.go
@@ -22,6 +22,7 @@ type SlackChannel struct {
Name string `json:"name"`
Members []string `json:"members"`
Topic map[string]string `json:"topic"`
+ Purpose map[string]string `json:"purpose"`
}
type SlackUser struct {
@@ -242,7 +243,8 @@ func SlackAddChannels(teamId string, slackchannels []SlackChannel, posts map[str
Type: model.CHANNEL_OPEN,
DisplayName: sChannel.Name,
Name: SlackConvertChannelName(sChannel.Name),
- Purpose: sChannel.Topic["value"],
+ Purpose: sChannel.Purpose["value"],
+ Header: sChannel.Topic["value"],
}
mChannel := ImportChannel(&newChannel)
if mChannel == nil {