Merge branch 'develop' of gitssh.ihatebeinga.live:IHBAGang/pleroma into develop

[akkoma] / config / config.exs

diff --git a/config/config.exs b/config/config.exs
index 66d394655657869f8f8346fdb4a070eb506e5d6a..581f3831a7ab452275378611a0c24a81a679af88 100644 (file)
--- a/config/config.exs
+++ b/config/config.exs
@@ -221,6 +221,7 @@ config :pleroma, :instance,
     "text/markdown",
     "text/bbcode"
   ],
+  staff_transparency: [],
   autofollowed_nicknames: [],
   autofollowing_nicknames: [],
   max_pinned_statuses: 1,
@@ -349,6 +350,7 @@ config :pleroma, :manifest,
 config :pleroma, :activitypub,
   unfollow_blocked: true,
   outgoing_blocks: true,
+  blockers_visible: true,
   follow_handshake_timeout: 500,
   note_replies_output_limit: 5,
   sign_object_fetches: true,
@@ -850,6 +852,8 @@ config :pleroma, ConcurrentLimiter, [
   {Pleroma.Web.ActivityPub.MRF.MediaProxyWarmingPolicy, [max_running: 5, max_waiting: 5]}
 ]
 
+config :pleroma, :search, provider: Pleroma.Search.Builtin
+
 # Import environment specific config. This must remain at the bottom
 # of this file so it overrides the configuration defined above.
 import_config "#{Mix.env()}.exs"