Merge branch 'fix_feed_regeneration' of github.com:davefp/mastodon into hometown-dev

This commit is contained in:
Darius Kazemi 2019-11-07 10:23:48 -08:00
commit 140821ab6b

View File

@ -155,7 +155,7 @@ class FeedManager
crutches = build_crutches(account.id, statuses) crutches = build_crutches(account.id, statuses)
statuses.each do |status| statuses.each do |status|
next if filter_from_home?(status, account, crutches) next if filter_from_home?(status, account.id, crutches)
add_to_feed(:home, account.id, status, aggregate) add_to_feed(:home, account.id, status, aggregate)
end end