X-Git-Url: https://git.squeep.com/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fpleroma%2Fconfig.ex;h=54e332595d73762f155ce5c438ea8bfd494184c0;hb=26d2c677b78b7cc22a98dfe4648e5b3f5b4da3ea;hp=1ee4777f6190e9aeb2ce369467655532126e3bb3;hpb=5db1e6c8d37ea114433afe0a9247314ab92cc52f;p=akkoma
diff --git a/lib/pleroma/config.ex b/lib/pleroma/config.ex
index 1ee4777f6..54e332595 100644
--- a/lib/pleroma/config.ex
+++ b/lib/pleroma/config.ex
@@ -1,12 +1,7 @@
# Pleroma: A lightweight social networking server
-# Copyright © 2017-2020 Pleroma Authors
+# Copyright © 2017-2021 Pleroma Authors
# SPDX-License-Identifier: AGPL-3.0-only
-defmodule Pleroma.Config.Getting do
- @callback get(any()) :: any()
- @callback get(any(), any()) :: any()
-end
-
defmodule Pleroma.Config do
@behaviour Pleroma.Config.Getting
defmodule Error do
@@ -105,15 +100,7 @@ defmodule Pleroma.Config do
def oauth_consumer_enabled?, do: oauth_consumer_strategies() != []
- def enforce_oauth_admin_scope_usage?, do: !!get([:auth, :enforce_oauth_admin_scope_usage])
-
- def oauth_admin_scopes(scopes) when is_list(scopes) do
- Enum.flat_map(
- scopes,
- fn scope ->
- ["admin:#{scope}"] ++
- if enforce_oauth_admin_scope_usage?(), do: [], else: [scope]
- end
- )
+ def feature_enabled?(feature_name) do
+ get([:features, feature_name]) not in [nil, false, :disabled, :auto]
end
end