diff options
| author | lain <lain@soykaf.club> | 2021-11-15 10:48:56 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2021-11-15 10:48:56 +0000 |
| commit | bd77243981f037b4f7b3aeef5291baed67028aef (patch) | |
| tree | 2bc0ca66a000ef1469cc8a44b46b57637f8b7849 /lib | |
| parent | d058e1c9786f1731822ac7be6dae02c02d8d6e4d (diff) | |
| parent | b11dbbf4037143c975c51f4ab6286378b7e74f8e (diff) | |
| download | pleroma-bd77243981f037b4f7b3aeef5291baed67028aef.tar.gz pleroma-bd77243981f037b4f7b3aeef5291baed67028aef.zip | |
Merge branch 'userfeed-fe-fallback' into 'develop'
UserController: fall back to frontend when user isn't found
Closes #2730
See merge request pleroma/pleroma!3515
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/feed/user_controller.ex | 2 |
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 |