From 5a34dca8eda46479a3459b60c623d6fa94fc662b Mon Sep 17 00:00:00 2001
From: Egor Kislitsyn <egor@kislitsyn.com>
Date: Mon, 23 Mar 2020 14:03:31 +0400
Subject: [PATCH] Add emoji support in statuses in staticfe

---
 .../web/static_fe/static_fe_controller.ex     |   4 +++-
 priv/static/static/static-fe.css              | Bin 2629 -> 2715 bytes
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/pleroma/web/static_fe/static_fe_controller.ex b/lib/pleroma/web/static_fe/static_fe_controller.ex
index 7f9464268..7a35238d7 100644
--- a/lib/pleroma/web/static_fe/static_fe_controller.ex
+++ b/lib/pleroma/web/static_fe/static_fe_controller.ex
@@ -60,7 +60,9 @@ defp represent(%Activity{object: %Object{data: data}} = activity, selected) do
 
     content =
       if data["content"] do
-        Pleroma.HTML.filter_tags(data["content"])
+        data["content"]
+        |> Pleroma.HTML.filter_tags()
+        |> Pleroma.Emoji.Formatter.emojify(Map.get(data, "emoji", %{}))
       else
         nil
       end
diff --git a/priv/static/static/static-fe.css b/priv/static/static/static-fe.css
index 19c56387b1ea9aa19f3d0f8d596c949f0b0c6485..db61ff2665ba2aef7f33dbfa8dbf29b7f6cdcba7 100644
GIT binary patch
delta 94
zcmX>qGFx<mD_0m-W^TG(YHog3rb0EBf<k#_N=b&5g0WFSg*A|yk(!yFQG(zXB&MWf
l=A~OH7=UEUQj1D5lM{1v6LT`t^Q;tdGgDG>Qmwgaxd3*-9ZLWJ

delta 7
OcmbO&dQ@bCD;EF@j{=DR