diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2017-01-23 21:29:34 +0100 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-01-23 21:29:34 +0100 |
| commit | cca82bf0a2f0ccbf0feda00763fd7df0877845b6 (patch) | |
| tree | 98afb883aa236dbeaf011944faa1548e7698deb7 /app/services/follow_service.rb | |
| parent | f392030ab82a70086f93bb02c3faab53c3fbd28e (diff) | |
Move merging/unmerging of timelines into background. Move blocking into
background as well since it's a computationally expensive
Diffstat (limited to 'app/services/follow_service.rb')
| -rw-r--r-- | app/services/follow_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/follow_service.rb b/app/services/follow_service.rb index 555f01b6d..87c16a621 100644 --- a/app/services/follow_service.rb +++ b/app/services/follow_service.rb @@ -38,7 +38,7 @@ class FollowService < BaseService NotificationWorker.perform_async(follow.stream_entry.id, target_account.id) end - FeedManager.instance.merge_into_timeline(target_account, source_account) + MergeWorker.perform_async(target_account.id, source_account.id) Pubsubhubbub::DistributionWorker.perform_async(follow.stream_entry.id) follow |