Merge branch 'fix-107' into 'develop'
masto api: run emojis through mediaproxy Closes #107 See merge request pleroma/pleroma!92
This commit is contained in:
commit
807d243c64
1 changed files with 5 additions and 1 deletions
|
@ -125,7 +125,11 @@ def render("status.json", %{activity: %{data: %{"object" => object}} = activity}
|
||||||
(activity.data["object"]["emoji"] || [])
|
(activity.data["object"]["emoji"] || [])
|
||||||
|> Enum.map(fn {name, url} ->
|
|> Enum.map(fn {name, url} ->
|
||||||
name = HtmlSanitizeEx.strip_tags(name)
|
name = HtmlSanitizeEx.strip_tags(name)
|
||||||
url = HtmlSanitizeEx.strip_tags(url)
|
|
||||||
|
url =
|
||||||
|
HtmlSanitizeEx.strip_tags(url)
|
||||||
|
|> MediaProxy.url()
|
||||||
|
|
||||||
%{shortcode: name, url: url, static_url: url}
|
%{shortcode: name, url: url, static_url: url}
|
||||||
end)
|
end)
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue