[#1149] Added Oban job for "activity_expiration". Merged remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue

# Conflicts:
#	config/config.exs

1 files changed, 4 insertions, 10 deletions

diff --git a/config/config.exs b/config/config.exs
index 9a8c69448..da89aa3e9 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -472,6 +472,7 @@ config :pleroma, Oban,
   verbose: false,
   prune: {:maxage, 60 * 60 * 24 * 7},
   queues: [
+    activity_expiration: 10,
     federator_incoming: 50,
     federator_outgoing: 50,
     web_push: 50,
@@ -578,16 +579,9 @@ 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
 
 # Import environment specific config. This must remain at the bottom
 # of this file so it overrides the configuration defined above.