From: Roger Braun <roger@rogerbraun.net>
Date: Sun, 17 Sep 2017 11:24:52 +0000 (+0200)
Subject: Prefer post-specific emoji.
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=fb46d6fbc4cc7db183bc3998e4e64b15eae11135;p=akkoma

Prefer post-specific emoji.
---

diff --git a/lib/pleroma/formatter.ex b/lib/pleroma/formatter.ex
index 728d2b3e8..a5eb3b268 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