alyssa
/
pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Check if rich media uri is relative

This commit is contained in:
rinpatch 2019-02-02 12:24:24 +03:00
parent 833404f0f5
commit 68d461b3a9
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/pleroma/web/mastodon_api/views/status_view.ex
View File

@ -182,17 +182,18 @@ def render("status.json", _) do
end end
def render("card.json", %{rich_media: rich_media, page_url: page_url}) do def render("card.json", %{rich_media: rich_media, page_url: page_url}) do
page_url = rich_media[:url] || page_url page_url_data =
page_url_data = URI.parse(page_url) if rich_media[:url] != nil do
URI.merge(URI.parse(page_url), URI.parse(rich_media[:url]))
else
page_url
end
page_url = page_url_data |> to_string
image_url = image_url =
with %URI{host: nil} <- page_url_data do URI.merge(page_url_data, URI.parse(rich_media[:image]))
rich_media[:image] |> to_string
else
_ ->
URI.merge(page_url_data, URI.parse(rich_media[:image]))
|> to_string
end
site_name = rich_media[:site_name] || page_url_data.host site_name = rich_media[:site_name] || page_url_data.host