Implement infinity home timeline (#1610)
* Implement infinity home timeline * Fix test for infinite home timeline * Fix infinity home timeline with min_id * Fix infinite home timeline duplicated statuses * Codeclimate for infinite home timeline * Refactor code as reviewed * Fix redis sufficient check * Fix typo on variable name
This commit is contained in:
parent
b9b9192432
commit
d353bb5ee3
|
@ -9,4 +9,41 @@ class HomeFeed < Feed
|
||||||
def regenerating?
|
def regenerating?
|
||||||
redis.exists?("account:#{@account.id}:regeneration")
|
redis.exists?("account:#{@account.id}:regeneration")
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def get(limit, max_id = nil, since_id = nil, min_id = nil)
|
||||||
|
limit = limit.to_i
|
||||||
|
max_id = max_id.to_i if max_id.present?
|
||||||
|
since_id = since_id.to_i if since_id.present?
|
||||||
|
min_id = min_id.to_i if min_id.present?
|
||||||
|
|
||||||
|
statuses = from_redis(limit, max_id, since_id, min_id)
|
||||||
|
|
||||||
|
return statuses if statuses.size >= limit
|
||||||
|
|
||||||
|
redis_min_id = from_redis(1, nil, nil, 0).first&.id if min_id.present? || since_id.present?
|
||||||
|
redis_sufficient = redis_min_id && (
|
||||||
|
(min_id.present? && min_id >= redis_min_id) ||
|
||||||
|
(since_id.present? && since_id >= redis_min_id)
|
||||||
|
)
|
||||||
|
|
||||||
|
unless redis_sufficient
|
||||||
|
remaining_limit = limit - statuses.size
|
||||||
|
max_id = statuses.last.id unless statuses.empty?
|
||||||
|
statuses += from_database(remaining_limit, max_id, since_id, min_id)
|
||||||
|
end
|
||||||
|
|
||||||
|
statuses
|
||||||
|
end
|
||||||
|
|
||||||
|
protected
|
||||||
|
|
||||||
|
def from_database(limit, max_id, since_id, min_id)
|
||||||
|
# Note that this query will not contains direct messages
|
||||||
|
Status
|
||||||
|
.where(account: [@account] + @account.following)
|
||||||
|
.where(visibility: [:public, :unlisted, :private])
|
||||||
|
.to_a_paginated_by_id(limit, min_id: min_id, max_id: max_id, since_id: since_id)
|
||||||
|
.reject { |status| FeedManager.instance.filter?(:home, status, @account) }
|
||||||
|
.sort_by { |status| -status.id }
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -21,12 +21,17 @@ RSpec.describe HomeFeed, type: :model do
|
||||||
)
|
)
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'gets statuses with ids in the range from redis' do
|
it 'gets statuses with ids in the range from redis with database' do
|
||||||
results = subject.get(3)
|
results = subject.get(3)
|
||||||
|
|
||||||
expect(results.map(&:id)).to eq [3, 2]
|
expect(results.map(&:id)).to eq [3, 2, 1]
|
||||||
expect(results.first.attributes.keys).to eq %w(id updated_at)
|
expect(results.first.attributes.keys).to eq %w(id updated_at)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
it 'with min_id present' do
|
||||||
|
results = subject.get(3, nil, nil, 0)
|
||||||
|
expect(results.map(&:id)).to eq [3, 2, 1]
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
context 'when feed is being generated' do
|
context 'when feed is being generated' do
|
||||||
|
@ -34,10 +39,15 @@ RSpec.describe HomeFeed, type: :model do
|
||||||
Redis.current.set("account:#{account.id}:regeneration", true)
|
Redis.current.set("account:#{account.id}:regeneration", true)
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'returns nothing' do
|
it 'returns from database' do
|
||||||
results = subject.get(3)
|
results = subject.get(3)
|
||||||
|
|
||||||
expect(results.map(&:id)).to eq []
|
expect(results.map(&:id)).to eq [10, 3, 2]
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'with min_id present' do
|
||||||
|
results = subject.get(3, nil, nil, 0)
|
||||||
|
expect(results.map(&:id)).to eq [3, 2, 1]
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue