projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Chat: Add views, don't return them in timeline queries.
[akkoma]
/
lib
/
pleroma
/
web
/
pleroma_api
/
controllers
/
account_controller.ex
diff --git
a/lib/pleroma/web/pleroma_api/controllers/account_controller.ex
b/lib/pleroma/web/pleroma_api/controllers/account_controller.ex
index dcba67d038bfcff8fdecb49d9660542a0f19c536..9d0b3b1e45cf0620904ef6f7067fa4bf261bcdd0 100644
(file)
--- a/
lib/pleroma/web/pleroma_api/controllers/account_controller.ex
+++ b/
lib/pleroma/web/pleroma_api/controllers/account_controller.ex
@@
-6,7
+6,7
@@
defmodule Pleroma.Web.PleromaAPI.AccountController do
use Pleroma.Web, :controller
import Pleroma.Web.ControllerHelper,
use Pleroma.Web, :controller
import Pleroma.Web.ControllerHelper,
- only: [json_response: 3, add_link_headers: 2, assign_account_by_id: 2]
+ only: [json_response: 3, add_link_headers: 2, assign_account_by_id: 2
, skip_relationships?: 1
]
alias Ecto.Changeset
alias Pleroma.Plugs.OAuthScopesPlug
alias Ecto.Changeset
alias Pleroma.Plugs.OAuthScopesPlug
@@
-139,7
+139,12
@@
defmodule Pleroma.Web.PleromaAPI.AccountController do
conn
|> add_link_headers(activities)
|> put_view(StatusView)
conn
|> add_link_headers(activities)
|> put_view(StatusView)
- |> render("index.json", activities: activities, for: for_user, as: :activity)
+ |> render("index.json",
+ activities: activities,
+ for: for_user,
+ as: :activity,
+ skip_relationships: skip_relationships?(params)
+ )
end
@doc "POST /api/v1/pleroma/accounts/:id/subscribe"
end
@doc "POST /api/v1/pleroma/accounts/:id/subscribe"