]> cat aescling's git repositories - mastodon.git/commitdiff
Fix crash in MergeWorker (#14129)
authorThibG <thib@sitedethib.com>
Tue, 23 Jun 2020 14:40:01 +0000 (16:40 +0200)
committerGitHub <noreply@github.com>
Tue, 23 Jun 2020 14:40:01 +0000 (16:40 +0200)
Similarly to #12324, the code is passing an Account object where an id
is expected.

app/lib/feed_manager.rb

index 94872d050fa9b6ed172ccb94225295ff8129ff4a..efb4f6e2c218775121e48216173e8fcfd35c4db4 100644 (file)
@@ -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