Merge develop

[akkoma] / config / config.exs

diff --git a/config/config.exs b/config/config.exs
index d975db31e363c6a6b703ced7c140c825306893d5..c975da739b9a05b1cc15c7a56403c312d65eb767 100644 (file)
--- a/config/config.exs
+++ b/config/config.exs
@@ -540,7 +540,8 @@ config :pleroma, Oban,
     background: 5,
     remote_fetcher: 2,
     attachments_cleanup: 5,
-    new_users_digest: 1
+    new_users_digest: 1,
+    mute_expire: 5
   ],
   plugins: [Oban.Plugins.Pruner],
   crontab: [
@@ -654,7 +655,7 @@ config :pleroma, :rate_limit,
   account_confirmation_resend: {8_640_000, 5},
   ap_routes: {60_000, 15}
 
-config :pleroma, Pleroma.Workers.PurgeExpiredActivity, enabled: true
+config :pleroma, Pleroma.Workers.PurgeExpiredActivity, enabled: true, min_lifetime: 600
 
 config :pleroma, Pleroma.Plugs.RemoteIp, enabled: true