mirror of
https://git.pleroma.social/pleroma/pleroma.git
synced 2024-12-23 08:36:29 +00:00
Make finmoji optional
This commit is contained in:
parent
945ce9910d
commit
ae5beb7b64
2 changed files with 10 additions and 3 deletions
|
@ -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 ->
|
||||
@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 a new issue