diff options
author | ThibG <thib@sitedethib.com> | 2019-11-07 21:15:22 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-11-07 21:15:22 +0100 |
commit | 707c4918b21d19dd53b64120dbc7263f45fc5ecd (patch) | |
tree | dc7192652965f075a2ff59c0dd9c7989eaacbd72 /app/workers/unfollow_follow_worker.rb | |
parent | dd2ec970dbe39f09d3da32d6a8f524aaad68a9d6 (diff) | |
parent | 04125c9c0d418a51b21ab6706f49434b4c8cdc8e (diff) |
Merge pull request #1243 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
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 |