diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-02-02 11:53:46 +0300 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-02-02 11:53:46 +0300 |
| commit | e4d18f328b738a2c3a953e721f0d350cfba20089 (patch) | |
| tree | 5e7078428a48a82cb189a7e69ac638e8c8b47585 /lib | |
| parent | cbadf9d3333d3840d21cfcd3bd4f33d3b5b90445 (diff) | |
| download | pleroma-e4d18f328b738a2c3a953e721f0d350cfba20089.tar.gz | |
merge only if page_url is an absolute path
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/mastodon_api/views/status_view.ex | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/pleroma/web/mastodon_api/views/status_view.ex b/lib/pleroma/web/mastodon_api/views/status_view.ex index 826563f74..aa38784a6 100644 --- a/lib/pleroma/web/mastodon_api/views/status_view.ex +++ b/lib/pleroma/web/mastodon_api/views/status_view.ex @@ -186,8 +186,12 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do page_url_data = URI.parse(page_url) image_url = - URI.merge(page_url_data, URI.parse(rich_media[:image])) - |> to_string + if %URI{host: nil} = page_url_data do + rich_media[:image] + else + URI.merge(page_url_data, URI.parse(rich_media[:image])) + |> to_string + end site_name = rich_media[:site_name] || page_url_data.host |