diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-03-16 17:58:42 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-03-16 17:58:42 +0300 |
| commit | 0e07c5ef5717460d37336129cb657ba11091f09d (patch) | |
| tree | 801cb7957ebe2e4f227f089afc902ea2084eaf27 /lib/pleroma/web/feed/user_controller.ex | |
| parent | 7c8003c3fcdcab075b9722ab236bf2d1d0e0e8cd (diff) | |
| parent | b80958d4e3fb9cdbb9b10149a52f1441edb4b1e3 (diff) | |
| download | pleroma-0e07c5ef5717460d37336129cb657ba11091f09d.tar.gz | |
Merge remote-tracking branch 'remotes/origin/develop' into 1364-notifications-sending-control
Diffstat (limited to 'lib/pleroma/web/feed/user_controller.ex')
| -rw-r--r-- | lib/pleroma/web/feed/user_controller.ex | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/pleroma/web/feed/user_controller.ex b/lib/pleroma/web/feed/user_controller.ex index 59aabb549..9ba602d9f 100644 --- a/lib/pleroma/web/feed/user_controller.ex +++ b/lib/pleroma/web/feed/user_controller.ex @@ -25,7 +25,12 @@ defmodule Pleroma.Web.Feed.UserController do def feed_redirect(%{assigns: %{format: format}} = conn, _params) when format in ["json", "activity+json"] do - ActivityPubController.call(conn, :user) + with %{halted: false} = conn <- + Pleroma.Plugs.EnsureAuthenticatedPlug.call(conn, + unless_func: &Pleroma.Web.FederatingPlug.federating?/0 + ) do + ActivityPubController.call(conn, :user) + end end def feed_redirect(conn, %{"nickname" => nickname}) do |