Add sort query parameter to GET /emojis (#8121)

2 files changed, 13 insertions, 0 deletions

diff --git a/model/client4.go b/model/client4.go
index 88645ec74..c44855993 100644
--- a/model/client4.go
+++ b/model/client4.go
@@ -3023,6 +3023,18 @@ func (c *Client4) GetEmojiList(page, perPage int) ([]*Emoji, *Response) {
 	}
 }
 
+// GetSortedEmojiList returns a page of custom emoji on the system sorted based on the sort
+// parameter, blank for no sorting and "name" to sort by emoji names.
+func (c *Client4) GetSortedEmojiList(page, perPage int, sort string) ([]*Emoji, *Response) {
+	query := fmt.Sprintf("?page=%v&per_page=%v&sort=%v", page, perPage, sort)
+	if r, err := c.DoApiGet(c.GetEmojisRoute()+query, ""); err != nil {
+		return nil, BuildErrorResponse(r, err)
+	} else {
+		defer closeBody(r)
+		return EmojiListFromJson(r.Body), BuildResponse(r)
+	}
+}
+
 // DeleteEmoji delete an custom emoji on the provided emoji id string.
 func (c *Client4) DeleteEmoji(emojiId string) (bool, *Response) {
 	if r, err := c.DoApiDelete(c.GetEmojiRoute(emojiId)); err != nil {
diff --git a/model/emoji.go b/model/emoji.go
index 784fe832b..3deff4c5f 100644
--- a/model/emoji.go
+++ b/model/emoji.go
@@ -11,6 +11,7 @@ import (
 
 const (
 	EMOJI_NAME_MAX_LENGTH = 64
+	EMOJI_SORT_BY_NAME    = "name"
 )
 
 type Emoji struct {