about summary refs log tree commit diff
path: root/app/workers
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2019-09-17 08:44:45 +0200
committerGitHub <noreply@github.com>2019-09-17 08:44:45 +0200
commit38dc51b2d68e3e03f429419f7318e868fa24c49d (patch)
tree02012b8582eb2eb7acf8fe66cc953bd903fdf135 /app/workers
parentc21386cff5ff6d86d8887e4a5dde1cf910ab84a0 (diff)
Fix Move handler queuing jobs that will fail if account is suspended (#11864)
Don't put Move handler on cooldown if it didn't run. Skip unmerging
from timelines to save unnecessary work.
Diffstat (limited to 'app/workers')
-rw-r--r--app/workers/unfollow_follow_worker.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/workers/unfollow_follow_worker.rb b/app/workers/unfollow_follow_worker.rb
index 50d3bf034..95549e107 100644
--- a/app/workers/unfollow_follow_worker.rb
+++ b/app/workers/unfollow_follow_worker.rb
@@ -11,7 +11,7 @@ class UnfollowFollowWorker
     new_target_account = Account.find(new_target_account_id)
 
     FollowService.new.call(follower_account, new_target_account)
-    UnfollowService.new.call(follower_account, old_target_account)
+    UnfollowService.new.call(follower_account, old_target_account, skip_unmerge: true)
   rescue ActiveRecord::RecordNotFound, Mastodon::NotPermittedError
     true
   end