tykayn/mastodon
1
0
Fork 0
mirror of https://framagit.org/tykayn/mastodon.git synced 2023-08-25 08:33:12 +02:00
Code Issues Projects Releases Wiki Activity

Ensure that feed renegeration restores non-zero items (#5409)

Browse Source 
Fix #5398

Ordering the home timeline query by account_id meant that the first
100 items belonged to a single account. There was also no reason to
reverse-iterate over the statuses. Assuming the user accesses the
feed halfway-through, it's better to have recent statuses already
available at the top. Therefore working from newer->older is ideal.

If the algorithm ends up filtering all items out during last-mile
filtering, repeat again a page further. The algorithm terminates
when either at least one item has been added, or if the database
query returns nothing (end of data reached)
This commit is contained in:
Eugen Rochko 2017-10-16 16:08:51 +02:00 committed by GitHub
parent aec70b44fc
commit 7cc71748ce
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