aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/feed
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2020-05-07 14:45:20 +0200
committerlain <lain@soykaf.club>2020-05-07 14:45:20 +0200
commitf0c22df2265e922a66ca69c3508fe812b8e20b6b (patch)
treebe510abc9cc9154e07b2ec9eaf344e6e4e88bed1 /lib/pleroma/web/feed
parent92caae592338a3ca307686e7644f2de18bb57ce5 (diff)
parent4c92dfb73ef1f40438adf5da009499205a677912 (diff)
downloadpleroma-f0c22df2265e922a66ca69c3508fe812b8e20b6b.tar.gz
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/undo-validator-reduced
Diffstat (limited to 'lib/pleroma/web/feed')
-rw-r--r--lib/pleroma/web/feed/user_controller.ex2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/web/feed/user_controller.ex b/lib/pleroma/web/feed/user_controller.ex
index e27f85929..1b72e23dc 100644
--- a/lib/pleroma/web/feed/user_controller.ex
+++ b/lib/pleroma/web/feed/user_controller.ex
@@ -27,7 +27,7 @@ defmodule Pleroma.Web.Feed.UserController do
when format in ["json", "activity+json"] do
with %{halted: false} = conn <-
Pleroma.Plugs.EnsureAuthenticatedPlug.call(conn,
- unless_func: &Pleroma.Web.FederatingPlug.federating?/0
+ unless_func: &Pleroma.Web.FederatingPlug.federating?/1
) do
ActivityPubController.call(conn, :user)
end