aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Pitcock <nenolod@dereferenced.org>2019-02-06 18:02:15 +0000
committerWilliam Pitcock <nenolod@dereferenced.org>2019-02-06 18:02:15 +0000
commit65a4b9fbea6e1ec331e6aae30abe12e6d4494102 (patch)
treee6b6224c7e2096a92ddc68389f1f7f343bd4bbef
parentc46490b1999dd0ddb3d3b23409ba725c21811a96 (diff)
downloadpleroma-65a4b9fbea6e1ec331e6aae30abe12e6d4494102.tar.gz
mastodon api: rich media: don't clobber %URI struct with a string
-rw-r--r--lib/pleroma/web/mastodon_api/views/status_view.ex6
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