merge only if page_url is an absolute path

2019-02-02 11:53:46 +03:00 · 2019-02-02 11:53:46 +03:00 · e4d18f328b
commit e4d18f328b
parent cbadf9d333
1 changed files with 6 additions and 2 deletions
--- a/lib/pleroma/web/mastodon_api/views/status_view.ex
+++ b/lib/pleroma/web/mastodon_api/views/status_view.ex
@ -186,8 +186,12 @@ def render("card.json", %{rich_media: rich_media, page_url: page_url}) 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