aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorscarlett <nia@netbsd.org>2018-10-25 17:58:46 +0100
committerscarlett <nia@netbsd.org>2018-10-25 17:58:46 +0100
commitae5beb7b6464d9bc4532693987d9d94cd5bac6bd (patch)
tree1f5bef280113395c5ecbf17d378742e3b27177d0 /lib
parent945ce9910dc7b29147ec49af0bdb82202008c7c4 (diff)
downloadpleroma-ae5beb7b6464d9bc4532693987d9d94cd5bac6bd.tar.gz
Make finmoji optional
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/formatter.ex12
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 =