diff options
| author | kaniini <ariadne@dereferenced.org> | 2019-09-30 12:21:16 +0000 |
|---|---|---|
| committer | kaniini <ariadne@dereferenced.org> | 2019-09-30 12:21:16 +0000 |
| commit | 905bb11747fb87f2ad960175e1fc73aa0e3657a0 (patch) | |
| tree | c92908b5d32c4f84f98807b655c726e0d5a88674 /lib/pleroma/web/mastodon_api/controllers/status_controller.ex | |
| parent | 3f0e276ac94589d860c7e4c95d3661fa494f4361 (diff) | |
| parent | c55facf78b6714947d8c5b02b76846f5f2ae7744 (diff) | |
| download | pleroma-905bb11747fb87f2ad960175e1fc73aa0e3657a0.tar.gz | |
Merge branch 'split-masto-api/accounts' into 'develop'
Extract account actions from `MastodonAPIController` to `AccountController`
See merge request pleroma/pleroma!1731
Diffstat (limited to 'lib/pleroma/web/mastodon_api/controllers/status_controller.ex')
| -rw-r--r-- | lib/pleroma/web/mastodon_api/controllers/status_controller.ex | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/pleroma/web/mastodon_api/controllers/status_controller.ex b/lib/pleroma/web/mastodon_api/controllers/status_controller.ex index f4de9285b..3c6987a5f 100644 --- a/lib/pleroma/web/mastodon_api/controllers/status_controller.ex +++ b/lib/pleroma/web/mastodon_api/controllers/status_controller.ex @@ -231,7 +231,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusController do conn |> put_view(AccountView) - |> render("accounts.json", for: user, users: users, as: :user) + |> render("index.json", for: user, users: users, as: :user) else {:visible, false} -> {:error, :not_found} _ -> json(conn, []) @@ -251,7 +251,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusController do conn |> put_view(AccountView) - |> render("accounts.json", for: user, users: users, as: :user) + |> render("index.json", for: user, users: users, as: :user) else {:visible, false} -> {:error, :not_found} _ -> json(conn, []) |