Merge branch 'finmoji-optional' into 'develop'

Make finmoji optional

See merge request pleroma/pleroma!391
This commit is contained in:
kaniini 2018-10-25 18:24:07 +00:00
commit 9fe9c09883
2 changed files with 10 additions and 3 deletions

View File

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

View File

@ -94,9 +94,15 @@ def parse_mentions(text) do
"woollysocks" "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"} {finmoji, "/finmoji/128px/#{finmoji}-128.png"}
end) end)
else
[]
end)
@emoji_from_file (with {:ok, default} <- File.read("config/emoji.txt") do @emoji_from_file (with {:ok, default} <- File.read("config/emoji.txt") do
custom = custom =