about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--app/services/fan_out_on_write_service.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/services/fan_out_on_write_service.rb b/app/services/fan_out_on_write_service.rb
index f726dba18..9b959617d 100644
--- a/app/services/fan_out_on_write_service.rb
+++ b/app/services/fan_out_on_write_service.rb
@@ -21,6 +21,7 @@ class FanOutOnWriteService < BaseService
       deliver_to_hashtags(status)
     elsif status.local_visibility?
       deliver_to_followers(status)
+      return if status.reblog? && !Setting.show_reblogs_in_public_timelines
       deliver_to_lists(status)
       deliver_to_local(status) unless filtered?(status)
     else