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/router.ex | |
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/router.ex')
-rw-r--r-- | lib/pleroma/web/router.ex | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex index 055289dc5..ff9ed1640 100644 --- a/lib/pleroma/web/router.ex +++ b/lib/pleroma/web/router.ex @@ -724,6 +724,7 @@ end defmodule Fallback.RedirectController do use Pleroma.Web, :controller + require Logger alias Pleroma.User alias Pleroma.Web.Metadata @@ -750,7 +751,20 @@ defmodule Fallback.RedirectController do def redirector_with_meta(conn, params) do {:ok, index_content} = File.read(index_file_path()) - tags = Metadata.build_tags(params) + + tags = + try do + Metadata.build_tags(params) + rescue + e -> + Logger.error( + "Metadata rendering for #{conn.request_path} failed.\n" <> + Exception.format(:error, e, __STACKTRACE__) + ) + + "" + end + response = String.replace(index_content, "<!--server-generated-meta-->", tags) conn |