treehouse
/
mastodon
21
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into gs-master

remotes/1727458204337373841/tmp_refs/heads/signup-info-prompt
David Yip 2017-10-16 09:27:01 -05:00
parent dbb1fce94d 7cc71748ce
commit 7e9d93472c
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
app/lib/feed_manager.rb
View File

@ -100,11 +100,24 @@ class FeedManager
end end
def populate_feed(account) def populate_feed(account)
prepopulate_limit = FeedManager::MAX_ITEMS / 4 added = 0
statuses = Status.as_home_timeline(account).order(account_id: :desc).limit(prepopulate_limit) limit = FeedManager::MAX_ITEMS / 2
statuses.reverse_each do |status| max_id = nil
next if filter_from_home?(status, account)
add_to_feed(:home, account, status) loop do
statuses = Status.as_home_timeline(account)
.paginate_by_max_id(limit, max_id)
break if statuses.empty?
statuses.each do |status|
next if filter_from_home?(status, account)
added += 1 if add_to_feed(:home, account, status)
end
break unless added.zero?
max_id = statuses.last.id
end end
end end