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

No conflicts.
2019-01-19 18:28:37 +01:00
parent 530d29148c 7c3fddeab4
commit 5e0cf92fd1
57 changed files with 1103 additions and 444 deletions
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -362,7 +362,8 @@ class User < ApplicationRecord
  end

  def regenerate_feed!
-    Redis.current.setnx("account:#{account_id}:regeneration", true) && Redis.current.expire("account:#{account_id}:regeneration", 1.day.seconds)
+    return unless Redis.current.setnx("account:#{account_id}:regeneration", true)
+    Redis.current.expire("account:#{account_id}:regeneration", 1.day.seconds)
    RegenerationWorker.perform_async(account_id)
  end