Skip to content

Commit ec012eb

Browse files
authored
Fix MergeWorker being queued for remote users (mastodon#10355)
1 parent 606ada5 commit ec012eb

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

app/models/follow_request.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class FollowRequest < ApplicationRecord
2626

2727
def authorize!
2828
account.follow!(target_account, reblogs: show_reblogs, uri: uri)
29-
MergeWorker.perform_async(target_account.id, account.id)
29+
MergeWorker.perform_async(target_account.id, account.id) if account.local?
3030
destroy!
3131
end
3232

0 commit comments

Comments
 (0)