Remove useless with in opengraph.ex
This commit is contained in:
parent
9a90b5d91a
commit
bb43f4cee9
@ -462,7 +462,7 @@ defmodule Pleroma.User do
|
|||||||
end
|
end
|
||||||
|
|
||||||
def get_cached_by_nickname_or_id(nickname_or_id) do
|
def get_cached_by_nickname_or_id(nickname_or_id) do
|
||||||
get_cached_by_id(maybe_id) || get_cached_by_nickname(nickname_or_id)
|
get_cached_by_id(nickname_or_id) || get_cached_by_nickname(nickname_or_id)
|
||||||
end
|
end
|
||||||
|
|
||||||
def get_by_nickname(nickname) do
|
def get_by_nickname(nickname) do
|
||||||
|
@ -10,29 +10,27 @@ defmodule Pleroma.Web.Metadata.Providers.OpenGraph do
|
|||||||
|
|
||||||
@impl Provider
|
@impl Provider
|
||||||
def build_tags(%{activity: activity, user: user}) do
|
def build_tags(%{activity: activity, user: user}) do
|
||||||
with truncated_content = scrub_html_and_truncate(activity) do
|
attachments = build_attachments(activity)
|
||||||
attachments = build_attachments(activity)
|
|
||||||
|
|
||||||
[
|
[
|
||||||
{:meta,
|
{:meta,
|
||||||
[
|
[
|
||||||
property: "og:title",
|
property: "og:title",
|
||||||
content: user_name_string(user)
|
content: user_name_string(user)
|
||||||
], []},
|
], []},
|
||||||
{:meta, [property: "og:url", content: activity.data["id"]], []},
|
{:meta, [property: "og:url", content: activity.data["id"]], []},
|
||||||
{:meta, [property: "og:description", content: truncated_content], []}
|
{:meta, [property: "og:description", content: scrub_html_and_truncate(activity)], []}
|
||||||
] ++
|
] ++
|
||||||
if attachments == [] or
|
if attachments == [] or
|
||||||
Enum.any?(activity.data["object"]["tag"], fn tag -> tag == "nsfw" end) do
|
Enum.any?(activity.data["object"]["tag"], fn tag -> tag == "nsfw" end) do
|
||||||
[
|
[
|
||||||
{:meta, [property: "og:image", content: attachment_url(User.avatar_url(user))], []},
|
{:meta, [property: "og:image", content: attachment_url(User.avatar_url(user))], []},
|
||||||
{:meta, [property: "og:image:width", content: 120], []},
|
{:meta, [property: "og:image:width", content: 120], []},
|
||||||
{:meta, [property: "og:image:height", content: 120], []}
|
{:meta, [property: "og:image:height", content: 120], []}
|
||||||
]
|
]
|
||||||
else
|
else
|
||||||
attachments
|
attachments
|
||||||
end
|
end
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
@impl Provider
|
@impl Provider
|
||||||
|
Loading…
Reference in New Issue
Block a user