diff options
| author | George Goldberg <george@gberg.me> | 2017-07-05 15:49:30 +0100 |
|---|---|---|
| committer | Corey Hulen <corey@hulen.com> | 2017-07-05 07:49:30 -0700 |
| commit | 65289f26e7bffd576d2567736774cc5334a79788 (patch) | |
| tree | 951079ba15e15c81b5b69e7be83a774b718792f4 /app/import.go | |
| parent | 4219d39e97bfe646e28696f9871fc8c1b8310154 (diff) | |
| download | chat-65289f26e7bffd576d2567736774cc5334a79788.tar.gz chat-65289f26e7bffd576d2567736774cc5334a79788.tar.bz2 chat-65289f26e7bffd576d2567736774cc5334a79788.zip | |
Fix some duplicate message IDs in Bulk Importer. (#6850)
Diffstat (limited to 'app/import.go')
| -rw-r--r-- | app/import.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/import.go b/app/import.go index 0a607e68e..ac5232309 100644 --- a/app/import.go +++ b/app/import.go @@ -1081,14 +1081,14 @@ func ImportDirectPost(data *DirectPostImportData, dryRun bool) *model.AppError { if len(userIds) == 2 { ch, err := createDirectChannel(userIds[0], userIds[1]) if err != nil && err.Id != store.CHANNEL_EXISTS_ERROR { - return model.NewAppError("BulkImport", "app.import.import_direct_channel.create_direct_channel.error", nil, "", http.StatusBadRequest) + return model.NewAppError("BulkImport", "app.import.import_direct_post.create_direct_channel.error", nil, "", http.StatusBadRequest) } else { channel = ch } } else { ch, err := createGroupChannel(userIds, userIds[0]) if err != nil && err.Id != store.CHANNEL_EXISTS_ERROR { - return model.NewAppError("BulkImport", "app.import.import_direct_channel.create_group_channel.error", nil, "", http.StatusBadRequest) + return model.NewAppError("BulkImport", "app.import.import_direct_post.create_group_channel.error", nil, "", http.StatusBadRequest) } else { channel = ch } |