diff options
author | rinpatch <rinpatch@sdf.org> | 2019-09-25 13:20:48 +0000 |
---|---|---|
committer | rinpatch <rinpatch@sdf.org> | 2019-09-27 00:30:52 +0300 |
commit | 700d0a56a1a12a29b416862cf5309e4f1099515c (patch) | |
tree | e878c3b4b6a20e22494136361978b9a19a0042ad | |
parent | 68e7bea3549c57db23589e8c2a7d3d9fe36e399e (diff) | |
download | pleroma-700d0a56a1a12a29b416862cf5309e4f1099515c.tar.gz |
Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex
-rw-r--r-- | lib/pleroma/web/activity_pub/activity_pub_controller.ex | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/lib/pleroma/web/activity_pub/activity_pub_controller.ex b/lib/pleroma/web/activity_pub/activity_pub_controller.ex index cdaac5590..636848a38 100644 --- a/lib/pleroma/web/activity_pub/activity_pub_controller.ex +++ b/lib/pleroma/web/activity_pub/activity_pub_controller.ex @@ -147,22 +147,23 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubController do def outbox(conn, %{"nickname" => nickname, "page" => page?} = params) when page? in [true, "true"] do with %User{} = user <- User.get_cached_by_nickname(nickname), - {:ok, user} <- User.ensure_keys_present(user), - activities <- - (if params["max_id"] do - ActivityPub.fetch_user_activities(user, nil, %{ - "max_id" => params["max_id"], - # This is a hack because postgres generates inefficient queries when filtering by 'Answer', - # poll votes will be hidden by the visibility filter in this case anyway - "include_poll_votes" => true, - "limit" => 10 - }) - else - ActivityPub.fetch_user_activities(user, nil, %{ - "limit" => 10, - "include_poll_votes" => true - }) - end) do + {:ok, user} <- User.ensure_keys_present(user) do + activities = + if params["max_id"] do + ActivityPub.fetch_user_activities(user, nil, %{ + "max_id" => params["max_id"], + # This is a hack because postgres generates inefficient queries when filtering by 'Answer', + # poll votes will be hidden by the visibility filter in this case anyway + "include_poll_votes" => true, + "limit" => 10 + }) + else + ActivityPub.fetch_user_activities(user, nil, %{ + "limit" => 10, + "include_poll_votes" => true + }) + end + conn |> put_resp_content_type("application/activity+json") |> put_view(UserView) |