diff options
| author | multiple creatures <dev@multiple-creature.party> | 2020-03-02 01:16:05 -0600 |
|---|---|---|
| committer | multiple creatures <dev@multiple-creature.party> | 2020-03-02 01:16:05 -0600 |
| commit | b5e23152bd1c2ea1091b2785a49e9ab3d0f3fd16 (patch) | |
| tree | 8922add715b1a141148675e69441f6fec9cb5315 /app/services | |
| parent | 69ff9b18896efe4ec43dd249cde265360f2b9c63 (diff) | |
clean up timeline scoping & drop timeline options no longer used by monsterfork
Diffstat (limited to 'app/services')
| -rw-r--r-- | app/services/fan_out_on_write_service.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/services/fan_out_on_write_service.rb b/app/services/fan_out_on_write_service.rb index 4d868b699..3bd3717fe 100644 --- a/app/services/fan_out_on_write_service.rb +++ b/app/services/fan_out_on_write_service.rb @@ -21,7 +21,7 @@ class FanOutOnWriteService < BaseService deliver_to_mentioned_followers(status) elsif status.local_visibility? deliver_to_followers(status) unless public_only || status.curated - return if status.reblog? && !Setting.show_reblogs_in_public_timelines + return if status.reblog? deliver_to_lists(status) unless public_only || status.curated deliver_to_local(status) unless filtered?(status) else @@ -30,7 +30,7 @@ class FanOutOnWriteService < BaseService deliver_to_lists(status) end - return if status.reblog? && !Setting.show_reblogs_in_public_timelines + return if status.reblog? return if filtered?(status) || (status.reblog? && filtered?(status.reblog)) if !status.reblog? && status.distributable? @@ -53,7 +53,7 @@ class FanOutOnWriteService < BaseService private def filtered?(status) - status.account.silenced? || !Setting.show_replies_in_public_timelines && status.reply? && status.in_reply_to_account_id != status.account_id + status.account.silenced? || status.reply? && status.in_reply_to_account_id != status.account_id end def deliver_to_self(status) |