Merge branch 'fix-107' into 'develop'

masto api: run emojis through mediaproxy

Closes #107

See merge request pleroma/pleroma!92

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)