X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fconfig.ex;h=54e332595d73762f155ce5c438ea8bfd494184c0;hb=2e59cdd80f3e3d14c59aeba1fde2f8f9b8305e1f;hp=ee0167f4ef537138983a9d338b411ee9e0e0e84b;hpb=48e0f22ab1127b34a3bb7bcb687c131865ea3680;p=akkoma
diff --git a/lib/pleroma/config.ex b/lib/pleroma/config.ex
index ee0167f4e..54e332595 100644
--- a/lib/pleroma/config.ex
+++ b/lib/pleroma/config.ex
@@ -1,5 +1,5 @@
# 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 do
@@ -96,21 +96,11 @@ defmodule Pleroma.Config do
end
end
- def object_embedded_hashtags?, do: !get([:instance, :improved_hashtag_timeline])
-
def oauth_consumer_strategies, do: get([:auth, :oauth_consumer_strategies], [])
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