X-Git-Url: https://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Fstatic_fe%2Fstatic_fe_controller.ex;h=7a35238d7dd71657124d96a919485c7cd1c93c55;hb=fd932b14a7e7335a91a2acc2d6dd6fba7e2e90b3;hp=0b77f949c9f7b03efaa60bd6d1e58a3fe9c235ce;hpb=0ac6e296549f43e553bdd2350050efcf95d3b6fa;p=akkoma

diff --git a/lib/pleroma/web/static_fe/static_fe_controller.ex b/lib/pleroma/web/static_fe/static_fe_controller.ex
index 0b77f949c..7a35238d7 100644
--- a/lib/pleroma/web/static_fe/static_fe_controller.ex
+++ b/lib/pleroma/web/static_fe/static_fe_controller.ex
@@ -60,13 +60,15 @@ 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
 
     %{
-      user: user,
+      user: User.sanitize_html(user),
       title: get_title(activity.object),
       content: content,
       attachment: data["attachment"],
@@ -120,7 +122,7 @@ defmodule Pleroma.Web.StaticFE.StaticFEController do
         next_page_id = List.last(timeline) && List.last(timeline).id
 
         render(conn, "profile.html", %{
-          user: user,
+          user: User.sanitize_html(user),
           timeline: timeline,
           prev_page_id: prev_page_id,
           next_page_id: next_page_id,