projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
196d36a
)
MastoAPI user timelines: render statuses for the logged in user.
author
eal
<eal@waifu.club>
Fri, 1 Jun 2018 09:16:42 +0000
(12:16 +0300)
committer
eal
<eal@waifu.club>
Fri, 1 Jun 2018 09:30:11 +0000
(12:30 +0300)
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
patch
|
blob
|
history
diff --git
a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
index 64a8a66f76b57204041d1923bcbd4e64265b54cf..5fb51e8fa323b36d4bf43ad5a3fbe592a9e309e0 100644
(file)
--- a/
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
+++ b/
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
@@
-236,7
+236,11
@@
defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
conn
|> 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