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

hide follower-only replies on account tls

staging
multiple creatures 2019-02-21 05:59:14 +00:00
parent f1ed7bb675
commit 178a2dc9eb
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/models/status.rb
View File

@ -439,13 +439,13 @@ class Status < ApplicationRecord
else
# followers can see followers-only stuff, but also things they are mentioned in.
# non-followers can see everything that isn't private/direct, but can see stuff they are mentioned in.
visibility.push(:private) if account.following?(target_account)
scope = left_outer_joins(:reblog)
scope.where(visibility: visibility)
.or(scope.where(id: account.mentions.select(:status_id)))
.merge(scope.where(reblog_of_id: nil).or(scope.where.not(reblogs_statuses: { account_id: account.excluded_from_timeline_account_ids })))
query = scope.where(visibility: visibility).or(scope.where(id: account.mentions.select(:status_id)))
if account.following?(target_account) then
query = query.or(scope.where(visibility: :private).without_replies)
end
query.merge(scope.where(reblog_of_id: nil).or(scope.where.not(reblogs_statuses: { account_id: account.excluded_from_timeline_account_ids })))
end
end