aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web
diff options
context:
space:
mode:
Diffstat (limited to 'lib/pleroma/web')
-rw-r--r--lib/pleroma/web/metadata.ex10
-rw-r--r--lib/pleroma/web/router.ex2
2 files changed, 9 insertions, 3 deletions
diff --git a/lib/pleroma/web/metadata.ex b/lib/pleroma/web/metadata.ex
index 9935726fc..b7052eec1 100644
--- a/lib/pleroma/web/metadata.ex
+++ b/lib/pleroma/web/metadata.ex
@@ -21,7 +21,13 @@ defmodule Pleroma.Web.Metadata do
{:meta,
[
property: "og:title",
- content: "#{user.name} (@#{user.nickname}@#{pleroma_domain()}) post ##{activity.id}"
+ content:
+ "#{user.name}" <>
+ if user.local do
+ "(@#{user.nickname}@{pleroma_domain})"
+ else
+ "(@#{user.nickname})"
+ end
], []},
{:meta, [property: "og:url", content: activity.data["id"]], []},
{:meta, [property: "og:description", content: truncated_content], []},
@@ -35,7 +41,7 @@ defmodule Pleroma.Web.Metadata do
# opengraph for user card
defp opengraph_tags(%{user: user}) do
- with truncated_bio = scrub_html_and_truncate(user.bio) do
+ with truncated_bio = scrub_html_and_truncate(user.bio || "") do
[
{:meta,
[
diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex
index 5ef99bec5..6cf689ce2 100644
--- a/lib/pleroma/web/router.ex
+++ b/lib/pleroma/web/router.ex
@@ -505,7 +505,7 @@ defmodule Pleroma.Web.Router do
scope "/", Fallback do
get("/registration/:token", RedirectController, :registration_page)
- get("/*path", RedirectController, :redirector)
+ get("/*path", RedirectController, :redirector_with_meta)
options("/*path", RedirectController, :empty)
end