Prefer post-specific emoji.

2017-09-17 13:24:52 +02:00 · 2017-09-17 13:24:52 +02:00 · fb46d6fbc4
commit fb46d6fbc4
parent 422d0f324f
1 changed files with 1 additions and 1 deletions
--- a/lib/pleroma/formatter.ex
+++ b/lib/pleroma/formatter.ex
@ -109,7 +109,7 @@ def parse_mentions(text) 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