summaryrefslogtreecommitdiffstats
path: root/store/sqlstore/emoji_store.go
diff options
context:
space:
mode:
Diffstat (limited to 'store/sqlstore/emoji_store.go')
-rw-r--r--store/sqlstore/emoji_store.go4
1 files changed, 4 insertions, 0 deletions
diff --git a/store/sqlstore/emoji_store.go b/store/sqlstore/emoji_store.go
index afd87b83d..971cafb6a 100644
--- a/store/sqlstore/emoji_store.go
+++ b/store/sqlstore/emoji_store.go
@@ -4,6 +4,7 @@
package sqlstore
import (
+ "database/sql"
"net/http"
"github.com/mattermost/mattermost-server/einterfaces"
@@ -118,6 +119,9 @@ func (es SqlEmojiStore) GetByName(name string) store.StoreChannel {
Name = :Name
AND DeleteAt = 0`, map[string]interface{}{"Name": name}); err != nil {
result.Err = model.NewAppError("SqlEmojiStore.GetByName", "store.sql_emoji.get_by_name.app_error", nil, "name="+name+", "+err.Error(), http.StatusInternalServerError)
+ if err == sql.ErrNoRows {
+ result.Err.StatusCode = http.StatusNotFound
+ }
} else {
result.Data = emoji
}