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

Merge branch 'fix/rich-media-relative-path' into 'develop'

Browse Source 
Fix rich media relative path

Closes #588

See merge request pleroma/pleroma!759
This commit is contained in:
rinpatch 2019-02-04 16:01:34 +00:00
commit 00835bf678
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -182,8 +182,19 @@ defmodule Pleroma.Web.MastodonAPI.StatusView 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 =
URI.merge(page_url_data, URI.parse(rich_media[:image]))
|> to_string
site_name = rich_media[:site_name] || page_url_data.host site_name = rich_media[:site_name] || page_url_data.host
%{ %{
@ -191,7 +202,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
provider_name: site_name, provider_name: site_name,
provider_url: page_url_data.scheme <> "://" <> page_url_data.host, provider_url: page_url_data.scheme <> "://" <> page_url_data.host,
url: page_url, url: page_url,
image: rich_media[:image] |> MediaProxy.url(), image: image_url |> MediaProxy.url(),
title: rich_media[:title], title: rich_media[:title],
description: rich_media[:description], description: rich_media[:description],
pleroma: %{ pleroma: %{