Commit 3fa6f3ae authored by lain's avatar lain
Browse files

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

Split emoji to default and custom.

See merge request !56
parents 5e37aded ab8b9aba
Pipeline #568 passed with stage
in 2 minutes and 15 seconds
...@@ -104,13 +104,19 @@ def html_escape(text) do ...@@ -104,13 +104,19 @@ 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
|> Enum.map(fn(line) -> else
[name, file] = String.split(line, ", ") _e -> ""
{name, file} end
(default <> "\n" <> custom)
|> String.trim()
|> String.split(~r/\n+/)
|> Enum.map(fn(line) ->
[name, file] = String.split(line, ~r/,\s*/)
{name, file}
end) end)
else else
_ -> [] _ -> []
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment