Fix crash in MergeWorker

Similarly to mastodon#12324, the code is passing an Account object where an id is expected.
ClearlyClaire · Jun 23, 2020 · 490e533 · 490e533
1 parent aaf91ab
commit 490e533
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/app/lib/feed_manager.rb b/app/lib/feed_manager.rb
@@ -106,7 +106,7 @@ def merge_into_timeline(from_account, into_account)
     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