Merge branch 'outbox_pagination' into 'develop'

Fix AP outbox pagination

See merge request pleroma/pleroma!1700
This commit is contained in:
lain 2019-09-19 16:53:59 +00:00
commit b80c41a14f
2 changed files with 25 additions and 1 deletions

View file

@ -227,11 +227,12 @@ defmodule Pleroma.Web.ActivityPub.UserView do
activities = ActivityPub.fetch_user_activities(user, nil, params)
# this is sorted chronologically, so first activity is the newest (max)
{max_id, min_id, collection} =
if length(activities) > 0 do
{
Enum.at(Enum.reverse(activities), 0).id,
Enum.at(activities, 0).id,
Enum.at(Enum.reverse(activities), 0).id,
Enum.map(activities, fn act ->
{:ok, data} = Transmogrifier.prepare_outgoing(act.data)
data