Merge remote-tracking branch 'upstream/develop' into neckbeard

2021-07-23 12:01:57 -05:00 · 2021-07-23 12:01:57 -05:00 · 915f12c194
parent 6d8be01f6f 7acdab1f30
commit 915f12c194
1 changed files with 3 additions and 1 deletions
--- 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,