diff options
| author | beatrix <beatrix.bitrot@gmail.com> | 2017-09-10 13:34:14 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-10 13:34:14 -0400 |
| commit | c9df53044a333276853f7dc7ef2aed6d48df087f (patch) | |
| tree | 011ea44fc94bcff6f8ec4e23c3edf887359243d2 /app/models/status.rb | |
| parent | 3dff74eecf5387b92b862893248710d2efb90eec (diff) | |
| parent | 67ad4533732f2e5cfc8c7f7ad3abaf7a5eb2647b (diff) | |
Merge pull request #142 from glitch-soc/sync/upstream-1.6.0rc4
Merge with 1.6.0rc4 STRAP IN BUCKAWOO HERE WE GO AGAIN
Diffstat (limited to 'app/models/status.rb')
| -rw-r--r-- | app/models/status.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/status.rb b/app/models/status.rb index fdc230d8f..514cab2e4 100644 --- a/app/models/status.rb +++ b/app/models/status.rb @@ -63,8 +63,8 @@ class Status < ApplicationRecord default_scope { recent } scope :recent, -> { reorder(id: :desc) } - scope :remote, -> { where.not(uri: nil) } - scope :local, -> { where(uri: nil) } + scope :remote, -> { where(local: false).or(where.not(uri: nil)) } + scope :local, -> { where(local: true).or(where(uri: nil)) } scope :without_replies, -> { where('statuses.reply = FALSE OR statuses.in_reply_to_account_id = statuses.account_id') } scope :without_reblogs, -> { where('statuses.reblog_of_id IS NULL') } |