Merge branch '1559-follow-request-notifications' into 'develop'

[akkoma] / config / config.exs

diff --git a/config/config.exs b/config/config.exs
index 2b7a761eab67c29f208e86143b9c2609bbe48b75..6b881e1b2fb98da4270643a7c6fa3756a58869c8 100644 (file)
--- a/config/config.exs
+++ b/config/config.exs
@@ -402,6 +402,8 @@ config :phoenix, :format_encoders, json: Jason
 
 config :phoenix, :json_library, Jason
 
+config :phoenix, :filter_parameters, ["password", "confirm"]
+
 config :pleroma, :gopher,
   enabled: false,
   ip: {0, 0, 0, 0},
@@ -502,10 +504,6 @@ config :pleroma, :workers,
     federator_outgoing: 5
   ]
 
-config :pleroma, :fetch_initial_posts,
-  enabled: false,
-  pages: 5
-
 config :auto_linker,
   opts: [
     extra: true,
@@ -583,6 +581,8 @@ config :pleroma, :email_notifications,
     inactivity_threshold: 7
   }
 
+config :pleroma, :notifications, enable_follow_request_notifications: false
+
 config :pleroma, :oauth2,
   token_expires_in: 600,
   issue_new_refresh_token: true,
@@ -597,6 +597,7 @@ config :http_signatures,
 
 config :pleroma, :rate_limit,
   authentication: {60_000, 15},
+  timeline: {500, 3},
   search: [{1000, 10}, {1000, 30}],
   app_account_creation: {1_800_000, 25},
   relations_actions: {10_000, 10},