From 0256bd2f1dfb121a4d751906a202e3db482500a6 Mon Sep 17 00:00:00 2001 From: rinpatch Date: Thu, 17 Jan 2019 10:34:19 +0300 Subject: [PATCH] Use object url instead of a hack --- lib/pleroma/web/metadata/opengraph.ex | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/lib/pleroma/web/metadata/opengraph.ex b/lib/pleroma/web/metadata/opengraph.ex index f95e2442a..a48788969 100644 --- a/lib/pleroma/web/metadata/opengraph.ex +++ b/lib/pleroma/web/metadata/opengraph.ex @@ -3,13 +3,13 @@ # SPDX-License-Identifier: AGPL-3.0-only defmodule Pleroma.Web.Metadata.Providers.OpenGraph do alias Pleroma.Web.Metadata.Providers.Provider - alias Pleroma.{HTML, Formatter, User, Web} + alias Pleroma.{HTML, Formatter, User} alias Pleroma.Web.MediaProxy @behaviour 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) # Most previews only show og:title which is inconvenient. Instagram @@ -22,21 +22,13 @@ def build_tags(%{activity: activity, user: user}) do {:meta, [ property: "og:title", - content: - "#{user.name}: " <> - "“" <> - scrub_html_and_truncate(activity) <> - "”" + content: "#{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, [ property: "og:description", - content: - "#{user_name_string(user)}: " <> - "“" <> - scrub_html_and_truncate(activity) <> - "”" + content: "#{user_name_string(user)}: " <> "“" <> scrub_html_and_truncate(activity) <> "”" ], []}, {:meta, [property: "og:type", content: "website"], []} ] ++