diff options
| author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2021-07-22 18:41:11 +0000 |
|---|---|---|
| committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2021-07-22 18:41:11 +0000 |
| commit | 7acdab1f305bac744a302e3b44e2e920d6bc8a47 (patch) | |
| tree | 5fa40a36bfb2f3e023bcf7a16cd9f21708358e37 | |
| parent | 3f58213646238aeca542e2f69ef3bbf0105eaa5d (diff) | |
| parent | 6ef8e1776dc6b797daec923a365ae367d8279452 (diff) | |
| download | pleroma-7acdab1f305bac744a302e3b44e2e920d6bc8a47.tar.gz | |
Merge branch 'mkljczk-develop-patch-60115' into 'develop'
MastodonAPI: Fix list timelines
Closes mastofe#89 and #2693
See merge request pleroma/pleroma!3477
| -rw-r--r-- | lib/pleroma/web/mastodon_api/controllers/timeline_controller.ex | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/pleroma/web/mastodon_api/controllers/timeline_controller.ex b/lib/pleroma/web/mastodon_api/controllers/timeline_controller.ex index 4b49b74ca..10c279893 100644 --- a/lib/pleroma/web/mastodon_api/controllers/timeline_controller.ex +++ b/lib/pleroma/web/mastodon_api/controllers/timeline_controller.ex @@ -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, |