diff options
| author | William Pitcock <nenolod@dereferenced.org> | 2019-01-26 15:20:27 +0000 |
|---|---|---|
| committer | William Pitcock <nenolod@dereferenced.org> | 2019-01-26 15:24:16 +0000 |
| commit | 1f7843b9b8afcb559c8ba59388724dbf4ef3e3c9 (patch) | |
| tree | 359cefdf58a23900353015b36b0bdb3c33c35a93 /lib | |
| parent | 86037e9c3980fbab94935844c09bdd2f002140aa (diff) | |
| download | pleroma-1f7843b9b8afcb559c8ba59388724dbf4ef3e3c9.tar.gz | |
mastodon api: use OGP uri instead of page_url for deducing domain name, fix test
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/mastodon_api/mastodon_api_controller.ex | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex index ae744da60..a60532b55 100644 --- a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex +++ b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex @@ -1329,12 +1329,14 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do %Object{} = object <- Object.normalize(activity.data["object"]), page_url <- HTML.extract_first_external_url(object, object.data["content"]), {: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 rich_media - |> Map.take([:image, :title, :url, :description]) + |> Map.take([:image, :title, :description]) |> Map.put(:type, "link") |> Map.put(:provider_name, site_name) + |> Map.put(:url, page_url) else _ -> %{} end |