about summary refs log tree commit diff
path: root/app
diff options
context:
space:
mode:
authorAkihiko Odaki <akihiko.odaki.4i@stu.hosei.ac.jp>2018-02-24 13:40:18 +0900
committerEugen Rochko <eugen@zeonfederated.com>2018-02-24 05:40:18 +0100
commitf8f0572ee09122dd8fda51aec899f939c6ab03bf (patch)
treed723b5168ccb4a9be1d9e3ca1b85add74e0363d9 /app
parente668180044560e28bdc5eef94744c210013efcda (diff)
Do not push status to feed if its reblog is already inserted (#6488)
A complemental change for precompute_feed_service_spec.rb also fixes its
random failure which is caused by the Snowlake randomization of the order
of an original status and its reblog.
Diffstat (limited to 'app')
-rw-r--r--app/lib/feed_manager.rb8
1 files changed, 8 insertions, 0 deletions
diff --git a/app/lib/feed_manager.rb b/app/lib/feed_manager.rb
index 20b10e113..dd78e543f 100644
--- a/app/lib/feed_manager.rb
+++ b/app/lib/feed_manager.rb
@@ -220,6 +220,14 @@ class FeedManager
         return false
       end
     else
+      # A reblog may reach earlier than the original status because of the
+      # delay of the worker deliverying the original status, the late addition
+      # by merging timelines, and other reasons.
+      # If such a reblog already exists, just do not re-insert it into the feed.
+      rank = redis.zrevrank(reblog_key, status.id)
+
+      return false unless rank.nil?
+
       redis.zadd(timeline_key, status.id, status.id)
     end