mirrors/akkoma
1
0
Fork 1
mirror of https://akkoma.dev/AkkomaGang/akkoma.git synced 2024-11-10 11:19:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

Make finmoji optional

Browse source
This commit is contained in:
scarlett 2018-10-25 17:58:46 +01:00
parent 945ce9910d
commit ae5beb7b64
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
config/config.exs
View file

@ -96,6 +96,7 @@ config :pleroma, :instance,
"text/html",
"text/markdown"
],
finmoji_enabled: true,
mrf_transparency: true
config :pleroma, :markup,

12
lib/pleroma/formatter.ex
View file

@ -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 =