From a8445775351c32f8a12081f60bda2099571b2758 Mon Sep 17 00:00:00 2001
From: Joram Wilander <jwawilander@gmail.com>
Date: Fri, 19 Jan 2018 09:37:59 -0500
Subject: Add sort query parameter to GET /emojis (#8121)

---
 api4/emoji.go      | 8 +++++++-
 api4/emoji_test.go | 7 +++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

(limited to 'api4')

diff --git a/api4/emoji.go b/api4/emoji.go
index 341c565d8..049e77d3c 100644
--- a/api4/emoji.go
+++ b/api4/emoji.go
@@ -75,7 +75,13 @@ func getEmojiList(c *Context, w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	listEmoji, err := c.App.GetEmojiList(c.Params.Page, c.Params.PerPage)
+	sort := r.URL.Query().Get("sort")
+	if sort != "" && sort != model.EMOJI_SORT_BY_NAME {
+		c.SetInvalidUrlParam("sort")
+		return
+	}
+
+	listEmoji, err := c.App.GetEmojiList(c.Params.Page, c.Params.PerPage, sort)
 	if err != nil {
 		c.Err = err
 		return
diff --git a/api4/emoji_test.go b/api4/emoji_test.go
index 32492b704..3b0fecb2b 100644
--- a/api4/emoji_test.go
+++ b/api4/emoji_test.go
@@ -209,6 +209,13 @@ func TestGetEmojiList(t *testing.T) {
 	if len(listEmoji) != 1 {
 		t.Fatal("should only return 1")
 	}
+
+	listEmoji, resp = Client.GetSortedEmojiList(0, 100, model.EMOJI_SORT_BY_NAME)
+	CheckNoError(t, resp)
+
+	if len(listEmoji) == 0 {
+		t.Fatal("should return more than 0")
+	}
 }
 
 func TestDeleteEmoji(t *testing.T) {
-- 
cgit v1.2.3-1-g7c22