stefan230/akkoma
1
0
Fork 0
forked from YokaiRick/akkoma
Code Pull requests Activity

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

Browse source 
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
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/pleroma/web/mastodon_api/controllers/timeline_controller.ex
View file

@ -193,7 +193,9 @@ def list(%{assigns: %{user: user}} = conn, %{list_id: id} = params) do
|> ActivityPub.fetch_activities_bounded(following, params) |> ActivityPub.fetch_activities_bounded(following, params)
|> Enum.reverse() |> Enum.reverse()
render(conn, "index.json", conn
|> add_link_headers(activities)
|> render("index.json",
activities: activities, activities: activities,
for: user, for: user,
as: :activity, as: :activity,