projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'remotes/upstream/develop' into 1427-oauth-admin-scopes
[akkoma]
/
lib
/
pleroma
/
web
/
mastodon_api
/
controllers
/
list_controller.ex
diff --git
a/lib/pleroma/web/mastodon_api/controllers/list_controller.ex
b/lib/pleroma/web/mastodon_api/controllers/list_controller.ex
index be70896305f165a81a84190db0b49f9f828198de..e0ffdba213713457cbbc86e3bb70c43e01f33f35 100644
(file)
--- a/
lib/pleroma/web/mastodon_api/controllers/list_controller.ex
+++ b/
lib/pleroma/web/mastodon_api/controllers/list_controller.ex
@@
-19,6
+19,8
@@
defmodule Pleroma.Web.MastodonAPI.ListController do
when action in [:create, :update, :delete, :add_to_list, :remove_from_list]
)
when action in [:create, :update, :delete, :add_to_list, :remove_from_list]
)
+ plug(Pleroma.Plugs.EnsurePublicOrAuthenticatedPlug)
+
action_fallback(Pleroma.Web.MastodonAPI.FallbackController)
# GET /api/v1/lists
action_fallback(Pleroma.Web.MastodonAPI.FallbackController)
# GET /api/v1/lists
@@
-58,7
+60,7
@@
defmodule Pleroma.Web.MastodonAPI.ListController do
with {:ok, users} <- Pleroma.List.get_following(list) do
conn
|> put_view(AccountView)
with {:ok, users} <- Pleroma.List.get_following(list) do
conn
|> put_view(AccountView)
- |> render("
accounts
.json", for: user, users: users, as: :user)
+ |> render("
index
.json", for: user, users: users, as: :user)
end
end
end
end