X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Fmetadata%2Fopengraph.ex;h=357b80a2d50e7959bd8d5b8dfe36d2468f25def9;hb=a9f805c87100fd2ee1d8426460b81af4a235d574;hp=190377767ddf4c534cecbcc4be0c2a9759ddfb20;hpb=6a6a5b3251f7137e30b687a9a8448e678446f8b0;p=akkoma
diff --git a/lib/pleroma/web/metadata/opengraph.ex b/lib/pleroma/web/metadata/opengraph.ex
index 190377767..357b80a2d 100644
--- a/lib/pleroma/web/metadata/opengraph.ex
+++ b/lib/pleroma/web/metadata/opengraph.ex
@@ -3,12 +3,10 @@
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.Metadata.Providers.OpenGraph do
- alias Pleroma.HTML
- alias Pleroma.Formatter
alias Pleroma.User
alias Pleroma.Web.Metadata
- alias Pleroma.Web.MediaProxy
alias Pleroma.Web.Metadata.Providers.Provider
+ alias Pleroma.Web.Metadata.Utils
@behaviour Provider
@@ -19,7 +17,7 @@ defmodule Pleroma.Web.Metadata.Providers.OpenGraph do
user: user
}) do
attachments = build_attachments(object)
- scrubbed_content = scrub_html_and_truncate(object)
+ scrubbed_content = Utils.scrub_html_and_truncate(object)
# Zero width space
content =
if scrubbed_content != "" and scrubbed_content != "\u200B" do
@@ -44,13 +42,14 @@ defmodule Pleroma.Web.Metadata.Providers.OpenGraph do
{:meta,
[
property: "og:description",
- content: "#{user_name_string(user)}" <> content
+ content: "#{Utils.user_name_string(user)}" <> content
], []},
{:meta, [property: "og:type", content: "website"], []}
] ++
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], []}
]
@@ -61,17 +60,17 @@ 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], []}
]
@@ -89,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
@@ -108,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
]
@@ -120,37 +121,4 @@ defmodule Pleroma.Web.Metadata.Providers.OpenGraph do
acc ++ rendered_tags
end)
end
-
- defp scrub_html_and_truncate(%{data: %{"content" => content}} = object) 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(object, __MODULE__)
- |> Formatter.demojify()
- |> 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.demojify()
- |> 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
end