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

Add emoji support in statuses in staticfe Closes #1453 See merge request pleroma/pleroma!2324
2020-03-23 10:43:20 +00:00 · 2020-03-23 10:43:20 +00:00 · d931a59072
commit d931a59072
parent 7dbf1ffa86 5a34dca8ed
2 changed files with 3 additions and 1 deletions
--- 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
--- a/priv/static/static/static-fe.css
+++ b/priv/static/static/static-fe.css