diff options
| author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2019-02-06 18:39:13 +0000 |
|---|---|---|
| committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2019-02-06 18:39:13 +0000 |
| commit | 1220a171466ff613978c39eb977902ee9492b187 (patch) | |
| tree | 58dd04e84aa785a3a797c86fad4a54262a2cef79 /lib | |
| parent | 18e783bcb225f59dd9efc652c82d6e23492edbec (diff) | |
| parent | 26670b09a7a1fb144a8a2b0141d64c0d85cd6ad6 (diff) | |
| download | pleroma-1220a171466ff613978c39eb977902ee9492b187.tar.gz | |
Merge branch 'bugfix/rich-media-card' into 'develop'
rich media cards: bugfixes and regression tests
See merge request pleroma/pleroma!785
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/mastodon_api/views/status_view.ex | 6 |
1 files changed, 4 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 c0e289ef8..a227d742d 100644 --- a/lib/pleroma/web/mastodon_api/views/status_view.ex +++ b/lib/pleroma/web/mastodon_api/views/status_view.ex @@ -182,11 +182,13 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do end def render("card.json", %{rich_media: rich_media, page_url: page_url}) do + page_url_data = URI.parse(page_url) + page_url_data = if rich_media[:url] != nil do - URI.merge(URI.parse(page_url), URI.parse(rich_media[:url])) + URI.merge(page_url_data, URI.parse(rich_media[:url])) else - page_url + page_url_data end page_url = page_url_data |> to_string |