summaryrefslogtreecommitdiffstats
path: root/api4/emoji.go
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2018-01-19 09:37:59 -0500
committerHarrison Healey <harrisonmhealey@gmail.com>2018-01-19 09:37:59 -0500
commita8445775351c32f8a12081f60bda2099571b2758 (patch)
treebf5a6aace4bb5f4356d9103fbe1d68468e88ea22 /api4/emoji.go
parent9d6a9ff4be15f673e8364a984ccc2b2c3a465b73 (diff)
downloadchat-a8445775351c32f8a12081f60bda2099571b2758.tar.gz
chat-a8445775351c32f8a12081f60bda2099571b2758.tar.bz2
chat-a8445775351c32f8a12081f60bda2099571b2758.zip
Add sort query parameter to GET /emojis (#8121)
Diffstat (limited to 'api4/emoji.go')
-rw-r--r--api4/emoji.go8
1 files changed, 7 insertions, 1 deletions
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