pleroma

commit: d7f4f65560cab7c07969c910ffdf742b159cbb22
parent: d5330ed12561377e5c464bcc2774ebc692b9ac07
Author: rinpatch <rinpatch@sdf.org>
Date:   Sat,  8 Jun 2019 10:10:34 +0000

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
Diffstat:
M
lib/pleroma/emoji.ex
4
+++-

1 file changed, 3 insertions(+), 1 deletion(-)
diff --git 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] || []