diff options
author | Egor Kislitsyn <egor@kislitsyn.com> | 2020-06-02 18:50:37 +0400 |
---|---|---|
committer | Egor Kislitsyn <egor@kislitsyn.com> | 2020-06-02 18:50:37 +0400 |
commit | 68cb152a0861618035ac48a0e0b455f74d9b767c (patch) | |
tree | cb2f14ed088efa0ab5b6952ee7d74d69f524387a /lib/pleroma/web/feed/user_controller.ex | |
parent | cbcd592300673582e38d0bf539dcdb9a2c1985a1 (diff) | |
parent | 879304dcd94c778b3cdaa2b82f69fccf2b37090c (diff) | |
download | pleroma-68cb152a0861618035ac48a0e0b455f74d9b767c.tar.gz |
Merge branch 'develop' into openapi/admin/relay
Diffstat (limited to 'lib/pleroma/web/feed/user_controller.ex')
-rw-r--r-- | lib/pleroma/web/feed/user_controller.ex | 2 |
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 1b72e23dc..5a6fc9de0 100644 --- a/lib/pleroma/web/feed/user_controller.ex +++ b/lib/pleroma/web/feed/user_controller.ex @@ -56,7 +56,7 @@ defmodule Pleroma.Web.Feed.UserController do "actor_id" => user.ap_id } |> put_if_exist("max_id", params["max_id"]) - |> ActivityPub.fetch_public_activities() + |> ActivityPub.fetch_public_or_unlisted_activities() conn |> put_resp_content_type("application/#{format}+xml") |