diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-06-08 10:10:34 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-06-08 10:10:34 +0000 |
| commit | d7f4f65560cab7c07969c910ffdf742b159cbb22 (patch) | |
| tree | bf31be8dd09814da7df4911445490e9a09b46ab9 | |
| parent | d5330ed12561377e5c464bcc2774ebc692b9ac07 (diff) | |
| parent | cb3258c863f7485551eb28474d60f12547019d34 (diff) | |
| download | pleroma-d7f4f65560cab7c07969c910ffdf742b159cbb22.tar.gz pleroma-d7f4f65560cab7c07969c910ffdf742b159cbb22.zip | |
Merge branch 'bugfix/959-emoji-loading' into 'develop'
Emoji: Use full path to check if a file is a directory.
Closes #959
See merge request pleroma/pleroma!1257
| -rw-r--r-- | lib/pleroma/emoji.ex | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/pleroma/emoji.ex b/lib/pleroma/emoji.ex index de7fcc1ce..b77b26f7f 100644 --- a/lib/pleroma/emoji.ex +++ b/lib/pleroma/emoji.ex @@ -98,7 +98,9 @@ defmodule Pleroma.Emoji do Logger.error("Could not access the custom emoji directory #{emoji_dir_path}: #{e}") {:ok, results} -> - grouped = Enum.group_by(results, &File.dir?/1) + grouped = + Enum.group_by(results, fn file -> File.dir?(Path.join(emoji_dir_path, file)) end) + packs = grouped[true] || [] files = grouped[false] || [] |