tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix original account being unfollowed on migration before the follow request could be sent (#21957)

Browse Source
This commit is contained in:
Claire
2023-03-03 21:13:55 +01:00
committed by GitHub
parent ddde4e0d95
commit 050f1669c6
3 changed files with 58 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/workers/unfollow_follow_worker.rb
View File

@@ -10,13 +10,7 @@ class UnfollowFollowWorker
old_target_account = Account.find(old_target_account_id)
new_target_account = Account.find(new_target_account_id)
follow = follower_account.active_relationships.find_by(target_account: old_target_account)
reblogs = follow&.show_reblogs?
notify = follow&.notify?
languages = follow&.languages
FollowService.new.call(follower_account, new_target_account, reblogs: reblogs, notify: notify, languages: languages, bypass_locked: bypass_locked, bypass_limit: true)
UnfollowService.new.call(follower_account, old_target_account, skip_unmerge: true)
FollowMigrationService.new.call(follower_account, new_target_account, old_target_account, bypass_locked: bypass_locked)
rescue ActiveRecord::RecordNotFound, Mastodon::NotPermittedError
true
end