summaryrefslogtreecommitdiffstats
path: root/app/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 /app/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 'app/emoji.go')
-rw-r--r--app/emoji.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/emoji.go b/app/emoji.go
index f62a8686b..2786af9c9 100644
--- a/app/emoji.go
+++ b/app/emoji.go
@@ -66,8 +66,8 @@ func (a *App) CreateEmoji(sessionUserId string, emoji *model.Emoji, multiPartIma
}
}
-func (a *App) GetEmojiList(page, perPage int) ([]*model.Emoji, *model.AppError) {
- if result := <-a.Srv.Store.Emoji().GetList(page*perPage, perPage); result.Err != nil {
+func (a *App) GetEmojiList(page, perPage int, sort string) ([]*model.Emoji, *model.AppError) {
+ if result := <-a.Srv.Store.Emoji().GetList(page*perPage, perPage, sort); result.Err != nil {
return nil, result.Err
} else {
return result.Data.([]*model.Emoji), nil