diff options
| author | lain <lain@soykaf.club> | 2018-04-02 15:29:05 +0200 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2018-04-02 15:29:05 +0200 |
| commit | 96007753ad099b43fcea33662e22b5528426849d (patch) | |
| tree | d403b3282ce8152987e8a507f6dd5befa4d7a6f8 | |
| parent | 360c51f1f52c48e52fd4fe5ccc0be9dd2b47c59f (diff) | |
| parent | 807d243c64e6cc481f465e4b54fada0f2f66cb9f (diff) | |
| download | pleroma-96007753ad099b43fcea33662e22b5528426849d.tar.gz | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
| -rw-r--r-- | lib/pleroma/web/mastodon_api/views/status_view.ex | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/pleroma/web/mastodon_api/views/status_view.ex b/lib/pleroma/web/mastodon_api/views/status_view.ex index bc5ae5da7..df360644a 100644 --- 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) |