X-Git-Url: https://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Fmetadata%2Fopengraph.ex;h=4033ec38ff17d2592777565c47c8dc9c62686cb8;hb=93a0eeab16dc98b9278ee8649b233c3acd7807ec;hp=2f27a5300b6ce6cb87a64483805618da08d2308b;hpb=4d5f15cd422abd3a2dce6f6022c75014c18c73cf;p=akkoma
diff --git a/lib/pleroma/web/metadata/opengraph.ex b/lib/pleroma/web/metadata/opengraph.ex
index 2f27a5300..4033ec38f 100644
--- a/lib/pleroma/web/metadata/opengraph.ex
+++ b/lib/pleroma/web/metadata/opengraph.ex
@@ -1,17 +1,30 @@
# Pleroma: A lightweight social networking server
# Copyright © 2017-2019 Pleroma Authors
# SPDX-License-Identifier: AGPL-3.0-only
+
defmodule Pleroma.Web.Metadata.Providers.OpenGraph do
- alias Pleroma.Web.Metadata.Providers.Provider
+ alias Pleroma.User
alias Pleroma.Web.Metadata
- alias Pleroma.{HTML, Formatter, User}
- alias Pleroma.Web.MediaProxy
+ alias Pleroma.Web.Metadata.Providers.Provider
+ alias Pleroma.Web.Metadata.Utils
@behaviour Provider
@impl Provider
- def build_tags(%{activity: %{data: %{"object" => %{"id" => object_id}}} = activity, user: user}) do
- attachments = build_attachments(activity)
+ def build_tags(%{
+ object: object,
+ url: url,
+ user: user
+ }) do
+ attachments = build_attachments(object)
+ scrubbed_content = Utils.scrub_html_and_truncate(object)
+ # Zero width space
+ content =
+ if scrubbed_content != "" and scrubbed_content != "\u200B" do
+ ": â" <> scrubbed_content <> "â"
+ else
+ ""
+ end
# Most previews only show og:title which is inconvenient. Instagram
# hacks this by putting the description in the title and making the
@@ -23,19 +36,20 @@ defmodule Pleroma.Web.Metadata.Providers.OpenGraph do
{:meta,
[
property: "og:title",
- content: "#{user.name}: " <> "â" <> scrub_html_and_truncate(activity) <> "â"
+ content: "#{user.name}" <> content
], []},
- {:meta, [property: "og:url", content: object_id], []},
+ {:meta, [property: "og:url", content: url], []},
{:meta,
[
property: "og:description",
- content: "#{user_name_string(user)}: " <> "â" <> scrub_html_and_truncate(activity) <> "â"
+ content: "#{Utils.user_name_string(user)}" <> content
], []},
{:meta, [property: "og:type", content: "website"], []}
] ++
- if attachments == [] or Metadata.activity_nsfw?(activity) do
+ if attachments == [] or Metadata.activity_nsfw?(object) do
[
- {:meta, [property: "og:image", content: attachment_url(User.avatar_url(user))], []},
+ {:meta, [property: "og:image", content: Utils.attachment_url(User.avatar_url(user))],
+ []},
{:meta, [property: "og:image:width", content: 150], []},
{:meta, [property: "og:image:height", content: 150], []}
]
@@ -46,24 +60,24 @@ defmodule Pleroma.Web.Metadata.Providers.OpenGraph do
@impl Provider
def build_tags(%{user: user}) do
- with truncated_bio = scrub_html_and_truncate(user.bio || "") do
+ with truncated_bio = Utils.scrub_html_and_truncate(user.bio || "") do
[
{:meta,
[
property: "og:title",
- content: user_name_string(user)
+ content: Utils.user_name_string(user)
], []},
{:meta, [property: "og:url", content: User.profile_url(user)], []},
{:meta, [property: "og:description", content: truncated_bio], []},
{:meta, [property: "og:type", content: "website"], []},
- {:meta, [property: "og:image", content: attachment_url(User.avatar_url(user))], []},
+ {:meta, [property: "og:image", content: Utils.attachment_url(User.avatar_url(user))], []},
{:meta, [property: "og:image:width", content: 150], []},
{:meta, [property: "og:image:height", content: 150], []}
]
end
end
- defp build_attachments(%{data: %{"object" => %{"attachment" => attachments}}} = _activity) do
+ defp build_attachments(%{data: %{"attachment" => attachments}}) do
Enum.reduce(attachments, [], fn attachment, acc ->
rendered_tags =
Enum.reduce(attachment["url"], [], fn url, acc ->
@@ -74,18 +88,19 @@ defmodule Pleroma.Web.Metadata.Providers.OpenGraph do
# TODO: Add additional properties to objects when we have the data available.
# Also, Whatsapp only wants JPEG or PNGs. It seems that if we add a second og:image
- # object when a Video or GIF is attached it will display that in the Whatsapp Rich Preview.
+ # object when a Video or GIF is attached it will display that in Whatsapp Rich Preview.
case media_type do
"audio" ->
[
- {:meta, [property: "og:" <> media_type, content: attachment_url(url["href"])], []}
+ {:meta,
+ [property: "og:" <> media_type, content: Utils.attachment_url(url["href"])], []}
| acc
]
"image" ->
[
- {:meta, [property: "og:" <> media_type, content: attachment_url(url["href"])],
- []},
+ {:meta,
+ [property: "og:" <> media_type, content: Utils.attachment_url(url["href"])], []},
{:meta, [property: "og:image:width", content: 150], []},
{:meta, [property: "og:image:height", content: 150], []}
| acc
@@ -93,7 +108,8 @@ defmodule Pleroma.Web.Metadata.Providers.OpenGraph do
"video" ->
[
- {:meta, [property: "og:" <> media_type, content: attachment_url(url["href"])], []}
+ {:meta,
+ [property: "og:" <> media_type, content: Utils.attachment_url(url["href"])], []}
| acc
]
@@ -106,34 +122,5 @@ defmodule Pleroma.Web.Metadata.Providers.OpenGraph do
end)
end
- defp scrub_html_and_truncate(%{data: %{"object" => %{"content" => content}}} = activity) do
- content
- # html content comes from DB already encoded, decode first and scrub after
- |> HtmlEntities.decode()
- |> String.replace(~r/
/, " ")
- |> HTML.get_cached_stripped_html_for_object(activity, __MODULE__)
- |> Formatter.truncate()
- end
-
- defp scrub_html_and_truncate(content) when is_binary(content) do
- content
- # html content comes from DB already encoded, decode first and scrub after
- |> HtmlEntities.decode()
- |> String.replace(~r/
/, " ")
- |> HTML.strip_tags()
- |> Formatter.truncate()
- end
-
- defp attachment_url(url) do
- MediaProxy.url(url)
- end
-
- defp user_name_string(user) do
- "#{user.name} " <>
- if user.local do
- "(@#{user.nickname}@#{Pleroma.Web.Endpoint.host()})"
- else
- "(@#{user.nickname})"
- end
- end
+ defp build_attachments(_), do: []
end