diff options
| author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2019-07-09 16:07:20 +0000 |
|---|---|---|
| committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2019-07-09 16:07:20 +0000 |
| commit | 1ab4e35f27f2d54058460657f63de09a8f9d1444 (patch) | |
| tree | c31e75ff116dd362c9d5e7cd345815a8ed8ef7b4 /lib/pleroma/web/metadata | |
| parent | 167f810ff18fdc0271e6908d1d07c2f715e3f34f (diff) | |
| parent | f3cc2acb0f4ae9112ea30a259acc384f5138c0fc (diff) | |
| download | pleroma-1ab4e35f27f2d54058460657f63de09a8f9d1444.tar.gz | |
Merge branch 'enable-ogp-by-default' into 'develop'
Do not crash if metadata fails to render and enable OGP and TwitterCard by default
Closes #1034
See merge request pleroma/pleroma!1388
Diffstat (limited to 'lib/pleroma/web/metadata')
| -rw-r--r-- | lib/pleroma/web/metadata/opengraph.ex | 2 | ||||
| -rw-r--r-- | lib/pleroma/web/metadata/twitter_card.ex | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/lib/pleroma/web/metadata/opengraph.ex b/lib/pleroma/web/metadata/opengraph.ex index 357b80a2d..4033ec38f 100644 --- a/lib/pleroma/web/metadata/opengraph.ex +++ b/lib/pleroma/web/metadata/opengraph.ex @@ -121,4 +121,6 @@ defmodule Pleroma.Web.Metadata.Providers.OpenGraph do acc ++ rendered_tags end) end + + defp build_attachments(_), do: [] end diff --git a/lib/pleroma/web/metadata/twitter_card.ex b/lib/pleroma/web/metadata/twitter_card.ex index 040b872e7..8dd01e0d5 100644 --- a/lib/pleroma/web/metadata/twitter_card.ex +++ b/lib/pleroma/web/metadata/twitter_card.ex @@ -117,6 +117,8 @@ defmodule Pleroma.Web.Metadata.Providers.TwitterCard do end) end + defp build_attachments(_id, _object), do: [] + defp player_url(id) do Pleroma.Web.Router.Helpers.o_status_url(Pleroma.Web.Endpoint, :notice_player, id) end |