Merge branch 'fix-emoji-pagination' into 'develop'

Fix for emoji pagination in pack show

See merge request pleroma/pleroma!2681
This commit is contained in:
lain 2020-06-24 15:23:20 +00:00
commit ae94fcc95f

View file

@ -45,6 +45,7 @@ def show(opts) do
shortcodes = shortcodes =
pack.files pack.files
|> Map.keys() |> Map.keys()
|> Enum.sort()
|> paginate(opts[:page], opts[:page_size]) |> paginate(opts[:page], opts[:page_size])
pack = Map.put(pack, :files, Map.take(pack.files, shortcodes)) pack = Map.put(pack, :files, Map.take(pack.files, shortcodes))