X-Git-Url: https://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fconfig.ex;h=54e332595d73762f155ce5c438ea8bfd494184c0;hb=18bf82d7479b0bb767a657e1b7447529f9c2884f;hp=dbfb114d69ea8a28ccad42a0b372febaca06cfc9;hpb=3e4d84729a4ca8d9779d439a9aa2c8c23b3acd1d;p=akkoma

diff --git a/lib/pleroma/config.ex b/lib/pleroma/config.ex
index dbfb114d6..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 <https://pleroma.social/>
+# Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/>
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.Config do
@@ -96,23 +96,11 @@ defmodule Pleroma.Config do
     end
   end
 
-  def improved_hashtag_timeline_path, do: [:instance, :improved_hashtag_timeline]
-  def improved_hashtag_timeline, do: get(improved_hashtag_timeline_path())
-  def object_embedded_hashtags?, do: !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