diff options
| author | ThibG <thib@sitedethib.com> | 2019-11-07 08:05:07 +0100 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2019-11-07 09:05:07 +0200 |
| commit | 66c1fe0495b7e4728ad776e9c41a70c180640ea5 (patch) | |
| tree | 857ede9138d9fe398211f9c3f66f3b8ce77950e4 /app/workers/unfollow_follow_worker.rb | |
| parent | 699427777a52af1fbc3d2a12c1be9f9f081b17fd (diff) | |
Fix various issues with account migration (#12301)
* Fix being able to follow oneself by moving to an account that was following the old one * Add specs * Add spec to catch MoveWorker issue with local followers following both accounts * Fix move worker breaking when a local account follows both source and target accounts * Fix migration from remote to local account not sending Undo Follow * Fix show_reblogs not being preserved for moved account's followers
Diffstat (limited to 'app/workers/unfollow_follow_worker.rb')
| -rw-r--r-- | app/workers/unfollow_follow_worker.rb | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/app/workers/unfollow_follow_worker.rb b/app/workers/unfollow_follow_worker.rb index 95549e107..b6e665a41 100644 --- a/app/workers/unfollow_follow_worker.rb +++ b/app/workers/unfollow_follow_worker.rb @@ -5,12 +5,15 @@ class UnfollowFollowWorker sidekiq_options queue: 'pull' - def perform(follower_account_id, old_target_account_id, new_target_account_id) + def perform(follower_account_id, old_target_account_id, new_target_account_id, bypass_locked = false) follower_account = Account.find(follower_account_id) old_target_account = Account.find(old_target_account_id) new_target_account = Account.find(new_target_account_id) - FollowService.new.call(follower_account, new_target_account) + follow = follower_account.active_relationships.find_by(target_account: old_target_account) + reblogs = follow&.show_reblogs? + + FollowService.new.call(follower_account, new_target_account, reblogs: reblogs, bypass_locked: bypass_locked) UnfollowService.new.call(follower_account, old_target_account, skip_unmerge: true) rescue ActiveRecord::RecordNotFound, Mastodon::NotPermittedError true |