limepotato/akkoma
1
0
Fork 0
Code Pull requests Activity

Merge branch 'bugfix/link-preview-site_name' into 'develop'

Browse source 
MastodonAPI.StatusView: Do not use site_name

See merge request pleroma/pleroma!2216
This commit is contained in:
lain 2020-02-15 12:56:32 +00:00
commit 0b5a2bbe5b
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/pleroma/web/mastodon_api/views/status_view.ex
View file

@ -321,11 +321,9 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
nil nil
end end
site_name = rich_media[:site_name] || page_url_data.host
%{ %{
type: "link", type: "link",
provider_name: site_name, provider_name: page_url_data.host,
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: image_url |> MediaProxy.url(), image: image_url |> MediaProxy.url(),

4
test/web/mastodon_api/views/status_view_test.exs
View file

@ -491,7 +491,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusViewTest do
title: "Example website" title: "Example website"
} }
%{provider_name: "Example site name"} = %{provider_name: "example.com"} =
StatusView.render("card.json", %{page_url: page_url, rich_media: card}) StatusView.render("card.json", %{page_url: page_url, rich_media: card})
end end
@ -506,7 +506,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusViewTest do
description: "Example description" description: "Example description"
} }
%{provider_name: "Example site name"} = %{provider_name: "example.com"} =
StatusView.render("card.json", %{page_url: page_url, rich_media: card}) StatusView.render("card.json", %{page_url: page_url, rich_media: card})
end end
end end