IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

Avoid using app function so bulk loading does not fail when custom emojis are disabled (#9064)

Browse Source
This commit is contained in:
Joram Wilander
2018-07-12 16:28:04 -04:00
committed by GitHub
parent adc56ae78d
commit 5ddb08dcb4
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/import.go
View File

@@ -1948,11 +1948,11 @@ func (a *App) ImportEmoji(data *EmojiImportData, dryRun bool) *model.AppError {
}
var emoji *model.Emoji
var err *model.AppError
emoji, err = a.GetEmojiByName(*data.Name)
if err != nil && err.StatusCode != http.StatusNotFound {
return err
if result := <-a.Srv.Store.Emoji().GetByName(*data.Name); result.Err != nil && result.Err.StatusCode != http.StatusNotFound {
return result.Err
} else if result.Data != nil {
emoji = result.Data.(*model.Emoji)
}
alreadyExists := emoji != nil
@@ -1964,8 +1964,8 @@ func (a *App) ImportEmoji(data *EmojiImportData, dryRun bool) *model.AppError {
emoji.PreSave()
}
file, fileErr := os.Open(*data.Image)
if fileErr != nil {
file, err := os.Open(*data.Image)
if err != nil {
return model.NewAppError("BulkImport", "app.import.emoji.bad_file.error", map[string]interface{}{"EmojiName": *data.Name}, "", http.StatusBadRequest)
}