Skip to content

Commit 490e533

Browse files
committed
Fix crash in MergeWorker
Similarly to mastodon#12324, the code is passing an Account object where an id is expected.
1 parent aaf91ab commit 490e533

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

app/lib/feed_manager.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ def merge_into_timeline(from_account, into_account)
106106
crutches = build_crutches(into_account.id, statuses)
107107

108108
statuses.each do |status|
109-
next if filter_from_home?(status, into_account, crutches)
109+
next if filter_from_home?(status, into_account.id, crutches)
110110

111111
add_to_feed(:home, into_account.id, status, aggregate)
112112
end

0 commit comments

Comments
 (0)