浏览代码

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 年前
父节点
当前提交
7acdab1f30
共有 1 个文件被更改,包括 3 次插入1 次删除
  1. +3
    -1
      lib/pleroma/web/mastodon_api/controllers/timeline_controller.ex

+ 3
- 1
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,


正在加载...
取消
保存