Move merging/unmerging of timelines into background. Move blocking into

background as well since it's a computationally expensive
2017-01-23 21:29:34 +01:00
parent f392030ab8
commit cca82bf0a2
7 changed files with 45 additions and 19 deletions
--- 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