Skip to content
Snippets Groups Projects
Commit ae5beb7b authored by scarlett's avatar scarlett
Browse files

Make finmoji optional

parent 945ce991
Branches
No related tags found
No related merge requests found
......@@ -96,6 +96,7 @@ config :pleroma, :instance,
"text/html",
"text/markdown"
],
finmoji_enabled: true,
mrf_transparency: true
config :pleroma, :markup,
......
......@@ -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 =
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment