logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma git clone https://hacktivis.me/git/pleroma.git
commit: b42963a52c32fb9b6cafc0863f962a8dfb952050
parent ffa6805c0919abca6de2329ce01966d883876b30
Author: feld <feld@feld.me>
Date:   Tue,  7 May 2024 23:21:37 +0000

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

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

See merge request pleroma/pleroma!4107

Diffstat:

Dchangelog.d/card-image-description.add2--
Mlib/pleroma/web/api_spec/schemas/status.ex4----
Mlib/pleroma/web/mastodon_api/views/status_view.ex1-
Mtest/pleroma/web/mastodon_api/controllers/status_controller_test.exs2--
Mtest/pleroma/web/mastodon_api/views/status_view_test.exs3+--
5 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/changelog.d/card-image-description.add b/changelog.d/card-image-description.add @@ -1 +0,0 @@ -Include image description in status media cards -\ No newline at end of file diff --git a/lib/pleroma/web/api_spec/schemas/status.ex b/lib/pleroma/web/api_spec/schemas/status.ex @@ -58,10 +58,6 @@ defmodule Pleroma.Web.ApiSpec.Schemas.Status do format: :uri, 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"}, description: %Schema{type: :string, description: "Description of preview"} } diff --git a/lib/pleroma/web/mastodon_api/views/status_view.ex b/lib/pleroma/web/mastodon_api/views/status_view.ex @@ -589,7 +589,6 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do provider_url: page_url_data.scheme <> "://" <> page_url_data.host, url: page_url, image: image_url, - image_description: rich_media["image:alt"] || "", title: rich_media["title"] || "", description: rich_media["description"] || "", pleroma: %{ diff --git a/test/pleroma/web/mastodon_api/controllers/status_controller_test.exs b/test/pleroma/web/mastodon_api/controllers/status_controller_test.exs @@ -1717,7 +1717,6 @@ defmodule Pleroma.Web.MastodonAPI.StatusControllerTest do card_data = %{ "image" => "http://ia.media-imdb.com/images/rock.jpg", - "image_description" => "", "provider_name" => "example.com", "provider_url" => "https://example.com", "title" => "The Rock", @@ -1771,7 +1770,6 @@ defmodule Pleroma.Web.MastodonAPI.StatusControllerTest do "title" => "Pleroma", "description" => "", "image" => nil, - "image_description" => "", "provider_name" => "example.com", "provider_url" => "https://example.com", "url" => "https://example.com/ogp-missing-data", diff --git a/test/pleroma/web/mastodon_api/views/status_view_test.exs b/test/pleroma/web/mastodon_api/views/status_view_test.exs @@ -773,7 +773,6 @@ defmodule Pleroma.Web.MastodonAPI.StatusViewTest do page_url = "http://example.com" card = %{ - "image:alt" => "Example image description", url: page_url, site_name: "Example site name", title: "Example website", @@ -781,7 +780,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusViewTest do 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}) end