From: Takeshi Umeda <noel.yoshiba@gmail.com>
Date: Mon, 31 Aug 2020 16:11:27 +0000 (+0900)
Subject: Fix limited follower id in fan-out-on-write service (#14709)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=b1bb1906beaabe27efcba3e23e57b771d225f3a6;p=mastodon.git

Fix limited follower id in fan-out-on-write service (#14709)
---

diff --git a/app/services/fan_out_on_write_service.rb b/app/services/fan_out_on_write_service.rb
index 21931c2f1..e05d02cef 100644
--- a/app/services/fan_out_on_write_service.rb
+++ b/app/services/fan_out_on_write_service.rb
@@ -58,9 +58,9 @@ class FanOutOnWriteService < BaseService
   def deliver_to_mentioned_followers(status)
     Rails.logger.debug "Delivering status #{status.id} to limited followers"
 
-    status.mentions.joins(:account).merge(status.account.followers_for_local_distribution).select(:id).reorder(nil).find_in_batches do |followers|
-      FeedInsertWorker.push_bulk(followers) do |follower|
-        [status.id, follower.id, :home]
+    status.mentions.joins(:account).merge(status.account.followers_for_local_distribution).select(:id, :account_id).reorder(nil).find_in_batches do |mentions|
+      FeedInsertWorker.push_bulk(mentions) do |mention|
+        [status.id, mention.account_id, :home]
       end
     end
   end