alyssa
/
pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Split emoji to default and custom.

This commit is contained in:
eal 2018-01-31 16:23:31 +02:00
parent 5e37adedfb
commit ab8b9ababa
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
config/emoji.txt → config/emoji_default.txt
View File

20
lib/pleroma/formatter.ex
View File

@ -104,13 +104,19 @@ def html_escape(text) do
{finmoji, "/finmoji/128px/#{finmoji}-128.png"}
end)
@emoji_from_file (with {:ok, file} <- File.read("config/emoji.txt") do
file
|> String.trim
|> String.split("\n")
|> Enum.map(fn(line) ->
[name, file] = String.split(line, ", ")
{name, file}
@emoji_from_file (with {:ok, default} <- File.read("config/emoji.txt") do
custom =
with {:ok, custom} <- File.read("config/custom_emoji.txt") do
custom
else
_e -> ""
end
(default <> "\n" <> custom)
|> String.trim()
|> String.split(~r/\n+/)
|> Enum.map(fn(line) ->
[name, file] = String.split(line, ~r/,\s*/)
{name, file}
end)
else
_ -> []