From: Eugen Rochko <eugen@zeonfederated.com>
Date: Thu, 26 Jan 2017 02:56:26 +0000 (+0100)
Subject: Follow request authorizations faster
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=57f7cf834921d49f28f346571e0e6fb596ccd6f8;p=mastodon.git

Follow request authorizations faster
---

diff --git a/app/models/follow_request.rb b/app/models/follow_request.rb
index 8eef3abf4..936ad0691 100644
--- a/app/models/follow_request.rb
+++ b/app/models/follow_request.rb
@@ -13,7 +13,7 @@ class FollowRequest < ApplicationRecord
 
   def authorize!
     account.follow!(target_account)
-    FeedManager.instance.merge_into_timeline(target_account, account)
+    MergeWorker.perform_async(target_account.id, account.id)
     destroy!
   end