X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Ffeed%2Fuser_controller.ex;h=dc3b1f94b526fe13ab59f8f3f3420897c2d87482;hb=5b4d77eaa73efad6ac1b46701bf6b39fc117d5b5;hp=fa7879cafdb38f94507a9aa09e8191a4c04aa3ed;hpb=2e682788a30b225b67254e92d1807b317ede57f8;p=akkoma diff --git a/lib/pleroma/web/feed/user_controller.ex b/lib/pleroma/web/feed/user_controller.ex index fa7879caf..dc3b1f94b 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 @@ -58,7 +60,8 @@ defmodule Pleroma.Web.Feed.UserController do |> render("user.#{format}", user: user, activities: activities, - feed_config: Config.get([:feed]) + feed_config: Config.get([:feed]), + view_module: FeedView ) end end