pleroma

commit: 0eb7464c10df109e8aacf734bb092f69192ab5c2
parent: 8ac104cde093991a77079186be02504c121a45fe
Author: Haelwenn <contact+git.pleroma.social@hacktivis.me>
Date:   Tue,  4 Jun 2019 11:26:42 +0000

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

Emoji: Don't die when files are present in the emoji folder.

Closes #957

See merge request pleroma/pleroma!1245
Diffstat:
M
lib/pleroma/emoji.ex
14
+++++++++++++-

1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/lib/pleroma/emoji.ex b/lib/pleroma/emoji.ex
@@ -97,10 +97,22 @@ defmodule Pleroma.Emoji do
         # There was some other error
         Logger.error("Could not access the custom emoji directory #{emoji_dir_path}: #{e}")
 
-      {:ok, packs} ->
+      {:ok, results} ->
+        grouped = Enum.group_by(results, &File.dir?/1)
+        packs = grouped[true] || []
+        files = grouped[false] || []
+
         # Print the packs we've found
         Logger.info("Found emoji packs: #{Enum.join(packs, ", ")}")
 
+        if not Enum.empty?(files) do
+          Logger.warn(
+            "Found files in the emoji folder. These will be ignored, please move them to a subdirectory\nFound files: #{
+              Enum.join(files, ", ")
+            }"
+          )
+        end
+
         emojis =
           Enum.flat_map(
             packs,