diff options
author | Joram Wilander <jwawilander@gmail.com> | 2016-02-08 11:57:58 -0500 |
---|---|---|
committer | Joram Wilander <jwawilander@gmail.com> | 2016-02-08 11:57:58 -0500 |
commit | b6300b1656506b3ce264c8844dd11865ca61d391 (patch) | |
tree | 8ca776fd9683fb48f686eb444c62ba9820a886d2 /api/slackimport.go | |
parent | bb5ae99643237a9bf8bf48f494ddcd5ddf8eb5b5 (diff) | |
parent | 476822ca8d6bd2c09e3d81f3629dfed73076de66 (diff) | |
download | chat-b6300b1656506b3ce264c8844dd11865ca61d391.tar.gz chat-b6300b1656506b3ce264c8844dd11865ca61d391.tar.bz2 chat-b6300b1656506b3ce264c8844dd11865ca61d391.zip |
Merge pull request #2097 from mattermost/plt-1781
PLT-1781 Fixing slack import.
Diffstat (limited to 'api/slackimport.go')
-rw-r--r-- | api/slackimport.go | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/api/slackimport.go b/api/slackimport.go index 6497ac261..5ca209c5c 100644 --- a/api/slackimport.go +++ b/api/slackimport.go @@ -75,7 +75,10 @@ func SlackParseUsers(data io.Reader) []SlackUser { var users []SlackUser if err := decoder.Decode(&users); err != nil { - return make([]SlackUser, 0) + // This actually returns errors that are ignored. + // In this case it is erroring because of a null that Slack + // introduced. So we just return the users here. + return users } return users } |