summaryrefslogtreecommitdiffstats
path: root/app/emoji.go
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2017-07-04 02:58:02 -0400
committerChristopher Speller <crspeller@gmail.com>2017-07-03 23:58:02 -0700
commitf54aee1ef5466fdf11803cd75be3b7267e68540f (patch)
tree6a7dbf14839186ab7c2c9c357a0dc43d7d524329 /app/emoji.go
parent02335ddad42dcd048f8ef9f371dde90bdaedc1eb (diff)
downloadchat-f54aee1ef5466fdf11803cd75be3b7267e68540f.tar.gz
chat-f54aee1ef5466fdf11803cd75be3b7267e68540f.tar.bz2
chat-f54aee1ef5466fdf11803cd75be3b7267e68540f.zip
Add paging to the GET /emojis endpoint (#6802)
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 9f09617e8..564085d82 100644
--- a/app/emoji.go
+++ b/app/emoji.go
@@ -66,8 +66,8 @@ func CreateEmoji(sessionUserId string, emoji *model.Emoji, multiPartImageData *m
}
}
-func GetEmojiList() ([]*model.Emoji, *model.AppError) {
- if result := <-Srv.Store.Emoji().GetAll(); result.Err != nil {
+func GetEmojiList(page, perPage int) ([]*model.Emoji, *model.AppError) {
+ if result := <-Srv.Store.Emoji().GetList(page*perPage, perPage); result.Err != nil {
return nil, result.Err
} else {
return result.Data.([]*model.Emoji), nil