diff options
| author | kaniini <nenolod@gmail.com> | 2019-06-26 05:34:02 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2019-06-26 05:34:02 +0000 |
| commit | 9f8e645dce1c3b0b2e3b2d1547821241690c5027 (patch) | |
| tree | 47018b3ec7f2ed22d2317dbf2a6f0ca287d23c4f /lib | |
| parent | e6f036b9adf91aa81afc676c13ccecf04359241c (diff) | |
| parent | 41e4752950079b80e3d5a06d9806686bd3216dff (diff) | |
| download | pleroma-9f8e645dce1c3b0b2e3b2d1547821241690c5027.tar.gz pleroma-9f8e645dce1c3b0b2e3b2d1547821241690c5027.zip | |
Merge branch 'feature/configurable-pack-extensions' into 'develop'
Make default pack extensions configurable and default to png and gif
See merge request pleroma/pleroma!1338
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/emoji.ex | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/pleroma/emoji.ex b/lib/pleroma/emoji.ex index 854d46b1a..052501642 100644 --- a/lib/pleroma/emoji.ex +++ b/lib/pleroma/emoji.ex @@ -148,11 +148,13 @@ defmodule Pleroma.Emoji do if File.exists?(emoji_txt) do load_from_file(emoji_txt, emoji_groups) else + extensions = Pleroma.Config.get([:emoji, :pack_extensions]) + Logger.info( - "No emoji.txt found for pack \"#{pack_name}\", assuming all .png files are emoji" + "No emoji.txt found for pack \"#{pack_name}\", assuming all #{Enum.join(extensions, ", ")} files are emoji" ) - make_shortcode_to_file_map(pack_dir, [".png"]) + make_shortcode_to_file_map(pack_dir, extensions) |> Enum.map(fn {shortcode, rel_file} -> filename = Path.join("/emoji/#{pack_name}", rel_file) |