Fix #4834 - Adjust Status#local and Status#remote scopes (#4839)

diff --git a/app/models/status.rb b/app/models/status.rb
index fdc230d8f661afa2c4001e73aa122c483fa6a1c4..514cab2e4d57342ff5316ff3f7b11b0fdf18aeea 100644 (file)
--- 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') }