diff --git a/app/services/delivery_antenna_service.rb b/app/services/delivery_antenna_service.rb index 7600dd4785..7381c36b71 100644 --- a/app/services/delivery_antenna_service.rb +++ b/app/services/delivery_antenna_service.rb @@ -76,7 +76,8 @@ class DeliveryAntennaService antennas = antennas.where(account_id: Account.without_suspended.joins(:user).select('accounts.id').where('users.current_sign_in_at > ?', User::ACTIVE_DURATION.ago)) home_post = !@account.domain.nil? || @status.reblog? || [:public, :public_unlisted, :login].exclude?(@status.visibility.to_sym) - antennas = antennas.where(account: @account.followers).or(antennas.where(account: @account)).where('insert_feeds IS FALSE OR list_id > 0') if home_post + antennas = antennas.where(account: @account.followers).or(antennas.where(account: @account)).where('insert_feeds IS FALSE OR list_id > 0') if home_post && !@status.limited_visibility? + antennas = antennas.where(account: @status.mentioned_accounts).or(antennas.where(account: @account)).where('insert_feeds IS FALSE OR list_id > 0') if @status.limited_visibility? collection = AntennaCollection.new(@status, @update, home_post) diff --git a/app/services/fan_out_on_write_service.rb b/app/services/fan_out_on_write_service.rb index 8fe660e346..bec7249a62 100644 --- a/app/services/fan_out_on_write_service.rb +++ b/app/services/fan_out_on_write_service.rb @@ -57,6 +57,7 @@ class FanOutOnWriteService < BaseService when :limited deliver_to_lists_mentioned_accounts_only! deliver_to_antennas! unless @account.dissubscribable + deliver_to_stl_antennas! deliver_to_mentioned_followers! else deliver_to_mentioned_followers! diff --git a/spec/services/fan_out_on_write_service_spec.rb b/spec/services/fan_out_on_write_service_spec.rb index e910905a31..c15253c879 100644 --- a/spec/services/fan_out_on_write_service_spec.rb +++ b/spec/services/fan_out_on_write_service_spec.rb @@ -165,7 +165,7 @@ RSpec.describe FanOutOnWriteService, type: :service do context 'with STL antenna' do let!(:antenna) { antenna_with_options(bob, stl: true) } - let!(:empty_antenna) { antenna_with_options(ohagi, stl: true) } + let!(:empty_antenna) { antenna_with_options(tom, stl: true) } it 'is added to the antenna feed of antenna follower' do expect(antenna_feed_of(antenna)).to include status.id