about summary refs log tree commit diff
path: root/app/models
diff options
context:
space:
mode:
authorAkihiko Odaki <akihiko.odaki.4i@stu.hosei.ac.jp>2017-09-17 12:29:43 +0900
committerEugen Rochko <eugen@zeonfederated.com>2017-09-17 05:29:43 +0200
commit198a9a4fa42b880cba182d19dcc8edad360a4fbe (patch)
tree3760cfad361381a2270e8b90116557be545b998f /app/models
parentec36df97c4ea3da4bc177a96050c54cf8f35ba25 (diff)
Remove local_only scope in Status (#4977)
Diffstat (limited to 'app/models')
-rw-r--r--app/models/status.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/app/models/status.rb b/app/models/status.rb
index 514cab2e4..8e82c6aa6 100644
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -70,7 +70,6 @@ class Status < ApplicationRecord
   scope :without_reblogs, -> { where('statuses.reblog_of_id IS NULL') }
   scope :with_public_visibility, -> { where(visibility: :public) }
   scope :tagged_with, ->(tag) { joins(:statuses_tags).where(statuses_tags: { tag_id: tag }) }
-  scope :local_only, -> { left_outer_joins(:account).where(accounts: { domain: nil }) }
   scope :excluding_silenced_accounts, -> { left_outer_joins(:account).where(accounts: { silenced: false }) }
   scope :including_silenced_accounts, -> { left_outer_joins(:account).where(accounts: { silenced: true }) }
   scope :not_excluded_by_account, ->(account) { where.not(account_id: account.excluded_from_timeline_account_ids) }
@@ -221,7 +220,7 @@ class Status < ApplicationRecord
     private
 
     def timeline_scope(local_only = false)
-      starting_scope = local_only ? Status.local_only : Status
+      starting_scope = local_only ? Status.local : Status
       starting_scope
         .with_public_visibility
         .without_reblogs