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

remotes/1727458204337373841/tmp_refs/heads/signup-info-prompt
Eugen Rochko 2019-01-05 11:27:58 +01:00 committed by GitHub
parent fae32634b1
commit b17b2f25ac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions

View File

@ -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