Commit 96007753 authored by lain's avatar lain
Browse files

Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop

parents 360c51f1 807d243c
Pipeline #1071 passed with stage
in 2 minutes and 58 seconds
......@@ -125,7 +125,11 @@ def render("status.json", %{activity: %{data: %{"object" => object}} = activity}
(activity.data["object"]["emoji"] || [])
|> Enum.map(fn {name, url} ->
name = HtmlSanitizeEx.strip_tags(name)
url = HtmlSanitizeEx.strip_tags(url)
url =
HtmlSanitizeEx.strip_tags(url)
|> MediaProxy.url()
%{shortcode: name, url: url, static_url: url}
end)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment