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

2018-04-02 15:29:05 +02:00 · 2018-04-02 15:29:05 +02:00 · 96007753ad
commit 96007753ad
parent 360c51f1f5 807d243c64
1 changed files with 5 additions and 1 deletions
--- a/lib/pleroma/web/mastodon_api/views/status_view.ex
+++ b/lib/pleroma/web/mastodon_api/views/status_view.ex
@ -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)