commit: 96007753ad099b43fcea33662e22b5528426849d
parent: 360c51f1f52c48e52fd4fe5ccc0be9dd2b47c59f
Author: lain <lain@soykaf.club>
Date: Mon, 2 Apr 2018 15:29:05 +0200
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
Diffstat:
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/lib/pleroma/web/mastodon_api/views/status_view.ex b/lib/pleroma/web/mastodon_api/views/status_view.ex
@@ -125,7 +125,11 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
(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)