diff options
author | Chris <ccbrown112@gmail.com> | 2018-03-07 12:36:40 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-03-07 12:36:40 -0600 |
commit | e8943936c51450540a4f2e8e7a2f3a2af90d14db (patch) | |
tree | bc7d32557780a2235a4f9a878d3b0841a1df0bda /app/slackimport.go | |
parent | fd9ee780ed713c10f122f9eb83e07bfdf09ce4a4 (diff) | |
download | chat-e8943936c51450540a4f2e8e7a2f3a2af90d14db.tar.gz chat-e8943936c51450540a4f2e8e7a2f3a2af90d14db.tar.bz2 chat-e8943936c51450540a4f2e8e7a2f3a2af90d14db.zip |
general cleanup (#8387)
Diffstat (limited to 'app/slackimport.go')
-rw-r--r-- | app/slackimport.go | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/app/slackimport.go b/app/slackimport.go index 9d1b4cf9c..ed522671a 100644 --- a/app/slackimport.go +++ b/app/slackimport.go @@ -109,13 +109,11 @@ func SlackParseUsers(data io.Reader) ([]SlackUser, error) { decoder := json.NewDecoder(data) var users []SlackUser - if err := decoder.Decode(&users); err != nil { - // 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, err - } - return users, nil + err := decoder.Decode(&users) + // 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, err } func SlackParsePosts(data io.Reader) ([]SlackPost, error) { |