From e45b78c10e1b67f536d2773b5653b5580c51a065 Mon Sep 17 00:00:00 2001 From: KMY Date: Thu, 27 Apr 2023 11:06:07 +0900 Subject: [PATCH] Update @status.account to @account --- app/services/fan_out_on_write_service.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/services/fan_out_on_write_service.rb b/app/services/fan_out_on_write_service.rb index f22a2812fa..7ce2b833ec 100644 --- a/app/services/fan_out_on_write_service.rb +++ b/app/services/fan_out_on_write_service.rb @@ -122,12 +122,12 @@ class FanOutOnWriteService < BaseService domain = @account.domain || Rails.configuration.x.local_domain antennas = Antenna.availables - antennas = antennas.left_joins(:antenna_accounts).where(any_accounts: true).or(Antenna.availables.left_joins(:antenna_accounts) .where(antenna_accounts: { exclude: false, account: @status.account })) - antennas = antennas.left_joins(:antenna_domains) .where(any_domains: true) .or(Antenna.availables.left_joins(:antenna_accounts).left_joins(:antenna_domains) .where(antenna_domains: { exclude: false, name: @status.account.domain })) + antennas = antennas.left_joins(:antenna_accounts).where(any_accounts: true).or(Antenna.availables.left_joins(:antenna_accounts) .where(antenna_accounts: { exclude: false, account: @account })) + antennas = antennas.left_joins(:antenna_domains) .where(any_domains: true) .or(Antenna.availables.left_joins(:antenna_accounts).left_joins(:antenna_domains) .where(antenna_domains: { exclude: false, name: domain })) antennas = antennas.left_joins(:antenna_tags) .where(any_tags: true) .or(Antenna.availables.left_joins(:antenna_accounts).left_joins(:antenna_domains).left_joins(:antenna_tags).where(antenna_tags: { exclude: false, tag: @status.tags })) - antennas = antennas.where(account: @status.account.followers) if @status.visibility.to_sym == :unlisted + antennas = antennas.where(account: @account.followers) if @status.visibility.to_sym == :unlisted antennas = antennas.where(with_media_only: false) if !@status.with_media? - antennas = antennas.where.not(account: @status.account.blocking) + antennas = antennas.where.not(account: @account.blocking) antennas.in_batches do |ans| ans.each do |antenna| next if !antenna.enabled?