From dd6ede554fa0c0c6c7e6f3c74226a4ae64165999 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Thu, 7 Sep 2017 20:18:34 +0200
Subject: [PATCH] Fix #4834 - Adjust Status#local and Status#remote scopes
(#4839)
---
app/models/status.rb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/app/models/status.rb b/app/models/status.rb
index fdc230d8f6..514cab2e4d 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') }
--
GitLab