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

Split emoji to default and custom.

See merge request !56

lib/pleroma/formatter.ex

@@ -104,12 +104,18 @@ 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")
+  @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, ", ")
+                        [name, file] = String.split(line, ~r/,\s*/)
                         {name, file}
                      end)
                     else