moon
/
honkoma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use object url instead of a hack

This commit is contained in:
rinpatch 2019-01-17 10:34:19 +03:00
parent fd3a558230
commit 0256bd2f1d
1 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/pleroma/web/metadata/opengraph.ex
View File

@ -3,13 +3,13 @@
# SPDX-License-Identifier: AGPL-3.0-only # SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.Metadata.Providers.OpenGraph do defmodule Pleroma.Web.Metadata.Providers.OpenGraph do
alias Pleroma.Web.Metadata.Providers.Provider alias Pleroma.Web.Metadata.Providers.Provider
alias Pleroma.{HTML, Formatter, User, Web} alias Pleroma.{HTML, Formatter, User}
alias Pleroma.Web.MediaProxy alias Pleroma.Web.MediaProxy
@behaviour Provider @behaviour Provider
@impl Provider @impl Provider
def build_tags(%{activity: activity, user: user}) do def build_tags(%{activity: %{data: %{"object" => %{"id" => object_id}}} = activity, user: user}) do
attachments = build_attachments(activity) attachments = build_attachments(activity)
# Most previews only show og:title which is inconvenient. Instagram # Most previews only show og:title which is inconvenient. Instagram
@ -22,21 +22,13 @@ def build_tags(%{activity: activity, user: user}) do
{:meta, {:meta,
[ [
property: "og:title", property: "og:title",
content: content: "#{user.name}: " <> "“" <> scrub_html_and_truncate(activity) <> "”"
"#{user.name}: " <>
"“" <>
scrub_html_and_truncate(activity) <>
"”"
], []}, ], []},
{:meta, [property: "og:url", content: "#{Web.base_url()}/notice/#{activity.id}"], []}, {:meta, [property: "og:url", content: object_id], []},
{:meta, {:meta,
[ [
property: "og:description", property: "og:description",
content: content: "#{user_name_string(user)}: " <> "“" <> scrub_html_and_truncate(activity) <> "”"
"#{user_name_string(user)}: " <>
"“" <>
scrub_html_and_truncate(activity) <>
"”"
], []}, ], []},
{:meta, [property: "og:type", content: "website"], []} {:meta, [property: "og:type", content: "website"], []}
] ++ ] ++