a1batross/pleroma
1
0
Fork 0
Code Issues 1 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 d4a76b0a6f
commit 22a16a3e81
1 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -200,9 +200,9 @@ 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
{: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',
@ -215,7 +215,8 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubController do
"limit" => 10,
"include_poll_votes" => true
})
end) do
end
conn
|> put_resp_content_type("application/activity+json")
|> put_view(UserView)