Merge remote-tracking branch 'origin/patch/readd-mastofe' into develop

[akkoma] / config / config.exs

diff --git a/config/config.exs b/config/config.exs
index 2bde5b8268ed61e6cf988daee6faba2ff0973ffd..5fced7029c336180e7811f3724dd16e7d659c1ce 100644 (file)
--- a/config/config.exs
+++ b/config/config.exs
@@ -224,6 +224,7 @@ config :pleroma, :instance,
     "text/markdown",
     "text/bbcode"
   ],
+  staff_transparency: [],
   autofollowed_nicknames: [],
   autofollowing_nicknames: [],
   max_pinned_statuses: 1,
@@ -326,6 +327,9 @@ config :pleroma, :frontend_configurations,
     subjectLineBehavior: "email",
     theme: "pleroma-dark",
     webPushNotifications: false
+  },
+  masto_fe: %{
+    showInstanceSpecificPanel: true
   }
 
 config :pleroma, :assets,
@@ -856,6 +860,8 @@ config :pleroma, ConcurrentLimiter, [
   {Pleroma.Web.ActivityPub.MRF.MediaProxyWarmingPolicy, [max_running: 5, max_waiting: 5]}
 ]
 
+config :pleroma, :search, provider: Pleroma.Search.Builtin
+
 config :pleroma, :telemetry,
   slow_queries_logging: [
     enabled: false,