tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add site-wide options to show reblogs and replies in local/public timelines

Browse Source 
Fixes #1021
This commit is contained in:
Thibaut Girka
2019-04-30 21:51:24 +02:00
committed by ThibG
parent cc5a81b7d8
commit fcbf557bd2
6 changed files with 29 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/services/fan_out_on_write_service.rb
View File

@ -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?