diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/formatter.ex | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/lib/pleroma/formatter.ex b/lib/pleroma/formatter.ex index 1756cc187..ecc102b62 100644 --- a/lib/pleroma/formatter.ex +++ b/lib/pleroma/formatter.ex @@ -94,9 +94,15 @@ defmodule Pleroma.Formatter do "woollysocks" ] - @finmoji_with_filenames Enum.map(@finmoji, fn finmoji -> - {finmoji, "/finmoji/128px/#{finmoji}-128.png"} - end) + @instance Application.get_env(:pleroma, :instance) + + @finmoji_with_filenames (if Keyword.get(@instance, :finmoji_enabled) do + Enum.map(@finmoji, fn finmoji -> + {finmoji, "/finmoji/128px/#{finmoji}-128.png"} + end) + else + [] + end) @emoji_from_file (with {:ok, default} <- File.read("config/emoji.txt") do custom = |