From 65a9abb315f18ac777f3d0e09b3f7399830ad243 Mon Sep 17 00:00:00 2001 From: Fire Demon Date: Mon, 23 Nov 2020 23:10:05 -0600 Subject: Add user options to disable recipient verification, allow anonymous public access; rework private mode --- app/services/fan_out_on_write_service.rb | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'app/services/fan_out_on_write_service.rb') diff --git a/app/services/fan_out_on_write_service.rb b/app/services/fan_out_on_write_service.rb index 1fa8b2520..679ba8501 100644 --- a/app/services/fan_out_on_write_service.rb +++ b/app/services/fan_out_on_write_service.rb @@ -21,15 +21,12 @@ class FanOutOnWriteService < BaseService deliver_to_lists(status) end - return if status.account.silenced? + return if !status.public_visibility? || status.account.silenced? return if status.reblog? && !Setting.show_reblogs_in_public_timelines - if status.distributable? - render_anonymous_payload(status) - deliver_to_hashtags(status) - end + render_anonymous_payload(status) + deliver_to_hashtags(status) - return unless status.public_visibility? return if status.reply? && status.in_reply_to_account_id != status.account_id && !Setting.show_replies_in_public_timelines deliver_to_public(status) -- cgit