diff options
| author | Ekaterina Vaartis <vaartis@cock.li> | 2019-04-21 22:46:55 +0300 |
|---|---|---|
| committer | Ekaterina Vaartis <vaartis@cock.li> | 2019-04-21 23:07:14 +0300 |
| commit | 3cefdc62e0dda75985221853fb123572d6fc068b (patch) | |
| tree | e109355e59687b643b01d0f9d870d4b35d168034 | |
| parent | ba19ba8a88c206f1570abdd22aa09a45b48a8de5 (diff) | |
| download | pleroma-3cefdc62e0dda75985221853fb123572d6fc068b.tar.gz | |
Fix emoji.txt / custom_emoji.txt / shortcode_globs handling
| -rw-r--r-- | lib/pleroma/emoji.ex | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/lib/pleroma/emoji.ex b/lib/pleroma/emoji.ex index 071c7f6cd..6390cce4c 100644 --- 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 |