diff options
Diffstat (limited to 'lib/pleroma/web/metadata')
| -rw-r--r-- | lib/pleroma/web/metadata/opengraph.ex | 3 | ||||
| -rw-r--r-- | lib/pleroma/web/metadata/twitter_card.ex | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/lib/pleroma/web/metadata/opengraph.ex b/lib/pleroma/web/metadata/opengraph.ex index a48788969..2f27a5300 100644 --- a/lib/pleroma/web/metadata/opengraph.ex +++ b/lib/pleroma/web/metadata/opengraph.ex @@ -3,6 +3,7 @@ # SPDX-License-Identifier: AGPL-3.0-only defmodule Pleroma.Web.Metadata.Providers.OpenGraph do alias Pleroma.Web.Metadata.Providers.Provider + alias Pleroma.Web.Metadata alias Pleroma.{HTML, Formatter, User} alias Pleroma.Web.MediaProxy @@ -32,7 +33,7 @@ defmodule Pleroma.Web.Metadata.Providers.OpenGraph do ], []}, {:meta, [property: "og:type", content: "website"], []} ] ++ - if attachments == [] do + if attachments == [] or Metadata.activity_nsfw?(activity) do [ {:meta, [property: "og:image", content: attachment_url(User.avatar_url(user))], []}, {:meta, [property: "og:image:width", content: 150], []}, diff --git a/lib/pleroma/web/metadata/twitter_card.ex b/lib/pleroma/web/metadata/twitter_card.ex index 853776611..9a1245e59 100644 --- a/lib/pleroma/web/metadata/twitter_card.ex +++ b/lib/pleroma/web/metadata/twitter_card.ex @@ -3,13 +3,13 @@ # SPDX-License-Identifier: AGPL-3.0-only defmodule Pleroma.Web.Metadata.Providers.TwitterCard do alias Pleroma.Web.Metadata.Providers.Provider + alias Pleroma.Web.Metadata @behaviour Provider @impl Provider def build_tags(%{activity: activity}) do - if Enum.any?(activity.data["object"]["tag"], fn tag -> tag == "nsfw" end) or - activity.data["object"]["attachment"] == [] do + if Metadata.activity_nsfw?(activity) or activity.data["object"]["attachment"] == [] do build_tags(nil) else case find_first_acceptable_media_type(activity) do |