diff options
author | Reverite <github@reverite.sh> | 2019-11-13 20:03:31 -0500 |
---|---|---|
committer | Reverite <github@reverite.sh> | 2019-11-13 20:03:31 -0500 |
commit | 61a70e595d9ec7a6937d31b36d33063520cf1385 (patch) | |
tree | 6d7697e892f9324a5d6f00ed933606fea25fd871 /app/workers/unfollow_follow_worker.rb | |
parent | 48635bf45f6402c8f82d4cb66fa42e3e5e8f30c2 (diff) | |
parent | 707c4918b21d19dd53b64120dbc7263f45fc5ecd (diff) |
Merge branch 'glitch' into production
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 |