specter/mastodon
1
0
Fork 0
forked from fedi/mastodon
Code Pull requests Activity

Fix #25 - Only latest reblog of status kept on feed as zset value is set to "true" status ID

Browse source
This commit is contained in:
Eugen Rochko 2016-09-29 21:40:37 +02:00
parent 927333f4f8
commit a4f7eca5fa
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/lib/feed_manager.rb
View file

@ -16,7 +16,7 @@ class FeedManager
end end
def push(timeline_type, account, status) def push(timeline_type, account, status)
redis.zadd(key(timeline_type, account.id), status.id, status.id) redis.zadd(key(timeline_type, account.id), status.id, status.reblog? ? status.reblog_of_id : status.id)
trim(timeline_type, account.id) trim(timeline_type, account.id)
broadcast(account.id, type: 'update', timeline: timeline_type, message: inline_render(account, status)) broadcast(account.id, type: 'update', timeline: timeline_type, message: inline_render(account, status))
end end

4
app/models/feed.rb
View file

@ -6,14 +6,14 @@ class Feed
def get(limit, max_id = nil) def get(limit, max_id = nil)
max_id = '+inf' if max_id.nil? max_id = '+inf' if max_id.nil?
unhydrated = redis.zrevrangebyscore(key, "(#{max_id}", '-inf', limit: [0, limit]) unhydrated = redis.zrevrangebyscore(key, "(#{max_id}", '-inf', limit: [0, limit], with_scores: true).collect(&:last).map(&:to_i)
status_map = {} status_map = {}
# If we're after most recent items and none are there, we need to precompute the feed # If we're after most recent items and none are there, we need to precompute the feed
if unhydrated.empty? && max_id == '+inf' if unhydrated.empty? && max_id == '+inf'
PrecomputeFeedService.new.call(@type, @account, limit) PrecomputeFeedService.new.call(@type, @account, limit)
else else
Status.where(id: unhydrated).with_includes.with_counters.each { |status| status_map[status.id.to_s] = status } Status.where(id: unhydrated).with_includes.with_counters.each { |status| status_map[status.id] = status }
unhydrated.map { |id| status_map[id] }.compact unhydrated.map { |id| status_map[id] }.compact
end end
end end