aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/feed/user_controller.ex
diff options
context:
space:
mode:
authorAlex Gleason <alex@alexgleason.me>2021-12-07 13:41:54 -0500
committerAlex Gleason <alex@alexgleason.me>2021-12-07 13:41:54 -0500
commit2c96668a2c20906e5159fdea9326dbba4ca6ca62 (patch)
treee7fc1def45d51ba8011c1cfacb28c2523279e09b /lib/pleroma/web/feed/user_controller.ex
parent335684182a094c10fb9f72e3865fd1b9606484a4 (diff)
parentb57041c59a14df78b4a461e68911a9edc788bc0a (diff)
downloadpleroma-2c96668a2c20906e5159fdea9326dbba4ca6ca62.tar.gz
Merge remote-tracking branch 'origin/develop' into fix-attachment-dimensions
Diffstat (limited to 'lib/pleroma/web/feed/user_controller.ex')
-rw-r--r--lib/pleroma/web/feed/user_controller.ex2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/pleroma/web/feed/user_controller.ex b/lib/pleroma/web/feed/user_controller.ex
index fa7879caf..739b1f026 100644
--- a/lib/pleroma/web/feed/user_controller.ex
+++ b/lib/pleroma/web/feed/user_controller.ex
@@ -18,6 +18,8 @@ defmodule Pleroma.Web.Feed.UserController do
def feed_redirect(%{assigns: %{format: "html"}} = conn, %{"nickname" => nickname}) do
with {_, %User{} = user} <- {:fetch_user, User.get_cached_by_nickname_or_id(nickname)} do
Pleroma.Web.Fallback.RedirectController.redirector_with_meta(conn, %{user: user})
+ else
+ _ -> Pleroma.Web.Fallback.RedirectController.redirector(conn, nil)
end
end