X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fformatter.ex;h=f062d9a5896b6e928e8f253c86c1978d0e2c0c57;hb=6dfa62800ad6cdcef9e73ecdabe45363c574a528;hp=728d2b3e8e383da7dc4bd59f673beab8a5b5a56c;hpb=7c82b8219734102ff24d9dc24226c08351e608cc;p=akkoma

diff --git a/lib/pleroma/formatter.ex b/lib/pleroma/formatter.ex
index 728d2b3e8..f062d9a58 100644
--- a/lib/pleroma/formatter.ex
+++ b/lib/pleroma/formatter.ex
@@ -109,7 +109,7 @@ defmodule Pleroma.Formatter do
 
   def emojify(text, additional \\ nil) do
     all_emoji = if additional do
-      @emoji ++ Map.to_list(additional)
+      Map.to_list(additional) ++ @emoji
     else
       @emoji
     end
@@ -122,4 +122,9 @@ defmodule Pleroma.Formatter do
   def get_emoji(text) do
     Enum.filter(@emoji, fn ({emoji, _}) -> String.contains?(text, ":#{emoji}:") end)
   end
+
+  def get_custom_emoji() do
+    @emoji
+    |> Enum.into %{}
+  end
 end