Merge branch 'finmoji-optional' into 'develop'
Make finmoji optional See merge request pleroma/pleroma!391
This commit is contained in:
commit
9fe9c09883
|
@ -96,6 +96,7 @@
|
|||
"text/html",
|
||||
"text/markdown"
|
||||
],
|
||||
finmoji_enabled: true,
|
||||
mrf_transparency: true
|
||||
|
||||
config :pleroma, :markup,
|
||||
|
|
|
@ -94,9 +94,15 @@ def parse_mentions(text) 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 =
|
||||
|
|
Loading…
Reference in New Issue