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

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)