diff options
| author | Reverite <github@reverite.sh> | 2019-05-06 18:17:05 -0700 |
|---|---|---|
| committer | Reverite <github@reverite.sh> | 2019-05-06 18:17:05 -0700 |
| commit | 5b85256b334b13fad26a2bc073a874750a3cdc2e (patch) | |
| tree | 2d523aa8266e42ae31ab82c7fc2533cf4a90ff0d /app/services/fan_out_on_write_service.rb | |
| parent | e10a9794f4ed7c90e3190f285359f55dd00da435 (diff) | |
| parent | 89d2859296bc5a57a8db07be86239cc938a3f691 (diff) | |
Merge remote-tracking branch 'glitch/master' into production
Diffstat (limited to 'app/services/fan_out_on_write_service.rb')
| -rw-r--r-- | app/services/fan_out_on_write_service.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/services/fan_out_on_write_service.rb b/app/services/fan_out_on_write_service.rb index de7c031d8..b66dc342e 100644 --- a/app/services/fan_out_on_write_service.rb +++ b/app/services/fan_out_on_write_service.rb @@ -21,11 +21,12 @@ class FanOutOnWriteService < BaseService deliver_to_lists(status) end - return if status.account.silenced? || !status.public_visibility? || status.reblog? + return if status.account.silenced? || !status.public_visibility? + return if status.reblog? && !Setting.show_reblogs_in_public_timelines deliver_to_hashtags(status) - return if status.reply? && status.in_reply_to_account_id != status.account_id + return if status.reply? && status.in_reply_to_account_id != status.account_id && !Setting.show_replies_in_public_timelines deliver_to_public(status) deliver_to_media(status) if status.media_attachments.any? |