From: ThibG <thib@sitedethib.com>
Date: Tue, 23 Jun 2020 14:40:01 +0000 (+0200)
Subject: Fix crash in MergeWorker (#14129)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=01a99f7ec7ce892a3d953a6792515882a04ffee3;p=mastodon.git

Fix crash in MergeWorker (#14129)

Similarly to #12324, the code is passing an Account object where an id
is expected.
---

diff --git a/app/lib/feed_manager.rb b/app/lib/feed_manager.rb
index 94872d050..efb4f6e2c 100644
--- a/app/lib/feed_manager.rb
+++ b/app/lib/feed_manager.rb
@@ -106,7 +106,7 @@ class FeedManager
     crutches = build_crutches(into_account.id, statuses)
 
     statuses.each do |status|
-      next if filter_from_home?(status, into_account, crutches)
+      next if filter_from_home?(status, into_account.id, crutches)
 
       add_to_feed(:home, into_account.id, status, aggregate)
     end