Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop

[akkoma] / lib / pleroma / emoji.ex

diff --git a/lib/pleroma/emoji.ex b/lib/pleroma/emoji.ex
index 6f9bd3eda7d9c77005071a4a18677c2bdc9dcaf0..6390cce4c5ff13a00569d7c5eabb85a5fe00475f 100644 (file)
--- a/lib/pleroma/emoji.ex
+++ b/lib/pleroma/emoji.ex
@@ -101,22 +101,27 @@ defmodule Pleroma.Emoji do
         # Print the packs we've found
         Logger.info("Found emoji packs: #{Enum.join(packs, ", ")}")
 
-        # compat thing for old custom emoji handling
-        shortcode_globs = Application.get_env(:pleroma, :emoji)[:shortcode_globs] || []
-
         emojis =
-          (Enum.flat_map(
-             packs,
-             fn pack -> load_pack(Path.join(emoji_dir_path, pack)) end
-           ) ++
-             load_from_file("config/emoji.txt") ++
-             load_from_file("config/custom_emoji.txt") ++
-             load_from_globs(shortcode_globs))
-          |> Enum.reject(fn value -> value == nil end)
+          Enum.flat_map(
+            packs,
+            fn pack -> load_pack(Path.join(emoji_dir_path, pack)) end
+          )
 
         true = :ets.insert(@ets, emojis)
     end
 
+    # Compat thing for old custom emoji handling & default emoji,
+    # it should run even if there are no emoji packs
+    shortcode_globs = Application.get_env(:pleroma, :emoji)[:shortcode_globs] || []
+
+    emojis =
+      (load_from_file("config/emoji.txt") ++
+         load_from_file("config/custom_emoji.txt") ++
+         load_from_globs(shortcode_globs))
+      |> Enum.reject(fn value -> value == nil end)
+
+    true = :ets.insert(@ets, emojis)
+
     :ok
   end
 
@@ -132,12 +137,12 @@ defmodule Pleroma.Emoji do
         "No emoji.txt found for pack \"#{pack_name}\", assuming all .png files are emoji"
       )
 
-      make_shortcode_to_file_map(pack_dir, [".png"]) |>
-        Enum.map(fn {shortcode, rel_file} ->
-          filename = Path.join("/emoji/#{pack_name}", rel_file)
+      make_shortcode_to_file_map(pack_dir, [".png"])
+      |> Enum.map(fn {shortcode, rel_file} ->
+        filename = Path.join("/emoji/#{pack_name}", rel_file)
 
-          {shortcode, filename, [to_string(match_extra(@groups, filename))]}
-        end)
+        {shortcode, filename, [to_string(match_extra(@groups, filename))]}
+      end)
     end
   end