Merge branch 'main' into glitch-soc/merge-upstream

2021-05-22 13:11:31 +02:00
parent 03952c7d49 92a9fcf0e1
commit 5f334807d2
55 changed files with 646 additions and 418 deletions
--- a/app/services/remove_status_service.rb
+++ b/app/services/remove_status_service.rb
@@ -149,6 +149,6 @@ class RemoveStatusService < BaseService
  end

  def lock_options
-    { redis: Redis.current, key: "distribute:#{@status.id}" }
+    { redis: Redis.current, key: "distribute:#{@status.id}", autorelease: 5.minutes.seconds }
  end
 end