X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Ffeed%2Fuser_controller.ex;h=752983c3b0527a35a12570d8035fc25a98fef3ce;hb=c3112fd13a6af239b9dff0813e93266ec58f571e;hp=595889b9d31ebaf16c197b83248947184ca2e4e2;hpb=a85ed6defbd2cec71d9a5594ef1de18d5333c7c7;p=akkoma

diff --git a/lib/pleroma/web/feed/user_controller.ex b/lib/pleroma/web/feed/user_controller.ex
index 595889b9d..752983c3b 100644
--- a/lib/pleroma/web/feed/user_controller.ex
+++ b/lib/pleroma/web/feed/user_controller.ex
@@ -5,27 +5,26 @@
 defmodule Pleroma.Web.Feed.UserController do
   use Pleroma.Web, :controller
 
-  alias Fallback.RedirectController
   alias Pleroma.User
   alias Pleroma.Web.ActivityPub.ActivityPub
   alias Pleroma.Web.ActivityPub.ActivityPubController
   alias Pleroma.Web.Feed.FeedView
 
-  plug(Pleroma.Plugs.SetFormatPlug when action in [:feed_redirect])
+  plug(Pleroma.Web.Plugs.SetFormatPlug when action in [:feed_redirect])
 
   action_fallback(:errors)
 
   def feed_redirect(%{assigns: %{format: "html"}} = conn, %{"nickname" => nickname}) do
     with {_, %User{} = user} <- {:fetch_user, User.get_cached_by_nickname_or_id(nickname)} do
-      RedirectController.redirector_with_meta(conn, %{user: user})
+      Pleroma.Web.Fallback.RedirectController.redirector_with_meta(conn, %{user: user})
     end
   end
 
   def feed_redirect(%{assigns: %{format: format}} = conn, _params)
       when format in ["json", "activity+json"] do
     with %{halted: false} = conn <-
-           Pleroma.Plugs.EnsureAuthenticatedPlug.call(conn,
-             unless_func: &Pleroma.Web.FederatingPlug.federating?/1
+           Pleroma.Web.Plugs.EnsureAuthenticatedPlug.call(conn,
+             unless_func: &Pleroma.Web.Plugs.FederatingPlug.federating?/1
            ) do
       ActivityPubController.call(conn, :user)
     end
@@ -38,7 +37,7 @@ defmodule Pleroma.Web.Feed.UserController do
   end
 
   def feed(conn, params) do
-    if Pleroma.Config.get!([:instance, :public]) do
+    unless Pleroma.Config.restrict_unauthenticated_access?(:profiles, :local) do
       render_feed(conn, params)
     else
       errors(conn, {:error, :not_found})