pleroma

commit: d931a59072de0861e889c6349eacc3d7f1f41fd9
parent: 7dbf1ffa868e4f5fece298b9ea161e1e11a2ffde
Author: rinpatch <rinpatch@sdf.org>
Date:   Mon, 23 Mar 2020 10:43:20 +0000

Merge branch 'support-emoji-staticfe' into 'develop'

Add emoji support in statuses in staticfe

Closes #1453

See merge request pleroma/pleroma!2324
Diffstat:
M
lib/pleroma/web/static_fe/static_fe_controller.ex
4
+++-
M
priv/static/static/static-fe.css
7
+++++++

2 files changed, 10 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
@@ -60,7 +60,9 @@ defmodule Pleroma.Web.StaticFE.StaticFEController 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
@@ -174,3 +174,10 @@ button {
     font-weight: 500;
     font-size: 16px;
 }
+
+img.emoji {
+  width: 32px;
+  height: 32px;
+  padding: 0;
+  vertical-align: middle;
+}