pleroma

commit: 7acdab1f305bac744a302e3b44e2e920d6bc8a47
parent 3f58213646238aeca542e2f69ef3bbf0105eaa5d
Author: Haelwenn <contact+git.pleroma.social@hacktivis.me>
Date:   Thu, 22 Jul 2021 18:41:11 +0000

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

MastodonAPI: Fix list timelines

Closes mastofe#89 and #2693

See merge request pleroma/pleroma!3477
Diffstat:
M
lib/pleroma/web/mastodon_api/controllers/timeline_controller.ex
4
+++-

1 file changed, 3 insertions(+), 1 deletion(-)
diff --git 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,