Merge remote-tracking branch 'parent/stable-4.2' into upstream-4.2.2-lts
This commit is contained in:
commit
9310c1c81b
39 changed files with 460 additions and 98 deletions
|
@ -107,7 +107,7 @@ class Trends::Statuses < Trends::Base
|
|||
|
||||
def eligible?(status)
|
||||
(status.searchability.nil? || status.public_searchability?) && (status.public_visibility? || status.public_unlisted_visibility?) &&
|
||||
status.account.discoverable? && !status.account.silenced? && status.spoiler_text.blank? && (!status.sensitive? || status.media_attachments.none?) &&
|
||||
status.account.discoverable? && !status.account.silenced? && !status.account.sensitized? && status.spoiler_text.blank? && (!status.sensitive? || status.media_attachments.none?) &&
|
||||
!status.reply? && valid_locale?(status.language)
|
||||
end
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue