Merge remote-tracking branch 'remotes/origin/develop' into relations-preloading-for-statuses-rendering

2020-03-23 14:34:58 +03:00 · 2020-03-23 14:34:58 +03:00 · 86f2fbc81e
commit 86f2fbc81e
parent 3c78e5f327 d931a59072
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