From cfa68907aeefca6bb36ae642f409c7856c14563f Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Sun, 8 Oct 2017 21:55:34 +0200 Subject: [PATCH] Fix #5271 - Fix missing attribute in remove_from_feed (#5277) Regression from #4801 --- app/lib/feed_manager.rb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/app/lib/feed_manager.rb b/app/lib/feed_manager.rb index c509c57026e..6398aa6d66a 100644 --- a/app/lib/feed_manager.rb +++ b/app/lib/feed_manager.rb @@ -84,10 +84,8 @@ class FeedManager timeline_key = key(:home, into_account.id) oldest_home_score = redis.zrange(timeline_key, 0, 0, with_scores: true)&.first&.last&.to_i || 0 - from_account.statuses.select('id').where('id > ?', oldest_home_score).reorder(nil).find_in_batches do |statuses| - statuses.each do |status| - unpush(:home, into_account, status) - end + from_account.statuses.select('id, reblog_of_id').where('id > ?', oldest_home_score).reorder(nil).find_each do |status| + unpush(:home, into_account, status) end end