Commit ce15e065 authored by rinpatch's avatar rinpatch

Fix some edge cases [nervous laughter]

parent 4656f433
......@@ -454,7 +454,20 @@ def get_cached_by_nickname(nickname) do
end
def get_cached_by_nickname_or_id(nickname_or_id) do
get_cached_by_id(nickname_or_id) || get_cached_by_nickname(nickname_or_id)
try do
# TODO: convert to UUIDs when !654 is merged
maybe_id = String.to_integer(nickname_or_id)
user = get_cached_by_id(maybe_id)
if user == nil do
raise ArgumentError, message: "invalid argument foo"
else
user
end
rescue
_ in ArgumentError ->
get_cached_by_nickname(nickname_or_id)
end
end
def get_by_nickname(nickname) do
......
......@@ -21,7 +21,13 @@ defp opengraph_tags(%{activity: activity, user: user}) 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 @@ defp opengraph_tags(%{activity: activity, user: user}) 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,
[
......
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment