AkkomaGang/akkoma
AkkomaGang/akkoma
15
66
Fork 94
Code Issues 180 Pull requests 27 Projects 2 Releases 14 Packages Wiki Activity

Merge branch 'fix/user-timeline-reading-user' into 'develop'

Browse source 
MastoAPI user timelines: render statuses for the logged in user.

See merge request pleroma/pleroma!187
This commit is contained in:
eal 2018-06-01 09:35:29 +00:00
commit dca1d6d162
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
View file

@ -236,7 +236,11 @@ def user_statuses(%{assigns: %{user: reading_user}} = conn, params) do
conn conn
|> add_link_headers(:user_statuses, activities, params["id"]) |> add_link_headers(:user_statuses, activities, params["id"])
|> render(StatusView, "index.json", %{activities: activities, for: user, as: :activity}) |> render(StatusView, "index.json", %{
activities: activities,
for: reading_user,
as: :activity
})
end end
end end