sjw/pleroma
1
0
Fork 0
mirror of https://git.pleroma.social/sjw/pleroma.git synced 2024-11-15 23:46:14 +01:00
Code Issues Releases Wiki Activity

merge only if page_url is an absolute path

Browse Source
This commit is contained in:
rinpatch 2019-02-02 11:53:46 +03:00
parent cbadf9d333
commit e4d18f328b
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -186,8 +186,12 @@ defmodule Pleroma.Web.MastodonAPI.StatusView 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