[#3213] Made Object.hashtags/1 work with :hashtags assoc. Adjusted tests.

[akkoma] / lib / pleroma / config.ex

diff --git a/lib/pleroma/config.ex b/lib/pleroma/config.ex
index 1ee4777f6190e9aeb2ce369467655532126e3bb3..ee0167f4ef537138983a9d338b411ee9e0e0e84b 100644 (file)
--- a/lib/pleroma/config.ex
+++ b/lib/pleroma/config.ex
@@ -2,11 +2,6 @@
 # Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
 # 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
@@ -101,6 +96,8 @@ 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() != []