From: Akihiko Odaki (@fn_aki@pawoo.net) <akihiko.odaki.4i@stu.hosei.ac.jp>
Date: Wed, 28 Jun 2017 23:25:31 +0000 (+0900)
Subject: Use multiple pairs for zadd in PrecomputeFeedService (#3990)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=f79c10162e51689f6759dfa39251c8ba8e7e11e8;p=mastodon.git

Use multiple pairs for zadd in PrecomputeFeedService (#3990)
---

diff --git a/app/services/precompute_feed_service.rb b/app/services/precompute_feed_service.rb
index 4c24567c8..e2f6ff0cb 100644
--- a/app/services/precompute_feed_service.rb
+++ b/app/services/precompute_feed_service.rb
@@ -13,21 +13,16 @@ class PrecomputeFeedService < BaseService
   attr_reader :account
 
   def populate_feed
-    redis.pipelined do
-      statuses.reverse_each do |status|
-        process_status(status)
-      end
+    pairs = statuses.reverse_each.map(&method(:process_status))
 
+    redis.pipelined do
+      redis.zadd(account_home_key, pairs)
       redis.del("account:#{@account.id}:regeneration")
     end
   end
 
   def process_status(status)
-    add_status_to_feed(status) unless status_filtered?(status)
-  end
-
-  def add_status_to_feed(status)
-    redis.zadd(account_home_key, status.id, status.reblog? ? status.reblog_of_id : status.id)
+    [status.id, status.reblog? ? status.reblog_of_id : status.id] unless status_filtered?(status)
   end
 
   def status_filtered?(status)