|
|
|
@ -305,7 +305,11 @@ class Status < ApplicationRecord
|
|
|
|
|
# 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)
|
|
|
|
|
|
|
|
|
|
where(visibility: visibility).or(where(id: account.mentions.select(:status_id)))
|
|
|
|
|
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 })))
|
|
|
|
|
end
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|