Prefer post-specific emoji.

diff --git a/lib/pleroma/formatter.ex b/lib/pleroma/formatter.ex
index 728d2b3e8e383da7dc4bd59f673beab8a5b5a56c..a5eb3b268326c6a28ae6f63b817af54ef1198ee8 100644 (file)
--- 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