squeegily/pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex

Browse Source
This commit is contained in:
rinpatch 2019-09-25 13:20:48 +00:00
parent d87be2ec96
commit 1ddd403339
1 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
lib/pleroma/web/activity_pub/activity_pub_controller.ex
View File

@ -234,22 +234,23 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubController do
def outbox(conn, %{"nickname" => nickname, "page" => page?} = params) def outbox(conn, %{"nickname" => nickname, "page" => page?} = params)
when page? in [true, "true"] do when page? in [true, "true"] do
with %User{} = user <- User.get_cached_by_nickname(nickname), with %User{} = user <- User.get_cached_by_nickname(nickname),
{:ok, user} <- User.ensure_keys_present(user), {:ok, user} <- User.ensure_keys_present(user) do
activities <- activities =
(if params["max_id"] do if params["max_id"] do
ActivityPub.fetch_user_activities(user, nil, %{ ActivityPub.fetch_user_activities(user, nil, %{
"max_id" => params["max_id"], "max_id" => params["max_id"],
# This is a hack because postgres generates inefficient queries when filtering by 'Answer', # 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 # poll votes will be hidden by the visibility filter in this case anyway
"include_poll_votes" => true, "include_poll_votes" => true,
"limit" => 10 "limit" => 10
}) })
else else
ActivityPub.fetch_user_activities(user, nil, %{ ActivityPub.fetch_user_activities(user, nil, %{
"limit" => 10, "limit" => 10,
"include_poll_votes" => true "include_poll_votes" => true
}) })
end) do end
conn conn
|> put_resp_content_type("application/activity+json") |> put_resp_content_type("application/activity+json")
|> put_view(UserView) |> put_view(UserView)