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

Merge branch 'fix/split-custom-emoji' into 'develop' 

Split emoji to default and custom.

See merge request pleroma/pleroma!56
This commit is contained in:
lambda 2018-01-31 15:24:36 +00:00
parent 5e37adedfb ab8b9ababa
commit 3fa6f3ae42
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

16
lib/pleroma/formatter.ex
View File

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