projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fix/chats-no-unread-in-openapi' into 'develop'
[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 5d155af3da26d4d919bbf9c31bdb16d6cd52b054..a718d7b8d7a1f32f1d502e3bc0f72c9fcd5d1be0 100644
(file)
--- a/
lib/pleroma/web/admin_api/controllers/config_controller.ex
+++ b/
lib/pleroma/web/admin_api/controllers/config_controller.ex
@@
-1,5
+1,5
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-202
0
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-202
1
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.AdminAPI.ConfigController do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.AdminAPI.ConfigController do
@@
-10,11
+10,11
@@
defmodule Pleroma.Web.AdminAPI.ConfigController do
alias Pleroma.Web.Plugs.OAuthScopesPlug
plug(Pleroma.Web.ApiSpec.CastAndValidate)
alias Pleroma.Web.Plugs.OAuthScopesPlug
plug(Pleroma.Web.ApiSpec.CastAndValidate)
- plug(OAuthScopesPlug, %{scopes: ["
write"], admin: true
} when action == :update)
+ plug(OAuthScopesPlug, %{scopes: ["
admin:write"]
} when action == :update)
plug(
OAuthScopesPlug,
plug(
OAuthScopesPlug,
- %{scopes: ["
read"], admin: true
}
+ %{scopes: ["
admin:read"]
}
when action in [:show, :descriptions]
)
when action in [:show, :descriptions]
)
@@
-122,7
+122,7
@@
defmodule Pleroma.Web.AdminAPI.ConfigController do
if Config.get(:configurable_from_database) do
:ok
else
if Config.get(:configurable_from_database) do
:ok
else
- {:error, "
To use this endpoint you need to enable configuration from databas
e."}
+ {:error, "
You must enable configurable_from_database in your config fil
e."}
end
end
end
end