marrub
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make sure that replies that are not sections of a root thread get filtered out of the world timeline.

staging
multiple creatures 2019-04-15 15:48:23 -05:00
parent 89ad628e88
commit cec0a7ff3c
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/services/fan_out_on_write_service.rb
View File

@ -22,7 +22,7 @@ class FanOutOnWriteService < BaseService
end
return if status.reblog? && !Setting.show_reblogs_in_public_timelines
return if status.account.silenced?
return if filtered?(status)
if !status.reblog? && status.distributable?
deliver_to_hashtags(status)
@ -31,18 +31,21 @@ class FanOutOnWriteService < BaseService
if status.relayed?
status = Status.find(status.reblog_of_id)
return if status.account.silenced?
return if filtered?(status)
render_anonymous_payload(status)
end
return unless status.network? && status.public_visibility? && !status.reblog
return if status.reply? && status.in_reply_to_account_id != status.account_id && !Setting.show_replies_in_public_timelines
deliver_to_local(status)
end
private
def filtered?(status)
status.account.silenced? || !Setting.show_replies_in_public_timelines && status.reply? && status.in_reply_to_account_id != status.account_id
end
def deliver_to_self(status)
Rails.logger.debug "Delivering status #{status.id} to author"
FeedManager.instance.push_to_home(status.account, status)