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 'upstream/develop' into block-behavior
[akkoma]
/
lib
/
pleroma
/
web
/
admin_api
/
controllers
/
config_controller.ex
diff --git
a/lib/pleroma/web/admin_api/controllers/config_controller.ex
b/lib/pleroma/web/admin_api/controllers/config_controller.ex
index 7f60470cbb7a4a237131f4688df9e3a1ba0a2650..5d155af3da26d4d919bbf9c31bdb16d6cd52b054 100644
(file)
--- a/
lib/pleroma/web/admin_api/controllers/config_controller.ex
+++ b/
lib/pleroma/web/admin_api/controllers/config_controller.ex
@@
-7,9
+7,7
@@
defmodule Pleroma.Web.AdminAPI.ConfigController do
alias Pleroma.Config
alias Pleroma.ConfigDB
alias Pleroma.Config
alias Pleroma.ConfigDB
- alias Pleroma.Plugs.OAuthScopesPlug
-
- @descriptions Pleroma.Docs.JSON.compile()
+ alias Pleroma.Web.Plugs.OAuthScopesPlug
plug(Pleroma.Web.ApiSpec.CastAndValidate)
plug(OAuthScopesPlug, %{scopes: ["write"], admin: true} when action == :update)
plug(Pleroma.Web.ApiSpec.CastAndValidate)
plug(OAuthScopesPlug, %{scopes: ["write"], admin: true} when action == :update)
@@
-25,7
+23,7
@@
defmodule Pleroma.Web.AdminAPI.ConfigController do
defdelegate open_api_operation(action), to: Pleroma.Web.ApiSpec.Admin.ConfigOperation
def descriptions(conn, _params) do
defdelegate open_api_operation(action), to: Pleroma.Web.ApiSpec.Admin.ConfigOperation
def descriptions(conn, _params) do
- descriptions = Enum.filter(
@descriptions
, &whitelisted_config?/1)
+ descriptions = Enum.filter(
Pleroma.Docs.JSON.compiled_descriptions()
, &whitelisted_config?/1)
json(conn, descriptions)
end
json(conn, descriptions)
end