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

mastodon api: use OGP uri instead of page_url for deducing domain name, fix test

Browse Source
This commit is contained in:
William Pitcock 2019-01-26 15:20:27 +00:00
parent 86037e9c39
commit 1f7843b9b8
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
View File

@ -1329,12 +1329,14 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
%Object{} = object <- Object.normalize(activity.data["object"]), %Object{} = object <- Object.normalize(activity.data["object"]),
page_url <- HTML.extract_first_external_url(object, object.data["content"]), page_url <- HTML.extract_first_external_url(object, object.data["content"]),
{:ok, rich_media} <- Pleroma.Web.RichMedia.Parser.parse(page_url) do {:ok, rich_media} <- Pleroma.Web.RichMedia.Parser.parse(page_url) do
page_url = rich_media[:url] || page_url
site_name = rich_media[:site_name] || URI.parse(page_url).host site_name = rich_media[:site_name] || URI.parse(page_url).host
rich_media rich_media
|> Map.take([:image, :title, :url, :description]) |> Map.take([:image, :title, :description])
|> Map.put(:type, "link") |> Map.put(:type, "link")
|> Map.put(:provider_name, site_name) |> Map.put(:provider_name, site_name)
|> Map.put(:url, page_url)
else else
_ -> %{} _ -> %{}
end end

1
test/web/mastodon_api/mastodon_api_controller_test.exs
View File

@ -1634,6 +1634,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
assert response == %{ assert response == %{
"image" => "http://ia.media-imdb.com/images/rock.jpg", "image" => "http://ia.media-imdb.com/images/rock.jpg",
"provider_name" => "www.imdb.com",
"title" => "The Rock", "title" => "The Rock",
"type" => "link", "type" => "link",
"url" => "http://www.imdb.com/title/tt0117500/" "url" => "http://www.imdb.com/title/tt0117500/"