ar
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix #5271 - Fix missing attribute in remove_from_feed (#5277) 

Regression from #4801
rebase/4.0.0rc2
Eugen Rochko 2017-10-08 21:55:34 +02:00 committed by GitHub
parent 488584bfc1
commit cfa68907ae
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/lib/feed_manager.rb
View File

@ -84,12 +84,10 @@ class FeedManager
timeline_key = key(:home, into_account.id) timeline_key = key(:home, into_account.id)
oldest_home_score = redis.zrange(timeline_key, 0, 0, with_scores: true)&.first&.last&.to_i || 0 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| from_account.statuses.select('id, reblog_of_id').where('id > ?', oldest_home_score).reorder(nil).find_each do |status|
statuses.each do |status|
unpush(:home, into_account, status) unpush(:home, into_account, status)
end end
end end
end
def clear_from_timeline(account, target_account) def clear_from_timeline(account, target_account)
timeline_key = key(:home, account.id) timeline_key = key(:home, account.id)