1 files changed, 39 insertions, 9 deletions

diff --git a/store/sqlstore/emoji_store.go b/store/sqlstore/emoji_store.go
index 9ef071f02..afd87b83d 100644
--- a/store/sqlstore/emoji_store.go
+++ b/store/sqlstore/emoji_store.go
@@ -46,6 +46,7 @@ func (es SqlEmojiStore) CreateIndexesIfNotExists() {
 	es.CreateIndexIfNotExists("idx_emoji_update_at", "Emoji", "UpdateAt")
 	es.CreateIndexIfNotExists("idx_emoji_create_at", "Emoji", "CreateAt")
 	es.CreateIndexIfNotExists("idx_emoji_delete_at", "Emoji", "DeleteAt")
+	es.CreateIndexIfNotExists("idx_emoji_name", "Emoji", "Name")
 }
 
 func (es SqlEmojiStore) Save(emoji *model.Emoji) store.StoreChannel {
@@ -123,18 +124,19 @@ func (es SqlEmojiStore) GetByName(name string) store.StoreChannel {
 	})
 }
 
-func (es SqlEmojiStore) GetList(offset, limit int) store.StoreChannel {
+func (es SqlEmojiStore) GetList(offset, limit int, sort string) store.StoreChannel {
 	return store.Do(func(result *store.StoreResult) {
 		var emoji []*model.Emoji
 
-		if _, err := es.GetReplica().Select(&emoji,
-			`SELECT
-				*
-			FROM
-				Emoji
-			WHERE
-				DeleteAt = 0
-			LIMIT :Limit OFFSET :Offset`, map[string]interface{}{"Offset": offset, "Limit": limit}); err != nil {
+		query := "SELECT * FROM Emoji WHERE DeleteAt = 0"
+
+		if sort == model.EMOJI_SORT_BY_NAME {
+			query += " ORDER BY Name"
+		}
+
+		query += " LIMIT :Limit OFFSET :Offset"
+
+		if _, err := es.GetReplica().Select(&emoji, query, map[string]interface{}{"Offset": offset, "Limit": limit}); err != nil {
 			result.Err = model.NewAppError("SqlEmojiStore.GetList", "store.sql_emoji.get_all.app_error", nil, err.Error(), http.StatusInternalServerError)
 		} else {
 			result.Data = emoji
@@ -161,3 +163,31 @@ func (es SqlEmojiStore) Delete(id string, time int64) store.StoreChannel {
 		emojiCache.Remove(id)
 	})
 }
+
+func (es SqlEmojiStore) Search(name string, prefixOnly bool, limit int) store.StoreChannel {
+	return store.Do(func(result *store.StoreResult) {
+		var emojis []*model.Emoji
+
+		term := ""
+		if !prefixOnly {
+			term = "%"
+		}
+
+		term += name + "%"
+
+		if _, err := es.GetReplica().Select(&emojis,
+			`SELECT
+				*
+			FROM
+				Emoji
+			WHERE
+				Name LIKE :Name
+				AND DeleteAt = 0
+				ORDER BY Name
+				LIMIT :Limit`, map[string]interface{}{"Name": term, "Limit": limit}); err != nil {
+			result.Err = model.NewAppError("SqlEmojiStore.Search", "store.sql_emoji.get_by_name.app_error", nil, "name="+name+", "+err.Error(), http.StatusInternalServerError)
+		} else {
+			result.Data = emojis
+		}
+	})
+}