Merge branch 'master' into fix/cache_blocking
This commit is contained in:
commit
acd33101c5
48 changed files with 453 additions and 184 deletions
|
@ -110,6 +110,10 @@ class Status < ApplicationRecord
|
|||
results
|
||||
end
|
||||
|
||||
def non_sensitive_with_media?
|
||||
!sensitive? && media_attachments.any?
|
||||
end
|
||||
|
||||
class << self
|
||||
def as_home_timeline(account)
|
||||
where(account: [account] + account.following)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue