projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'feature/1734-user-deletion' 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 5027d5c233158c115519fae03e57864896fb2d8e..c3efb66513304ac4b254e6d6cc445419a06929f5 100644
(file)
--- a/
lib/pleroma/web/static_fe/static_fe_controller.ex
+++ b/
lib/pleroma/web/static_fe/static_fe_controller.ex
@@
-18,7
+18,7
@@
defmodule Pleroma.Web.StaticFE.StaticFEController do
plug(:assign_id)
plug(Pleroma.Plugs.EnsureAuthenticatedPlug,
plug(:assign_id)
plug(Pleroma.Plugs.EnsureAuthenticatedPlug,
- unless_func: &Pleroma.Web.FederatingPlug.federating?/
0
+ unless_func: &Pleroma.Web.FederatingPlug.federating?/
1
)
@page_keys ["max_id", "min_id", "limit", "since_id", "order"]
)
@page_keys ["max_id", "min_id", "limit", "since_id", "order"]
@@
-58,10
+58,19
@@
defmodule Pleroma.Web.StaticFE.StaticFEController do
_ -> data["url"] || data["external_url"] || data["id"]
end
_ -> data["url"] || data["external_url"] || data["id"]
end
+ content =
+ if data["content"] do
+ 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),
title: get_title(activity.object),
- content:
data["content"] || nil
,
+ content:
content
,
attachment: data["attachment"],
link: link,
published: data["published"],
attachment: data["attachment"],
link: link,
published: data["published"],
@@
-113,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,