about summary refs log tree commit diff
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2017-10-08 21:55:34 +0200
committerGitHub <noreply@github.com>2017-10-08 21:55:34 +0200
commitcfa68907aeefca6bb36ae642f409c7856c14563f (patch)
tree46dbc84cb48903e43bae677f95b70fe3c47933d2
parent488584bfc15ace3a097947f5190b73354aaa19e9 (diff)
Fix #5271 - Fix missing attribute in remove_from_feed (#5277)
Regression from #4801
-rw-r--r--app/lib/feed_manager.rb6
1 files changed, 2 insertions, 4 deletions
diff --git a/app/lib/feed_manager.rb b/app/lib/feed_manager.rb
index c509c5702..6398aa6d6 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