diff --git a/app/services/fan_out_on_write_service.rb b/app/services/fan_out_on_write_service.rb index a70aca878e..42d5263bae 100644 --- a/app/services/fan_out_on_write_service.rb +++ b/app/services/fan_out_on_write_service.rb @@ -134,6 +134,8 @@ class FanOutOnWriteService < BaseService antennas = Antenna.where(id: antennas.select(:id)) antennas = antennas.left_joins(:antenna_tags).where(any_tags: true).or(Antenna.left_joins(:antenna_tags).where(antenna_tags: { tag_id: tag_ids })) + antennas = antennas.where(account_id: Account.without_suspended.joins(:user).select('accounts.id').where('users.current_sign_in_at > ?', User::ACTIVE_DURATION.ago)) + antennas.in_batches do |ans| ans.each do |antenna| next unless antenna.enabled?