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

Merge branch 'revert-50af909c' into 'develop'

Browse Source 
Revert "Merge branch 'pleroma-card-image-description' into 'develop'"

See merge request pleroma/pleroma!4107
This commit is contained in:
feld 2024-05-07 23:21:37 +00:00
commit b42963a52c
5 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/card-image-description.add
View File

@ -1 +0,0 @@
Include image description in status media cards

4
lib/pleroma/web/api_spec/schemas/status.ex
View File

@ -58,10 +58,6 @@ defmodule Pleroma.Web.ApiSpec.Schemas.Status do
format: :uri, format: :uri,
description: "Preview thumbnail" description: "Preview thumbnail"
}, },
image_description: %Schema{
type: :string,
description: "Alternate text that describes what is in the thumbnail"
},
title: %Schema{type: :string, description: "Title of linked resource"}, title: %Schema{type: :string, description: "Title of linked resource"},
description: %Schema{type: :string, description: "Description of preview"} description: %Schema{type: :string, description: "Description of preview"}
} }

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

@ -589,7 +589,6 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
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, image: image_url,
image_description: rich_media["image:alt"] || "",
title: rich_media["title"] || "", title: rich_media["title"] || "",
description: rich_media["description"] || "", description: rich_media["description"] || "",
pleroma: %{ pleroma: %{

2
test/pleroma/web/mastodon_api/controllers/status_controller_test.exs
View File

@ -1717,7 +1717,6 @@ defmodule Pleroma.Web.MastodonAPI.StatusControllerTest do
card_data = %{ card_data = %{
"image" => "http://ia.media-imdb.com/images/rock.jpg", "image" => "http://ia.media-imdb.com/images/rock.jpg",
"image_description" => "",
"provider_name" => "example.com", "provider_name" => "example.com",
"provider_url" => "https://example.com", "provider_url" => "https://example.com",
"title" => "The Rock", "title" => "The Rock",
@ -1771,7 +1770,6 @@ defmodule Pleroma.Web.MastodonAPI.StatusControllerTest do
"title" => "Pleroma", "title" => "Pleroma",
"description" => "", "description" => "",
"image" => nil, "image" => nil,
"image_description" => "",
"provider_name" => "example.com", "provider_name" => "example.com",
"provider_url" => "https://example.com", "provider_url" => "https://example.com",
"url" => "https://example.com/ogp-missing-data", "url" => "https://example.com/ogp-missing-data",

3
test/pleroma/web/mastodon_api/views/status_view_test.exs
View File

@ -773,7 +773,6 @@ defmodule Pleroma.Web.MastodonAPI.StatusViewTest do
page_url = "http://example.com" page_url = "http://example.com"
card = %{ card = %{
"image:alt" => "Example image description",
url: page_url, url: page_url,
site_name: "Example site name", site_name: "Example site name",
title: "Example website", title: "Example website",
@ -781,7 +780,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusViewTest do
description: "Example description" description: "Example description"
} }
%{provider_name: "example.com", image_description: "Example image description"} = %{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