Merge branch 'main' into glitch-soc/merge-upstream

This commit is contained in:
Claire
2022-04-14 14:21:14 +02:00
112 changed files with 515 additions and 346 deletions

View File

@ -268,7 +268,7 @@ class FeedManager
account.following.includes(:account_stat).find_each do |target_account|
if redis.zcard(timeline_key) >= limit
oldest_home_score = redis.zrange(timeline_key, 0, 0, with_scores: true).first.last.to_i
last_status_score = Mastodon::Snowflake.id_at(account.last_status_at)
last_status_score = Mastodon::Snowflake.id_at(target_account.last_status_at)
# If the feed is full and this account has not posted more recently
# than the last item on the feed, then we can skip the whole account