mirror of
https://github.com/funamitech/mastodon
synced 2024-11-28 06:48:45 +09:00
Fix MergeWorker being queued for remote users (#10355)
This commit is contained in:
parent
0f9278c3d3
commit
45b849bad9
@ -26,7 +26,7 @@ class FollowRequest < ApplicationRecord
|
||||
|
||||
def authorize!
|
||||
account.follow!(target_account, reblogs: show_reblogs, uri: uri)
|
||||
MergeWorker.perform_async(target_account.id, account.id)
|
||||
MergeWorker.perform_async(target_account.id, account.id) if account.local?
|
||||
destroy!
|
||||
end
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user