Merge branch 'mkljczk-develop-patch-60115' into 'develop'

MastodonAPI: Fix list timelines

Closes mastofe#89 and #2693

See merge request pleroma/pleroma!3477
This commit is contained in:
Haelwenn 2021-07-22 18:41:11 +00:00
commit 7acdab1f30

View File

@ -193,7 +193,9 @@ defmodule Pleroma.Web.MastodonAPI.TimelineController do
|> ActivityPub.fetch_activities_bounded(following, params)
|> Enum.reverse()
render(conn, "index.json",
conn
|> add_link_headers(activities)
|> render("index.json",
activities: activities,
for: user,
as: :activity,