about summary refs log tree commit diff
path: root/app/models
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2019-07-15 01:04:31 +0200
committerGitHub <noreply@github.com>2019-07-15 01:04:31 +0200
commit5ccd011cc3bafc00a557dabbb47da004f3d4a381 (patch)
treec64218e9cdd13570181b0a1b9c86289aa4b22254 /app/models
parent1b074d2a50a331cdd03296170f04a75eec97a519 (diff)
parent3ad8c9ea61759c8ac12744f2b7b263711403b41c (diff)
Merge pull request #1161 from ThibG/glitch-soc/cherry-pick-upstream
Cherry pick changes from upstream
Diffstat (limited to 'app/models')
-rw-r--r--app/models/status.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/status.rb b/app/models/status.rb
index 5ddce72de..5adccb722 100644
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -82,7 +82,7 @@ class Status < ApplicationRecord
   default_scope { recent }
 
   scope :recent, -> { reorder(id: :desc) }
-  scope :remote, -> { where(local: false).or(where.not(uri: nil)) }
+  scope :remote, -> { where(local: false).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') }