pleroma

commit: fb46d6fbc4cc7db183bc3998e4e64b15eae11135
parent: 422d0f324fa18743129ce81139319ead7cb579ce
Author: Roger Braun <roger@rogerbraun.net>
Date:   Sun, 17 Sep 2017 13:24:52 +0200

Prefer post-specific emoji.

Diffstat:
M
lib/pleroma/formatter.ex
2
+-

1 file changed, 1 insertion(+), 1 deletion(-)
diff --git 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