Browse Source

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

MastodonAPI: Fix list timelines

Closes mastofe#89 and #2693

See merge request pleroma/pleroma!3477
merge-requests/3498/head
Haelwenn 2 years ago
parent
commit
7acdab1f30
1 changed files with 3 additions and 1 deletions
  1. +3
    -1
      lib/pleroma/web/mastodon_api/controllers/timeline_controller.ex

+ 3
- 1
lib/pleroma/web/mastodon_api/controllers/timeline_controller.ex View File

@@ -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,


Loading…
Cancel
Save