Merge upstream!! #64 <3 <3

2017-07-12 02:03:17 -07:00
parent bcf7ee48e9 056b5ed72f
commit 79d898ae0a
340 changed files with 4980 additions and 2321 deletions
--- a/app/lib/feed_manager.rb
+++ b/app/lib/feed_manager.rb
@ -38,9 +38,7 @@ class FeedManager
  end

  def trim(type, account_id)
-    return unless redis.zcard(key(type, account_id)) > FeedManager::MAX_ITEMS
-    last = redis.zrevrange(key(type, account_id), FeedManager::MAX_ITEMS - 1, FeedManager::MAX_ITEMS - 1)
-    redis.zremrangebyscore(key(type, account_id), '-inf', "(#{last.last}")
+    redis.zremrangebyrank(key(type, account_id), '0', (-(FeedManager::MAX_ITEMS + 1)).to_s)
  end

  def push_update_required?(timeline_type, account_id)