Follow new account before unfollowing the old one during move (#9719)

6 years ago · b17b2f25ac
parent fae32634b1
commit b17b2f25ac
1 changed files with 2 additions and 2 deletions
--- a/app/workers/unfollow_follow_worker.rb
+++ b/app/workers/unfollow_follow_worker.rb
@ -10,9 +10,9 @@ class UnfollowFollowWorker
    old_target_account = Account.find(old_target_account_id)
    new_target_account = Account.find(new_target_account_id)

-    UnfollowService.new.call(follower_account, old_target_account)
    FollowService.new.call(follower_account, new_target_account)
-  rescue ActiveRecord::RecordNotFound
+    UnfollowService.new.call(follower_account, old_target_account)
+  rescue ActiveRecord::RecordNotFound, Mastodon::NotPermittedError
    true
  end
 end