Revert "Merge branch 'streamer-refactoring' into 'develop'"

[akkoma] / config / config.exs

diff --git a/config/config.exs b/config/config.exs
index 43d114d70ddedde25161bf0e24d0f04dfe8b0f41..ab6e00c9841674b4e7bfb5c4fcb0cbd173bb1cba 100644 (file)
--- a/config/config.exs
+++ b/config/config.exs
@@ -54,7 +54,7 @@ config :pleroma, Pleroma.Repo,
 scheduled_jobs =
   with digest_config <- Application.get_env(:pleroma, :email_notifications)[:digest],
        true <- digest_config[:active] do
-    [{digest_config[:schedule], {Pleroma.DigestEmailWorker, :perform, []}}]
+    [{digest_config[:schedule], {Pleroma.Daemons.DigestEmailDaemon, :perform, []}}]
   else
     _ -> []
   end
@@ -275,8 +275,8 @@ config :pleroma, :instance,
   user_name_length: 100,
   max_account_fields: 10,
   max_remote_account_fields: 20,
-  account_field_name_length: 255,
-  account_field_value_length: 255,
+  account_field_name_length: 512,
+  account_field_value_length: 512,
   external_user_synchronization: true
 
 config :pleroma, :markup,
@@ -391,6 +391,8 @@ config :pleroma, :chat, enabled: true
 
 config :phoenix, :format_encoders, json: Jason
 
+config :phoenix, :json_library, Jason
+
 config :pleroma, :gopher,
   enabled: false,
   ip: {0, 0, 0, 0},
@@ -470,8 +472,9 @@ config :pleroma, Pleroma.User,
 config :pleroma, Oban,
   repo: Pleroma.Repo,
   verbose: false,
-  prune: {:maxage, 60 * 60 * 24 * 7},
+  prune: {:maxlen, 1500},
   queues: [
+    activity_expiration: 10,
     federator_incoming: 50,
     federator_outgoing: 50,
     web_push: 50,
@@ -578,16 +581,13 @@ config :pleroma, :env, Mix.env()
 config :http_signatures,
   adapter: Pleroma.Signature
 
-config :pleroma, :rate_limit,
-  search: [{1000, 10}, {1000, 30}],
-  app_account_creation: {1_800_000, 25},
-  relations_actions: {10_000, 10},
-  relation_id_action: {60_000, 2},
-  statuses_actions: {10_000, 15},
-  status_id_action: {60_000, 3},
-  password_reset: {1_800_000, 5},
-  account_confirmation_resend: {8_640_000, 5},
-  ap_routes: {60_000, 15}
+config :pleroma, :rate_limit, nil
+
+config :pleroma, Pleroma.ActivityExpiration, enabled: true
+
+config :pleroma, :web_cache_ttl,
+  activity_pub: nil,
+  activity_pub_question: 30_000
 
 # Import environment specific config. This must remain at the bottom
 # of this file so it overrides the configuration defined above.