diff options
| author | lain <lain@soykaf.club> | 2020-06-24 15:23:20 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-06-24 15:23:20 +0000 |
| commit | ae94fcc95f4ac105ed8c2b87dc36fbeea066866d (patch) | |
| tree | 2e07b0d07daaa8d5312ca5f95a4285220315a3a2 | |
| parent | 88ccade1cb59bf786e4ac8947688bc2b70391fe1 (diff) | |
| parent | aae1af8cf1d860243eb8c8a642682441294967e1 (diff) | |
| download | pleroma-ae94fcc95f4ac105ed8c2b87dc36fbeea066866d.tar.gz | |
Merge branch 'fix-emoji-pagination' into 'develop'
Fix for emoji pagination in pack show
See merge request pleroma/pleroma!2681
| -rw-r--r-- | lib/pleroma/emoji/pack.ex | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/pleroma/emoji/pack.ex b/lib/pleroma/emoji/pack.ex index 787ff8141..d076ae312 100644 --- a/lib/pleroma/emoji/pack.ex +++ b/lib/pleroma/emoji/pack.ex @@ -45,6 +45,7 @@ defmodule Pleroma.Emoji.Pack do shortcodes = pack.files |> Map.keys() + |> Enum.sort() |> paginate(opts[:page], opts[:page_size]) pack = Map.put(pack, :files, Map.take(pack.files, shortcodes)) |