Fix mastodon#5271 - Fix missing attribute in remove_from_feed (mastod…

…on#5277) Regression from mastodon#4801
rutan · Oct 11, 2017 · 70d750c · 70d750c
1 parent 96614a7
commit 70d750c
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/app/lib/feed_manager.rb b/app/lib/feed_manager.rb
@@ -84,10 +84,8 @@ def unmerge_from_timeline(from_account, into_account)
     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