diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-09-25 13:20:48 +0000 | 
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-09-26 03:46:10 +0300 | 
| commit | 22a16a3e811841bba64eb1281e5277f9a009acee (patch) | |
| tree | 0f8e1632d5b024fea46daeddc9ecde372cfc4d99 | |
| parent | d4a76b0a6ffba70c0f0bc10a4175cfdd99f8d574 (diff) | |
| download | pleroma-22a16a3e811841bba64eb1281e5277f9a009acee.tar.gz pleroma-22a16a3e811841bba64eb1281e5277f9a009acee.zip | |
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 8069d64c9..5a3a4d5d1 100644 --- a/lib/pleroma/web/activity_pub/activity_pub_controller.ex +++ b/lib/pleroma/web/activity_pub/activity_pub_controller.ex @@ -200,22 +200,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) | 
