diff options
| author | lain <lain@soykaf.club> | 2020-05-29 12:36:17 +0200 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-05-29 12:36:17 +0200 |
| commit | af6d01ec93a07cd896bc4f0a2c2cf437c6fd51fc (patch) | |
| tree | 54e02858d0fa9ca905ffe5a057c9f0accbeae115 /lib/pleroma/web/feed/user_controller.ex | |
| parent | dbd07d29a358a446d87078d60b993a59b757ad1d (diff) | |
| parent | 396bc69aeef951f163c0c20474ce4653df1dd667 (diff) | |
| download | pleroma-af6d01ec93a07cd896bc4f0a2c2cf437c6fd51fc.tar.gz | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
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") |