projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'update/adminfe-20200331' into 'develop'
[akkoma]
/
lib
/
pleroma
/
web
/
static_fe
/
static_fe_controller.ex
diff --git
a/lib/pleroma/web/static_fe/static_fe_controller.ex
b/lib/pleroma/web/static_fe/static_fe_controller.ex
index 0b77f949c9f7b03efaa60bd6d1e58a3fe9c235ce..7a35238d7dd71657124d96a919485c7cd1c93c55 100644
(file)
--- 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
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
%{
else
nil
end
%{
- user:
user
,
+ user:
User.sanitize_html(user)
,
title: get_title(activity.object),
content: content,
attachment: data["attachment"],
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", %{
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,
timeline: timeline,
prev_page_id: prev_page_id,
next_page_id: next_page_id,