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:
commit
7acdab1f30
|
@ -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,
|
||||||
|
|
Loading…
Reference in New Issue